Skip to content

The open alternative to Salesforce, designed for AI.

Reorganize twenty-ui into best-practice component domains and per-component folders (#21745)

Raphaël Bosi8034c7725fbe
diff --git a/packages/twenty-front/src/hooks/useCopyToClipboard.tsx b/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
index cdaea463579..d0eed074d94 100644
--- a/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
+++ b/packages/twenty-front/src/hooks/useCopyToClipboard.tsx
@@ -1,6 +1,6 @@
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { useLingui } from '@lingui/react/macro';
-import { IconCopy, IconExclamationCircle } from 'twenty-ui/display';
+import { IconCopy, IconExclamationCircle } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const useCopyToClipboard = () => {
diff --git a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
index d44e9440558..6b20e83a68b 100644
--- a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
+++ b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
@@ -4,7 +4,7 @@ import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
import { NAVIGATION_DRAWER_CONSTRAINTS } from '@/ui/layout/resizable-panel/constants/NavigationDrawerConstraints';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
-import { ModalBackdrop } from 'twenty-ui/layout';
+import { ModalBackdrop } from 'twenty-ui/surfaces';
import { LeftPanelSkeletonLoader } from '~/loading/components/LeftPanelSkeletonLoader';
import { PageContentSkeletonLoader } from '~/loading/components/PageContentSkeletonLoader';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx
index b2de426f03d..b32c950e63b 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx
@@ -4,7 +4,7 @@ import { useContext } from 'react';
import { CalendarEventRow } from '@/activities/calendar/components/CalendarEventRow';
import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
-import { CardContent } from 'twenty-ui/layout';
+import { CardContent } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type TimelineCalendarEvent } from '~/generated/graphql';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
index f9b526bf06f..91c279d3713 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
@@ -36,8 +36,8 @@ import {
ChipAccent,
ChipSize,
ChipVariant,
-} from 'twenty-ui/components';
-import { IconCalendarEvent } from 'twenty-ui/display';
+} from 'twenty-ui/data-display';
+import { IconCalendarEvent } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventNotSharedContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventNotSharedContent.tsx
index fc2b2f190e6..4b8319c7472 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventNotSharedContent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventNotSharedContent.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
index a8ff11d6467..e409307367c 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsAvatarGroup.tsx
@@ -1,7 +1,7 @@
import { type CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
import { isTimelineCalendarEventParticipant } from '@/activities/calendar/types/guards/IsTimelineCalendarEventParticipant';
import { isDefined } from 'twenty-shared/utils';
-import { Avatar, AvatarGroup } from 'twenty-ui/display';
+import { Avatar, AvatarGroup } from 'twenty-ui/data-display';
import { type TimelineCalendarEventParticipant } from '~/generated/graphql';
type CalendarEventParticipantsAvatarGroupProps = {
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
index 4a1257785be..af999c5c234 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
@@ -6,7 +6,7 @@ import { PropertyBox } from '@/object-record/record-inline-cell/property-box/com
import { ParticipantChip } from '@/activities/components/ParticipantChip';
import { EllipsisDisplay } from '@/ui/field/display/components/EllipsisDisplay';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
-import { IconCheck, IconQuestionMark, IconX } from 'twenty-ui/display';
+import { IconCheck, IconQuestionMark, IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledInlineCellBaseContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
index 66fcce2cefe..aa6dcb7bf4c 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
@@ -15,7 +15,7 @@ import { hasCalendarEventEnded } from '@/activities/calendar/utils/hasCalendarEv
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useOpenCalendarEventInSidePanel } from '@/side-panel/hooks/useOpenCalendarEventInSidePanel';
import { useContext } from 'react';
-import { IconArrowRight } from 'twenty-ui/display';
+import { IconArrowRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type CalendarEventRowProps = {
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx
index 349e44833bd..c40a4b8e733 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx
@@ -15,7 +15,7 @@ import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { useCustomResolver } from '@/activities/hooks/useCustomResolver';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
-import { H3Title } from 'twenty-ui/display';
+import { H3Title } from 'twenty-ui/typography';
import {
AnimatedPlaceholder,
AnimatedPlaceholderEmptyContainer,
@@ -23,8 +23,8 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
- Section,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
+import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type TimelineCalendarEventsWithTotal } from '~/generated/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
index c443df565e6..e169eebb0b3 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
@@ -2,7 +2,7 @@ import { useContext } from 'react';
import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent';
import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
type CalendarMonthCardProps = {
dayTimes: number[];
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityList.tsx b/packages/twenty-front/src/modules/activities/components/ActivityList.tsx
index 59ff8a1211e..89f228c245a 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityList.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityList.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledListContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx
index af3b20ee487..1cda1416f4a 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import React from 'react';
-import { CardContent } from 'twenty-ui/layout';
+import { CardContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRowContentContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
index 4f69b35f441..aea29ca94f5 100644
--- a/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
@@ -4,7 +4,7 @@ import React from 'react';
import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { RecordChip } from '@/object-record/components/RecordChip';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledAvatarContainer = styled.span`
diff --git a/packages/twenty-front/src/modules/activities/emails/components/ComposeEmailButton.tsx b/packages/twenty-front/src/modules/activities/emails/components/ComposeEmailButton.tsx
index 10de2c5eeda..4369f9a3a17 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/ComposeEmailButton.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/ComposeEmailButton.tsx
@@ -1,5 +1,5 @@
import { useComposeEmailForTargetRecord } from '@/activities/emails/hooks/useComposeEmailForTargetRecord';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
export const ComposeEmailButton = () => {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailAttachmentsField.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailAttachmentsField.tsx
index 432f9af172d..4aaec4a5300 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailAttachmentsField.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailAttachmentsField.tsx
@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { type EmailAttachment } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconUpload } from 'twenty-ui/display';
+import { IconUpload } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useUploadEmailAttachment } from '@/activities/emails/hooks/useUploadEmailAttachment';
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
index 2c465b3e316..57514ff6afa 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailLoader.tsx
@@ -4,8 +4,8 @@ import {
AnimatedPlaceholderEmptyContainer,
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/layout';
-import { Loader } from 'twenty-ui/feedback';
+ Loader,
+} from 'twenty-ui/feedback';
export const EmailLoader = ({ loadingText }: { loadingText?: string }) => (
<AnimatedPlaceholderEmptyContainer>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
index 771f0754913..fd453c6a6a2 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconArrowBackUp, IconUserCircle } from 'twenty-ui/display';
+import { IconArrowBackUp, IconUserCircle } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
index 0bf2b32297b..8d350c76e85 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageBody.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import Linkify from 'linkify-react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
const StyledThreadMessageBody = styled(motion.div)`
color: ${themeCssVariables.font.color.primary};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
index 59a1b1830a8..60b0e349d01 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageReceivers.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EmailThreadMessageReceiversProps = {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index 4831dc7743d..b5650d88963 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { ParticipantChip } from '@/activities/components/ParticipantChip';
import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { AppTooltip, TooltipPosition } from 'twenty-ui/display';
+import { AppTooltip, TooltipPosition } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
index 9d84f81eb1c..100c38babe7 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { AppTooltip, IconLock, TooltipDelay } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { MessageChannelVisibility } from '~/generated/graphql';
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
index 3d501b161a2..a681a871893 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
@@ -7,7 +7,7 @@ import { useContext } from 'react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
MessageChannelVisibility,
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx
index da83e035ced..46e0d6e9be7 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx
@@ -14,7 +14,7 @@ import { useCustomResolver } from '@/activities/hooks/useCustomResolver';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { Trans } from '@lingui/react/macro';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/display';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
index 73c21407be3..2224ec83517 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
@@ -1,6 +1,6 @@
import { useComposeEmailForTargetRecord } from '@/activities/emails/hooks/useComposeEmailForTargetRecord';
import { Trans, useLingui } from '@lingui/react/macro';
-import { IconMail } from 'twenty-ui/display';
+import { IconMail } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -9,7 +9,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
export const EmptyInboxPlaceholder = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
index 0f44f6033ae..01c684cce85 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
@@ -9,7 +9,7 @@ import {
IconDownload,
IconPencil,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx
index 4b37629473c..8919828c8dc 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx
@@ -11,7 +11,7 @@ import { type ActivityTargetableObject } from '@/activities/types/ActivityTarget
import { isAttachmentPreviewEnabledState } from '@/client-config/states/isAttachmentPreviewEnabledState';
import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStatefulWrapper';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { ModalContent, ModalHeader } from 'twenty-ui/layout';
+import { ModalContent, ModalHeader } from 'twenty-ui/surfaces';
import { ActivityList } from '@/activities/components/ActivityList';
import {
@@ -23,7 +23,7 @@ import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFla
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { isDefined } from 'twenty-shared/utils';
-import { IconDownload, IconX } from 'twenty-ui/display';
+import { IconDownload, IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
index 8f525fd4204..21c87e416b9 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
@@ -17,7 +17,8 @@ import { type AttachmentWithFile } from '@/activities/files/utils/filterAttachme
import { FileIcon } from '@/file/components/FileIcon';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { isNavigationModifierPressed } from 'twenty-ui/utilities';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx b/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
index 4d7e062890b..72c659c9987 100644
--- a/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
@@ -11,7 +11,7 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { useContext, useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconDownload } from 'twenty-ui/display';
+import { IconDownload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { getFileNameAndExtension } from '~/utils/file/getFileNameAndExtension';
diff --git a/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx b/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
index c514b3b45c8..316328d8877 100644
--- a/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
@@ -4,7 +4,7 @@ import { useContext } from 'react';
import { useDropzone } from 'react-dropzone';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
-import { IconUpload } from 'twenty-ui/display';
+import { IconUpload } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx b/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx
index 8e805dba3cf..0ece6b0dd4e 100644
--- a/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx
@@ -12,7 +12,7 @@ import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFla
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { Trans, useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -21,7 +21,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { PermissionFlagType } from '~/generated-metadata/graphql';
const StyledAttachmentsContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
index 239d3ce435e..b7aee545a8d 100644
--- a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
+++ b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
@@ -16,7 +16,7 @@ import { RecordInlineCellContext } from '@/object-record/record-inline-cell/comp
import { RecordInlineCellEditMode } from '@/object-record/record-inline-cell/components/RecordInlineCellEditMode';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
-import { IconArrowUpRight, IconPencil } from 'twenty-ui/display';
+import { IconArrowUpRight, IconPencil } from 'twenty-ui/icon';
type ActivityTargetsInlineCellProps = {
activityRecordId: string;
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx b/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx
index 7f6883eb129..ecaf1c1822d 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx
@@ -9,7 +9,7 @@ import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPe
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -18,7 +18,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
const StyledNotesContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx b/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
index c99356bcbbb..b86b8c8909b 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
@@ -4,7 +4,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
export const AddTaskButton = ({
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
index f40280b3d14..caeb6b3abc6 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
@@ -12,7 +12,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { t } from '@lingui/core/macro';
import groupBy from 'lodash.groupby';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -21,7 +21,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { AddTaskButton } from './AddTaskButton';
import { TaskList } from './TaskList';
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index 3d8a9a33a27..2439af787e1 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -14,7 +14,8 @@ import { StopPropagationContainer } from '@/object-record/record-board/record-bo
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
import { useContext } from 'react';
-import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { Checkbox, CheckboxShape } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
index 00a6ff56b6e..d2a5bc83147 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
@@ -14,7 +14,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledMainContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx
index 697aa33d82d..38408aa09d6 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx
@@ -8,7 +8,7 @@ import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSide
import { type CoreObjectNameSingular } from 'twenty-shared/types';
import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
import { isNonEmptyString } from '@sniptt/guards';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
type EventRowActivityProps = EventRowDynamicComponentProps;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
index 4c3ce89b044..702f8ef75e1 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { IconButton } from 'twenty-ui/input';
-import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EventCardToggleButtonProps = {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx
index ba60995bdd4..326f93de2b8 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx
@@ -6,7 +6,7 @@ import {
IconEditCircle,
IconRestore,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const EventIconDynamicComponent = ({
event,
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffLabel.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffLabel.tsx
index 720e1260df4..2e1751c03fc 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffLabel.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffLabel.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { Icon123, useIcons } from 'twenty-ui/display';
+import { Icon123, useIcons } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EventFieldDiffLabelProps = {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
index c3df7802f1e..0f8396ff974 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
@@ -8,7 +8,7 @@ import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectReco
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { Trans, useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/display';
+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type EventRelationFieldDiffValuesProps = {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
index 83ad33fae76..699a9a60d89 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
@@ -10,7 +10,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledEventCardMessageContainer = styled.div<{ canOpen?: boolean }>`
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
index b2c2309f7a1..c33753f30f7 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
-import { IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledEmailBodyNotSharedContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
index 0c1c2291469..33e59bf9179 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import React from 'react';
-import type { IconComponent } from 'twenty-ui/display';
+import type { IconComponent } from 'twenty-ui/icon';
import { FloatingIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkPopover.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkPopover.tsx
index c1c1b71b996..65cc3e7b10e 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkPopover.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkPopover.tsx
@@ -9,7 +9,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { type Editor } from '@tiptap/core';
import { useId, useState, type FocusEvent, type FormEvent } from 'react';
import { getSafeUrl, isDefined } from 'twenty-shared/utils';
-import { IconLink, IconPencil } from 'twenty-ui/display';
+import { IconLink, IconPencil } from 'twenty-ui/icon';
type EditLinkPopoverProps = {
defaultValue: string | undefined;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx
index de389a11843..0009c1fc1e7 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx
@@ -8,7 +8,7 @@ import {
IconAlignLeft,
IconAlignRight,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
type ImageBubbleMenuProps = {
editor: Editor;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/LinkBubbleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/LinkBubbleMenu.tsx
index 9a9f5311280..8693093036a 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/LinkBubbleMenu.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/LinkBubbleMenu.tsx
@@ -4,7 +4,7 @@ import { StyledBubbleMenuContainer } from '@/advanced-text-editor/components/Tex
import { type Editor } from '@tiptap/core';
import { useEditorState } from '@tiptap/react';
import { BubbleMenu } from '@tiptap/react/menus';
-import { IconExternalLink, IconLinkOff } from 'twenty-ui/display';
+import { IconExternalLink, IconLinkOff } from 'twenty-ui/icon';
import { getSafeUrl } from 'twenty-shared/utils';
type LinkBubbleMenuProps = {
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx
index e7e87cbe71d..94c1232cd0b 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx
@@ -13,7 +13,7 @@ import {
IconListNumbers,
IconStrikethrough,
IconUnderline,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export const StyledBubbleMenuContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
index 1ce9d6dc169..3855e7cf751 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type Editor } from '@tiptap/react';
import { useContext, useId } from 'react';
-import { IconPilcrow } from 'twenty-ui/display';
+import { IconPilcrow } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/WorkflowSendEmailAttachments.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/WorkflowSendEmailAttachments.tsx
index 663c4d1cf52..95bf4356c35 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/WorkflowSendEmailAttachments.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/WorkflowSendEmailAttachments.tsx
@@ -11,7 +11,7 @@ import { useLingui } from '@lingui/react/macro';
import { useContext, useId } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type WorkflowEmailFiles } from 'twenty-shared/workflow';
-import { IconUpload } from 'twenty-ui/display';
+import { IconUpload } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type WorkflowSendEmailAttachmentsProps = {
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts
index 3f56470cd16..10184100be4 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts
@@ -9,7 +9,7 @@ import {
IconList,
IconListNumbers,
IconPilcrow,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export type SlashCommandConfig = {
id: string;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommand.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommand.ts
index 2e6d9fa87aa..b6745454d02 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommand.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/SlashCommand.ts
@@ -1,7 +1,7 @@
import { i18n } from '@lingui/core';
import { Extension, type Editor, type Range } from '@tiptap/core';
import Suggestion, { type SuggestionOptions } from '@tiptap/suggestion';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import {
DEFAULT_SLASH_COMMANDS,
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts
index 19319458a24..04b0a83b914 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts
@@ -6,7 +6,7 @@ import {
IconH2,
IconH3,
IconPilcrow,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export type TurnIntoBlockOptions = {
title: string;
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatApiKeyNotConfiguredMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatApiKeyNotConfiguredMessage.tsx
index 488db26e0a2..ecab59509f0 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatApiKeyNotConfiguredMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatApiKeyNotConfiguredMessage.tsx
@@ -4,7 +4,7 @@ import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { DOCUMENTATION_PATHS } from 'twenty-shared/constants';
-import { IconExternalLink } from 'twenty-ui/display';
+import { IconExternalLink } from 'twenty-ui/icon';
export const AiChatApiKeyNotConfiguredMessage = () => {
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx b/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx
index f348b0ce434..246d7c0260d 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx
@@ -2,7 +2,7 @@ import { AiChatCompactionIndicator } from '@/ai/components/AiChatCompactionIndic
import { CodeExecutionDisplay } from '@/ai/components/CodeExecutionDisplay';
import { RoutingStatusDisplay } from '@/ai/components/RoutingStatusDisplay';
import { ThinkingStepsDisplay } from '@/ai/components/ThinkingStepsDisplay';
-import { IconDotsVertical } from 'twenty-ui/display';
+import { IconDotsVertical } from 'twenty-ui/icon';
import { LazyMarkdownRenderer } from '@/ai/components/LazyMarkdownRenderer';
import { ToolStepRenderer } from '@/ai/components/ToolStepRenderer';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatBanner.tsx b/packages/twenty-front/src/modules/ai/components/AiChatBanner.tsx
index fbf6baa505c..cc15e247c5f 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatBanner.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatBanner.tsx
@@ -1,11 +1,11 @@
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
import {
- AppTooltip,
type IconComponent,
IconAlertTriangle,
IconInfoCircle,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatCompactionIndicator.tsx b/packages/twenty-front/src/modules/ai/components/AiChatCompactionIndicator.tsx
index 1d6b159ba11..4926a4a2e85 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatCompactionIndicator.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatCompactionIndicator.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconTransform } from 'twenty-ui/display';
+import { IconTransform } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledIndicatorContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
index ff23176e972..8304eb9428d 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
@@ -1,7 +1,7 @@
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconAlertCircle } from 'twenty-ui/display';
+import { IconAlertCircle } from 'twenty-ui/icon';
import { useContext } from 'react';
import { type AiChatError } from '@/ai/types/AiChatError';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
index 87e08f8fe99..168177a8c9a 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx
@@ -6,7 +6,7 @@ import { useDeleteQueuedMessage } from '@/ai/hooks/useDeleteQueuedMessage';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatScrollToBottomButton.tsx b/packages/twenty-front/src/modules/ai/components/AiChatScrollToBottomButton.tsx
index 269299c29be..6345373c7bd 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatScrollToBottomButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatScrollToBottomButton.tsx
@@ -2,7 +2,7 @@ import { agentChatIsScrolledToBottomSelector } from '@/ai/states/selectors/agent
import { scrollAiChatToBottom } from '@/ai/utils/scrollAiChatToBottom';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
-import { IconArrowDown } from 'twenty-ui/display';
+import { IconArrowDown } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledScrollToBottomButton = styled.button<{ isVisible: boolean }>`
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
index 0ffe7bb134c..5436b63b5cf 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdown.tsx
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconAdjustments } from 'twenty-ui/display';
+import { IconAdjustments } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { AiChatThreadFilterDropdownContent } from '@/ai/components/AiChatThreadFilterDropdownContent';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
index 142d02224d3..d78c0a8907d 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownGroupByMenu.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { AGENT_CHAT_THREAD_GROUP_BY } from '@/ai/constants/AgentChatThreadGroupBy';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
index fb8fa22b686..9c3f8261593 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownLastActivityMenu.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { AGENT_CHAT_THREAD_LAST_ACTIVITY_FILTER } from '@/ai/constants/AgentChatThreadLastActivityFilter';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownRootMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownRootMenu.tsx
index b5ee6965c6c..3ce5d4a2d49 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownRootMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownRootMenu.tsx
@@ -4,7 +4,7 @@ import {
IconLayoutList,
IconStatusChange,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { AGENT_CHAT_THREAD_FILTER_STATUS } from '@/ai/constants/AgentChatThreadFilterStatus';
import { AGENT_CHAT_THREAD_FILTER_STATUS_LABELS } from '@/ai/constants/AgentChatThreadFilterStatusLabels';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
index 05c1b91d44f..eae0d2f62d2 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadFilterDropdownStatusMenu.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { AGENT_CHAT_THREAD_FILTER_STATUS } from '@/ai/constants/AgentChatThreadFilterStatus';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadItemMenu.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadItemMenu.tsx
index c0595d37fd7..57deabb66e6 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadItemMenu.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadItemMenu.tsx
@@ -5,7 +5,7 @@ import {
IconDotsVertical,
IconPencil,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
index 9d4b743c614..c8bb174ea8a 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { Key } from 'ts-key-enum';
-import { IconArchive, IconSparkles } from 'twenty-ui/display';
+import { IconArchive, IconSparkles } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { AiChatThreadItemMenu } from '@/ai/components/AiChatThreadItemMenu';
diff --git a/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx b/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
index 08a61615cd5..4936cb4e622 100644
--- a/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/CodeExecutionDisplay.tsx
@@ -12,7 +12,7 @@ import {
IconPlayerPlay,
IconSquareRoundedCheck,
IconSquareRoundedX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { CodeEditor, LightIconButton } from 'twenty-ui/input';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
index 3e40b9dec1c..7e0b23a5fce 100644
--- a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconArchive, IconComment } from 'twenty-ui/display';
+import { IconArchive, IconComment } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AiChatThreadItemMenu } from '@/ai/components/AiChatThreadItemMenu';
diff --git a/packages/twenty-front/src/modules/ai/components/ReasoningSummaryDisplay.tsx b/packages/twenty-front/src/modules/ai/components/ReasoningSummaryDisplay.tsx
index f735b9a3ad7..868406f1919 100644
--- a/packages/twenty-front/src/modules/ai/components/ReasoningSummaryDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ReasoningSummaryDisplay.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
-import { IconBrain, IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconBrain, IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/RecordLink.tsx b/packages/twenty-front/src/modules/ai/components/RecordLink.tsx
index d40a0727d26..27d585c7deb 100644
--- a/packages/twenty-front/src/modules/ai/components/RecordLink.tsx
+++ b/packages/twenty-front/src/modules/ai/components/RecordLink.tsx
@@ -3,7 +3,7 @@ import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { AvatarOrIcon, ChipVariant, LinkChip } from 'twenty-ui/components';
+import { AvatarOrIcon, ChipVariant, LinkChip } from 'twenty-ui/data-display';
type RecordLinkProps = {
objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
index 54abfe14ad8..274fff8240e 100644
--- a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
-import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { JsonTree } from 'twenty-ui/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/RoutingStatusDisplay.tsx b/packages/twenty-front/src/modules/ai/components/RoutingStatusDisplay.tsx
index d609e732d3f..72038d17fcc 100644
--- a/packages/twenty-front/src/modules/ai/components/RoutingStatusDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/RoutingStatusDisplay.tsx
@@ -4,7 +4,7 @@ import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
import { type DataMessagePart } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown, IconChevronUp, IconCpu } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp, IconCpu } from 'twenty-ui/icon';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
index 4f62aa2e271..00b8c0d1b03 100644
--- a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
+++ b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
@@ -5,7 +5,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconBrandX, IconWorld } from 'twenty-ui/display';
+import { IconBrandX, IconWorld } from 'twenty-ui/icon';
import { Checkbox } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
index c8fdd035ae3..414d498901f 100644
--- a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
+++ b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
@@ -2,7 +2,7 @@ import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily'
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconCopy, IconTerminal } from 'twenty-ui/display';
+import { IconCopy, IconTerminal } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
index d077c17f1c1..ee7e3efcb3b 100644
--- a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx
@@ -6,10 +6,9 @@ import { isDefined } from 'twenty-shared/utils';
import {
IconChevronRight,
IconCpu,
- OverflowingTextWithTooltip,
ThinkingOrbitLoaderIcon,
- TooltipDelay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { JsonTree } from 'twenty-ui/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx b/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
index d1a0e989be4..f2869bbf319 100644
--- a/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ToolStepRenderer.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
-import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { JsonTree } from 'twenty-ui/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
index df563e032f4..3787184f53d 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
@@ -10,8 +10,8 @@ import { t } from '@lingui/core/macro';
import { useCallback, useContext } from 'react';
import { type ExtendedFileUIPart } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
-import { AvatarOrIcon, Chip, ChipVariant } from 'twenty-ui/components';
-import { type IconComponent, IconX } from 'twenty-ui/display';
+import { AvatarOrIcon, Chip, ChipVariant } from 'twenty-ui/data-display';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx
index 6d894b3d86d..93c89ef28f0 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx
@@ -4,7 +4,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import React, { useRef } from 'react';
-import { IconPaperclip } from 'twenty-ui/display';
+import { IconPaperclip } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
index f9d9bda6230..8739a640082 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
@@ -3,7 +3,7 @@ import { t } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { ProgressBar } from 'twenty-ui/feedback';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
index 00c00f9d42b..31f4d016e0f 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx
@@ -6,7 +6,7 @@ import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { IconArrowUp, IconPlayerStop } from 'twenty-ui/display';
+import { IconArrowUp, IconPlayerStop } from 'twenty-ui/icon';
import { RoundedIconButton } from 'twenty-ui/input';
type SendMessageButtonProps = {
diff --git a/packages/twenty-front/src/modules/ai/components/suggested-prompts/default-suggested-prompts.ts b/packages/twenty-front/src/modules/ai/components/suggested-prompts/default-suggested-prompts.ts
index db06d80694d..02a2802a87b 100644
--- a/packages/twenty-front/src/modules/ai/components/suggested-prompts/default-suggested-prompts.ts
+++ b/packages/twenty-front/src/modules/ai/components/suggested-prompts/default-suggested-prompts.ts
@@ -4,7 +4,7 @@ import {
type IconComponent,
IconPlus,
IconSettingsAutomation,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export type SuggestedPrompt = {
id: string;
diff --git a/packages/twenty-front/src/modules/ai/constants/OutputFieldTypeOptions.ts b/packages/twenty-front/src/modules/ai/constants/OutputFieldTypeOptions.ts
index 266a9f5db88..facbbbdcdf7 100644
--- a/packages/twenty-front/src/modules/ai/constants/OutputFieldTypeOptions.ts
+++ b/packages/twenty-front/src/modules/ai/constants/OutputFieldTypeOptions.ts
@@ -4,7 +4,7 @@ import {
IllustrationIconNumbers,
IllustrationIconText,
IllustrationIconToggle,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export interface OutputSchemaField {
id: string;
diff --git a/packages/twenty-front/src/modules/ai/utils/getToolIcon.ts b/packages/twenty-front/src/modules/ai/utils/getToolIcon.ts
index 9c968c76a44..8ab5d925f86 100644
--- a/packages/twenty-front/src/modules/ai/utils/getToolIcon.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getToolIcon.ts
@@ -4,7 +4,7 @@ import {
IconMail,
IconTool,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
const TOOL_ICON_MAPPINGS = [
{
diff --git a/packages/twenty-front/src/modules/app/components/App.tsx b/packages/twenty-front/src/modules/app/components/App.tsx
index 33d921cba0b..9bd2012bf24 100644
--- a/packages/twenty-front/src/modules/app/components/App.tsx
+++ b/packages/twenty-front/src/modules/app/components/App.tsx
@@ -10,7 +10,7 @@ import { I18nProvider } from '@lingui/react';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { Provider as JotaiProvider } from 'jotai';
import { HelmetProvider } from '@dr.pogodin/react-helmet';
-import { IconsProvider } from 'twenty-ui/display';
+import { IconsProvider } from 'twenty-ui/icon';
import { initialI18nActivate } from '~/utils/i18n/initialI18nActivate';
initialI18nActivate();
diff --git a/packages/twenty-front/src/modules/applications/components/AppChip.tsx b/packages/twenty-front/src/modules/applications/components/AppChip.tsx
index e0a8d5dd904..b51a1cef87c 100644
--- a/packages/twenty-front/src/modules/applications/components/AppChip.tsx
+++ b/packages/twenty-front/src/modules/applications/components/AppChip.tsx
@@ -1,10 +1,7 @@
import { useApplicationChipData } from '@/applications/hooks/useApplicationChipData';
import { styled } from '@linaria/react';
-import {
- Avatar,
- type AvatarSize,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { Avatar, type AvatarSize } from 'twenty-ui/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type AppChipProps = {
diff --git a/packages/twenty-front/src/modules/applications/components/AppConnectionHeader.tsx b/packages/twenty-front/src/modules/applications/components/AppConnectionHeader.tsx
index 9ec5093f78b..8a10a5458ef 100644
--- a/packages/twenty-front/src/modules/applications/components/AppConnectionHeader.tsx
+++ b/packages/twenty-front/src/modules/applications/components/AppConnectionHeader.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
-import { Avatar, IconRefresh } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconRefresh } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type AppConnectionHeaderProps = {
diff --git a/packages/twenty-front/src/modules/auth/components/Logo.tsx b/packages/twenty-front/src/modules/auth/components/Logo.tsx
index 0a4dc0990c4..20e7c9755fc 100644
--- a/packages/twenty-front/src/modules/auth/components/Logo.tsx
+++ b/packages/twenty-front/src/modules/auth/components/Logo.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath } from 'twenty-shared/types';
import { getImageAbsoluteURI, isDefined } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/auth/components/Title.tsx b/packages/twenty-front/src/modules/auth/components/Title.tsx
index ec822356d89..7a85e3eec8d 100644
--- a/packages/twenty-front/src/modules/auth/components/Title.tsx
+++ b/packages/twenty-front/src/modules/auth/components/Title.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import React from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/utilities';
+import { AnimatedEaseIn } from 'twenty-ui/layout';
type TitleProps = React.PropsWithChildren & {
animate?: boolean;
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
index f6832f7d0a5..58656698c4b 100644
--- a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
@@ -8,7 +8,7 @@ import { useVerifyLogin } from '@/auth/hooks/useVerifyLogin';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';
import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useLingui } from '@lingui/react/macro';
import { useEffect, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
diff --git a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
index b1f9f3320ce..ce04af70a96 100644
--- a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
+++ b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
@@ -5,7 +5,7 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom';
// Mock component that just renders the error state of VerifyEmailEffect directly
// (since normal VerifyEmailEffect has async logic that's hard to test in Storybook)
import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
const VerifyEmailEffectErrorState = ({ email = '[email protected]' }) => {
diff --git a/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts b/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts
index 2f6ec34b72c..a0eac56aa28 100644
--- a/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts
+++ b/packages/twenty-front/src/modules/auth/constants/AuthModalConfig.ts
@@ -1,4 +1,4 @@
-import { type ModalOverlay, type ModalSize } from 'twenty-ui/layout';
+import { type ModalOverlay, type ModalSize } from 'twenty-ui/surfaces';
import { AppPath } from 'twenty-shared/types';
type AuthModalConfigType = {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
index d164df585ac..73e0455caea 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
@@ -10,15 +10,10 @@ import {
import { OnboardingModalCircularIcon } from '@/onboarding/components/OnboardingModalCircularIcon';
import { t } from '@lingui/core/macro';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import {
- IconGmail,
- IconMail,
- IconMailX,
- IconMicrosoft,
-} from 'twenty-ui/display';
+import { IconGmail, IconMail, IconMailX, IconMicrosoft } from 'twenty-ui/icon';
import { MainButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/utilities';
+import { AnimatedEaseIn } from 'twenty-ui/layout';
const StyledContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
index 204b057d443..91e00f086df 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
@@ -26,12 +26,9 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import {
- Avatar,
- HorizontalSeparator,
- IconChevronRight,
- IconPlus,
-} from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
type AvailableWorkspace,
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx
index 0d177b08484..b6f6c56836d 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx
@@ -12,7 +12,7 @@ import { workspaceAuthBypassProvidersState } from '@/workspace/states/workspaceA
import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
import { Trans } from '@lingui/react/macro';
import { FormProvider } from 'react-hook-form';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { ClickToActionLink } from 'twenty-ui/navigation';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
index 7da27a7c057..147503a61df 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { ComponentDecorator } from 'twenty-ui/testing';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx
index c5b8de888db..112478d26a6 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/LastUsedPill.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { Pill } from 'twenty-ui/components';
+import { Pill } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledPillContainer = styled.span`
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
index 578afe3363b..4d4b8542e8b 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
@@ -6,7 +6,7 @@ import { useLingui } from '@lingui/react/macro';
import { motion } from 'framer-motion';
import { useContext } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
-import { StyledText } from 'twenty-ui/display';
+import { StyledText } from 'twenty-ui/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFullWidthMotionDiv = styled(motion.div)`
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx
index 4df73a3ebbd..6d5841cd84e 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx
@@ -7,7 +7,7 @@ import { guessSSOIdentityProviderIconByUrl } from '@/settings/security/utils/gue
import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
import React from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { MainButton } from 'twenty-ui/input';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
index 5981920a098..d997050f7e4 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
@@ -9,7 +9,7 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import QRCode from 'react-qr-code';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { IconCopy } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { MainButton } from 'twenty-ui/input';
import { useContext } from 'react';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
index 31a79a7f16b..3cecd3af66b 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
@@ -9,7 +9,8 @@ import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';
import { useLingui } from '@lingui/react/macro';
import { memo, useContext } from 'react';
-import { HorizontalSeparator, IconGoogle } from 'twenty-ui/display';
+import { IconGoogle } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { MainButton } from 'twenty-ui/input';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
index 4302b1b9b92..50550362593 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
@@ -9,7 +9,8 @@ import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { HorizontalSeparator, IconMicrosoft } from 'twenty-ui/display';
+import { IconMicrosoft } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { MainButton } from 'twenty-ui/input';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx
index 70be4b7907c..2def3c9bc6b 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx
@@ -12,7 +12,8 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { HorizontalSeparator, IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { MainButton } from 'twenty-ui/input';
import { LastUsedPill } from './LastUsedPill';
import { StyledSSOButtonContainer } from './SignInUpSSOButtonStyles';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/blocks/MentionInlineContent.tsx b/packages/twenty-front/src/modules/blocknote-editor/blocks/MentionInlineContent.tsx
index 4889aba05cf..fd8f5245f9b 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/blocks/MentionInlineContent.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/blocks/MentionInlineContent.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { Chip, ChipVariant } from 'twenty-ui/components';
+import { Chip, ChipVariant } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
index da05f543751..8f0edac2e11 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx
@@ -16,7 +16,7 @@ import {
type SuggestionItem,
} from '@/blocknote-editor/components/CustomSlashMenu';
import { useMentionMenu } from '@/mention/hooks/useMentionMenu';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
interface BlockEditorProps {
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenu.tsx
index bae50900532..3d4e03e9462 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenu.tsx
@@ -11,7 +11,7 @@ import {
} from '@blocknote/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconColorSwatch, IconPlus, IconTrash } from 'twenty-ui/display';
+import { IconColorSwatch, IconPlus, IconTrash } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type CustomSideMenuProps = {
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenuOptions.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenuOptions.tsx
index 332a33212af..434d31957c7 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenuOptions.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSideMenuOptions.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div<{ Variant: Variants }>`
diff --git a/packages/twenty-front/src/modules/blocknote-editor/types/types.ts b/packages/twenty-front/src/modules/blocknote-editor/types/types.ts
index c212ebb7a3f..d22ab785926 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/types/types.ts
+++ b/packages/twenty-front/src/modules/blocknote-editor/types/types.ts
@@ -2,7 +2,7 @@ import type {
DefaultReactSuggestionItem,
SuggestionMenuProps,
} from '@blocknote/react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SuggestionItem = DefaultReactSuggestionItem & {
aliases?: string[];
diff --git a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
index f8a51944439..681b696b89d 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
+++ b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
@@ -25,7 +25,7 @@ import {
IconPilcrow,
IconTable,
IconVideo,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
const Icons: Record<string, IconComponent> = {
'Heading 1': IconH1,
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
index 7887b0ac860..a9c06bd5818 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
@@ -17,7 +17,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconLayoutSidebarRightExpand } from 'twenty-ui/display';
+import { IconLayoutSidebarRightExpand } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { CommandMenuItemAvailabilityType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
index c46586c8a68..ac7e825be67 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown.tsx
@@ -8,7 +8,7 @@ import { sidePanelWidgetFooterCommandMenuItemsState } from '@/ui/layout/side-pan
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext, useMemo } from 'react';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { MenuItem } from 'twenty-ui/navigation';
import { CommandMenuItemAvailabilityType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordShowSidePanelOpenRecordButton.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordShowSidePanelOpenRecordButton.tsx
index 08ea06df6c0..bfee4206f83 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordShowSidePanelOpenRecordButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordShowSidePanelOpenRecordButton.tsx
@@ -23,7 +23,7 @@ import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconBrowserMaximize } from 'twenty-ui/display';
+import { IconBrowserMaximize } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { getOsControlSymbol } from 'twenty-ui/utilities';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
index 85d40f61017..dca66eae5b6 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/CommandMenuItemRenderer.tsx
@@ -16,7 +16,7 @@ import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { assertUnreachable, isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { MenuItem } from 'twenty-ui/navigation';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemsInlineMeasurements.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemsInlineMeasurements.tsx
index bffba1d45f8..d90d91618b0 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemsInlineMeasurements.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemsInlineMeasurements.tsx
@@ -6,7 +6,7 @@ import { NodeDimension } from '@/ui/utilities/dimensions/components/NodeDimensio
import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants/CommandMenuDefaultIcon';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
type ElementDimensions = {
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
index 236c4719e2f..8642c79aeea 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditButton.tsx
@@ -1,4 +1,4 @@
-import { AnimatedIconCrossfade } from 'twenty-ui/utilities';
+import { AnimatedIconCrossfade } from 'twenty-ui/layout';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -7,7 +7,7 @@ import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconPencil, IconX } from 'twenty-ui/display';
+import { IconPencil, IconX } from 'twenty-ui/icon';
import { AnimatedButton } from 'twenty-ui/input';
export const CommandMenuItemEditButton = () => {
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
index 9e7e1cb9655..fdd802311fb 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemEditRecordSelectionDropdown.tsx
@@ -12,11 +12,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import {
- IconChevronDown,
- IconSquareCheck,
- IconSquareX,
-} from 'twenty-ui/display';
+import { IconChevronDown, IconSquareCheck, IconSquareX } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
index c17b669765a..91cbcb1c635 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/CommandMenuItemOptionsDropdown.tsx
@@ -8,7 +8,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import { type ReactElement } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconRefresh, IconTag } from 'twenty-ui/display';
+import { IconRefresh, IconTag } from 'twenty-ui/icon';
import { MenuItem, MenuItemToggle } from 'twenty-ui/navigation';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx b/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
index dcf61d2c325..4924aea998b 100644
--- a/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage.tsx
@@ -27,7 +27,7 @@ import {
IconPin,
IconPinnedOff,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem, MenuItemDraggable } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
index cb7e6485b06..3cdf6dfc174 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessOpenSidePanelPageEngineCommand.tsx
@@ -5,7 +5,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { type MessageDescriptor } from '@lingui/core';
import { t } from '@lingui/core/macro';
import { type SidePanelPages } from 'twenty-shared/types';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export const HeadlessOpenSidePanelPageEngineCommand = ({
page,
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx
index f541da90ff5..6718ff0654f 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx
@@ -48,7 +48,7 @@ import { TidyUpWorkflowSingleRecordCommand } from '@/command-menu-item/engine-co
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { msg } from '@lingui/core/macro';
import { AppPath, SettingsPath, SidePanelPages } from 'twenty-shared/types';
-import { IconHistory, IconSearch, IconSparkles } from 'twenty-ui/display';
+import { IconHistory, IconSearch, IconSparkles } from 'twenty-ui/icon';
import { EngineComponentKey } from '~/generated-metadata/graphql';
export const ENGINE_COMPONENT_KEY_COMPONENT_MAP: Record<
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemClick.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemClick.ts
index 9bd6e9cbf3c..df35c7d8228 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemClick.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemClick.ts
@@ -10,7 +10,7 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
export const useCommandMenuItemClick = ({
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
index a465662b9ca..893d906dde3 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
@@ -4,12 +4,8 @@ import { type MessageDescriptor } from '@lingui/core';
import { type MouseEvent } from 'react';
import { type Nullable } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- type IconComponent,
- TooltipDelay,
- TooltipPosition,
-} from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';
import { Button, IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
index 14c2a16966d..b8e082e7e37 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
@@ -1,6 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
import { type ReactNode } from 'react';
-import { IconArrowUpRight, type IconComponent } from 'twenty-ui/display';
+import { IconArrowUpRight, type IconComponent } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick';
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx
index d25515b4730..c0537b39109 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx
@@ -9,7 +9,7 @@ import { styled } from '@linaria/react';
import { useStore } from 'jotai';
import { useRef, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import {
canBeCastAsNumberOrNull,
castAsNumberOrNull,
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx
index cd2210d65a8..cdd8af714c1 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx
@@ -8,7 +8,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
import { styled } from '@linaria/react';
import { useStore } from 'jotai';
import { useRef, useState } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
type CommandMenuItemTextInputProps = {
id: string;
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
index c62c806efba..fbe19eaaf6d 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuOpenContainer.tsx
@@ -21,7 +21,7 @@ import { useStore } from 'jotai';
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import { useCallback, useContext, useRef } from 'react';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/components';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
const StyledCommandMenuBase = styled.div`
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
index 09f228a05e1..d2c288d03a7 100644
--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
@@ -44,7 +44,7 @@ import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
import { HttpResponse, graphql } from 'msw';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconDotsVertical, IconPlus } from 'twenty-ui/display';
+import { IconDotsVertical, IconPlus } from 'twenty-ui/icon';
import { JestContextStoreSetter } from '~/testing/jest/JestContextStoreSetter';
const openTimeout = 50;
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
index 3986797cc00..d13ede645ea 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
@@ -10,7 +10,7 @@ import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconDotsVertical } from 'twenty-ui/display';
+import { IconDotsVertical } from 'twenty-ui/icon';
const Wrapper = ({ children }: { children: React.ReactNode }) => (
<JotaiProvider store={jotaiStore}>
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
index f09c7b63736..57fdfbe6d3a 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
@@ -14,7 +14,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { t } from '@lingui/core/macro';
import { act } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconBolt, IconSettingsAutomation, useIcons } from 'twenty-ui/display';
+import { IconBolt, IconSettingsAutomation, useIcons } from 'twenty-ui/icon';
import { getJestMetadataAndApolloMocksAndCommandMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndCommandMenuWrapper';
import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
diff --git a/packages/twenty-front/src/modules/error-handler/components/AppRootErrorFallback.tsx b/packages/twenty-front/src/modules/error-handler/components/AppRootErrorFallback.tsx
index 5f86d2a38e3..7adf709460e 100644
--- a/packages/twenty-front/src/modules/error-handler/components/AppRootErrorFallback.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/AppRootErrorFallback.tsx
@@ -2,7 +2,7 @@ import { type AppErrorDisplayProps } from '@/error-handler/types/AppErrorDisplay
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { IconReload } from 'twenty-ui/display';
+import { IconReload } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type AppRootErrorFallbackProps = AppErrorDisplayProps;
diff --git a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
index 07d50396f41..388e1b8b68a 100644
--- a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
@@ -1,6 +1,6 @@
import { type AppErrorDisplayProps } from '@/error-handler/types/AppErrorDisplayProps';
import { t } from '@lingui/core/macro';
-import { IconRefresh } from 'twenty-ui/display';
+import { IconRefresh } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -8,7 +8,7 @@ import {
AnimatedPlaceholderEmptySubTitle,
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
export const AppErrorDisplay = ({
resetErrorBoundary,
diff --git a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
index 605275794c9..d3918b874cd 100644
--- a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
+++ b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { AvatarOrIcon } from 'twenty-ui/components';
-import { IconX } from 'twenty-ui/display';
+import { AvatarOrIcon } from 'twenty-ui/data-display';
+import { IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { getFileType } from '@/activities/files/utils/getFileType';
diff --git a/packages/twenty-front/src/modules/file/components/FileIcon.tsx b/packages/twenty-front/src/modules/file/components/FileIcon.tsx
index ae27b611c19..1a347455302 100644
--- a/packages/twenty-front/src/modules/file/components/FileIcon.tsx
+++ b/packages/twenty-front/src/modules/file/components/FileIcon.tsx
@@ -6,7 +6,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useState } from 'react';
import { FILE_CATEGORIES, type FileCategory } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { AvatarOrIcon } from 'twenty-ui/components';
+import { AvatarOrIcon } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type FileIconSize = 'small' | 'medium';
diff --git a/packages/twenty-front/src/modules/file/utils/fileIconMappings.ts b/packages/twenty-front/src/modules/file/utils/fileIconMappings.ts
index 9adf8e9d765..95fd3e81b76 100644
--- a/packages/twenty-front/src/modules/file/utils/fileIconMappings.ts
+++ b/packages/twenty-front/src/modules/file/utils/fileIconMappings.ts
@@ -9,7 +9,7 @@ import {
IconPresentation,
IconTable,
IconVideo,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const IconMapping: {
[key in AttachmentFileCategory]: IconComponent;
diff --git a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
index 7a33d150eab..9290ce009c8 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
+++ b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
@@ -68,7 +68,7 @@ jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({
}),
}));
-jest.mock('twenty-ui/display', () => ({
+jest.mock('twenty-ui/icon', () => ({
useIcons: () => ({
getIcon: mockGetIcon,
}),
diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
index 1bf0f1c1332..3b85f8206bf 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
@@ -20,7 +20,7 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { assertUnreachable, isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
index 81768fe6f92..b2cb5759111 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
@@ -7,9 +7,8 @@ import {
Banner,
type BannerColor,
type BannerVariant,
- type IconComponent,
- IconX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/feedback';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import { Button, IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx b/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
index af551cd08a7..09be97e68f3 100644
--- a/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
@@ -2,7 +2,7 @@ import { InformationBanner } from '@/information-banner/components/InformationBa
import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconRefresh } from 'twenty-ui/display';
+import { IconRefresh } from 'twenty-ui/icon';
const StyledInformationBannerDeletedRecord = styled.div`
height: 40px;
diff --git a/packages/twenty-front/src/modules/information-banner/components/impersonate/InformationBannerIsImpersonating.tsx b/packages/twenty-front/src/modules/information-banner/components/impersonate/InformationBannerIsImpersonating.tsx
index 1fef0fdafdb..91b540eab22 100644
--- a/packages/twenty-front/src/modules/information-banner/components/impersonate/InformationBannerIsImpersonating.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/impersonate/InformationBannerIsImpersonating.tsx
@@ -5,7 +5,7 @@ import { InformationBanner } from '@/information-banner/components/InformationBa
import { t } from '@lingui/core/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { IconLogout } from 'twenty-ui/display';
+import { IconLogout } from 'twenty-ui/icon';
export const InformationBannerIsImpersonating = () => {
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
diff --git a/packages/twenty-front/src/modules/information-banner/components/maintenance/InformationBannerMaintenance.tsx b/packages/twenty-front/src/modules/information-banner/components/maintenance/InformationBannerMaintenance.tsx
index f6aa2e6e691..f7b8cb1ca3f 100644
--- a/packages/twenty-front/src/modules/information-banner/components/maintenance/InformationBannerMaintenance.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/maintenance/InformationBannerMaintenance.tsx
@@ -7,7 +7,7 @@ import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { getSafeUrl, isDefined } from 'twenty-shared/utils';
-import { IconExternalLink } from 'twenty-ui/display';
+import { IconExternalLink } from 'twenty-ui/icon';
const formatMaintenanceDateTime = (
isoString: string,
diff --git a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx
index 69b6c52f057..b456e4ffaf8 100644
--- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx
@@ -4,7 +4,7 @@ import { useDismissReconnectAccountBanner } from '@/information-banner/hooks/use
import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys';
import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
import { t } from '@lingui/core/macro';
-import { IconRefresh } from 'twenty-ui/display';
+import { IconRefresh } from 'twenty-ui/icon';
const COMPONENT_INSTANCE_ID =
'information-banner-reconnect-account-email-aliases';
diff --git a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx
index dac71b68730..ed545223032 100644
--- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx
@@ -4,7 +4,7 @@ import { useDismissReconnectAccountBanner } from '@/information-banner/hooks/use
import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys';
import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
import { t } from '@lingui/core/macro';
-import { IconRefresh } from 'twenty-ui/display';
+import { IconRefresh } from 'twenty-ui/icon';
const COMPONENT_INSTANCE_ID =
'information-banner-reconnect-account-insufficient-permissions';
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
index b10753628e5..38a9256cb14 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
@@ -5,7 +5,7 @@ import {
} from './KeyboardShortcutMenuStyles';
import { t } from '@lingui/core/macro';
import { IconButton } from 'twenty-ui/input';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { useIsMobile } from 'twenty-ui/utilities';
type KeyboardMenuDialogProps = {
diff --git a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBar.tsx b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBar.tsx
index 27ef30bccaa..1e7001ba649 100644
--- a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBar.tsx
+++ b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBar.tsx
@@ -4,7 +4,7 @@ import { AnimatePresence, motion } from 'framer-motion';
import { useAtomValue } from 'jotai';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconCheck, IconPaint } from 'twenty-ui/display';
+import { IconCheck, IconPaint } from 'twenty-ui/icon';
import { GRAY_SCALE_LIGHT } from 'twenty-ui/theme';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
index 0c8fec106d1..966b1c200be 100644
--- a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarMenuDropdown.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconDotsVertical, IconReload } from 'twenty-ui/display';
+import { IconDotsVertical, IconReload } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { GRAY_SCALE_LIGHT } from 'twenty-ui/theme';
diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
index 6b00e0c92e9..57e992c867b 100644
--- a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts
@@ -3,7 +3,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
import { commandMenuItemsDraftState } from '@/command-menu-item/edit/states/commandMenuItemsDraftState';
import { commandMenuItemsSelector } from '@/command-menu-item/states/commandMenuItemsSelector';
diff --git a/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx b/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
index 9f4607760fe..57bbe06eecc 100644
--- a/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
+++ b/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
@@ -9,7 +9,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { type RoleManifest } from 'twenty-shared/application';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { LightButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { StyledAppModal } from '~/pages/settings/applications/components/SettingsAppModalLayout';
diff --git a/packages/twenty-front/src/modules/marketplace/utils/buildPermissionSummaryFromRoleManifest.ts b/packages/twenty-front/src/modules/marketplace/utils/buildPermissionSummaryFromRoleManifest.ts
index 2a370184529..c46cdde52a6 100644
--- a/packages/twenty-front/src/modules/marketplace/utils/buildPermissionSummaryFromRoleManifest.ts
+++ b/packages/twenty-front/src/modules/marketplace/utils/buildPermissionSummaryFromRoleManifest.ts
@@ -12,7 +12,7 @@ import {
IconSparkles,
IconTool,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { SystemPermissionFlag } from 'twenty-shared/constants';
export type PermissionSummaryItem = {
diff --git a/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx b/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
index 74d6aa244b3..5d887a21de0 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionMenuListItem.tsx
@@ -1,7 +1,7 @@
import { type MouseEvent } from 'react';
import { getAvatarType } from '@/object-metadata/utils/getAvatarType';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItemSuggestion } from 'twenty-ui/navigation';
type MentionMenuListItemProps = {
diff --git a/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx b/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
index b024406c2ce..2e22a76dbfc 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionRecordChip.tsx
@@ -6,7 +6,7 @@ import {
Chip,
ChipVariant,
LinkChip,
-} from 'twenty-ui/components';
+} from 'twenty-ui/data-display';
type MentionRecordChipProps = {
recordId: string;
diff --git a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
index 41a7f6bcaad..7a6f45cf768 100644
--- a/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
+++ b/packages/twenty-front/src/modules/mention/components/MentionSuggestionMenu.tsx
@@ -1,5 +1,5 @@
import { forwardRef } from 'react';
-import { AvatarOrIcon } from 'twenty-ui/components';
+import { AvatarOrIcon } from 'twenty-ui/data-display';
import { MenuItemSuggestion } from 'twenty-ui/navigation';
import type { MentionSearchResult } from '@/mention/types/MentionSearchResult';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
index c149b42ee7c..dae39451df8 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
@@ -2,12 +2,10 @@ import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import {
Avatar,
- IconLink,
- IconWorld,
StyledTintedIconTileContainer,
getIconTileColorShades,
- useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/data-display';
+import { IconLink, IconWorld, useIcons } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx
index 452df60f1ae..865dd89a4d2 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx
@@ -2,11 +2,8 @@ import { styled } from '@linaria/react';
import { useContext, type ReactNode } from 'react';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconGripVertical,
- TintedIconTile,
- type IconComponent,
-} from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconGripVertical, type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts
index 694f1136fd6..b5fc9f534ea 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts
@@ -3,7 +3,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined, normalizeUrl } from 'twenty-shared/utils';
-import { IconFolder, IconLink, useIcons } from 'twenty-ui/display';
+import { IconFolder, IconLink, useIcons } from 'twenty-ui/icon';
import { useEnterLayoutCustomizationMode } from '@/layout-customization/hooks/useEnterLayoutCustomizationMode';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx
index 29a3fc1478b..a3b2b7a526f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx
@@ -1,6 +1,6 @@
import { Suspense, lazy, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown, IconChevronRight, useIcons } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronRight, useIcons } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
index 201c279a44e..29b327bc3a8 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
@@ -1,4 +1,4 @@
-import { IconHeartOff } from 'twenty-ui/display';
+import { IconHeartOff } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
index 4f128430e5e..70e13e0d35d 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx
@@ -10,7 +10,7 @@ import {
IconHeartOff,
IconPlus,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
index 28bdb457802..c16fb1e4451 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx
index 8b9dc017266..7d546d9093f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent, getIconTileColorShades } from 'twenty-ui/display';
+import { getIconTileColorShades } from 'twenty-ui/data-display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsx
index 38cc4c04573..800dcdc7b0a 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsx
@@ -1,5 +1,5 @@
import { useContext } from 'react';
-import { IconArrowUpRight } from 'twenty-ui/display';
+import { IconArrowUpRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
index 097ca4f114a..130a5026812 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
@@ -26,7 +26,8 @@ import {
NavigationMenuItemType,
} from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
-import { Avatar, IconLock, useIcons } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconLock, useIcons } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/page-layout/components/NavigationMenuItemPageLayoutDisplay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/page-layout/components/NavigationMenuItemPageLayoutDisplay.tsx
index 28d4200c749..2f7fa207db1 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/page-layout/components/NavigationMenuItemPageLayoutDisplay.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/page-layout/components/NavigationMenuItemPageLayoutDisplay.tsx
@@ -1,6 +1,6 @@
import { useLocation } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
index fbc0b3a4cca..489269b4d12 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useCallback, useContext, useMemo } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconHeart, IconHeartOff, IconPlus } from 'twenty-ui/display';
+import { IconHeart, IconHeartOff, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx
index 3dbd13f36c1..c801b6637a2 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx
@@ -4,7 +4,7 @@ import { NavigationMenuItemDndKitProvider } from '@/navigation-menu-item/display
import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';
import { FavoritesSection } from '@/navigation-menu-item/display/sections/favorites/components/FavoritesSection';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
export const FavoritesSectionDispatcher = () => {
const isLayoutCustomizationModeEnabled = useAtomStateValue(
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
index 00bb698a56a..b16c92a4b4f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
@@ -8,7 +8,7 @@ import {
IconPlus,
IconTool,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx
index e12a37e2978..66da6565777 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx
@@ -1,6 +1,7 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { type IconComponent, getIconTileColorShades } from 'twenty-ui/display';
+import { getIconTileColorShades } from 'twenty-ui/data-display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCompositeContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsx
index e6c6d400753..823732644e8 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx
index 8fba0bea760..8152c31df02 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx
@@ -1,7 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import React from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconColumnInsertRight, IconPlus } from 'twenty-ui/display';
+import { IconColumnInsertRight, IconPlus } from 'twenty-ui/icon';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts
index fb0b1ff9b5e..bce08608de1 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconColumnInsertRight } from 'twenty-ui/display';
+import { IconColumnInsertRight } from 'twenty-ui/icon';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts
index 509d5ec4a45..c13c0a8e432 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts
@@ -4,7 +4,7 @@ import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import type { IconComponent } from 'twenty-ui/display';
+import type { IconComponent } from 'twenty-ui/icon';
export const useOpenNavigationMenuItemInSidePanel = () => {
const { navigateSidePanel } = useNavigateSidePanel();
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx
index e1265c52182..73d72cddd89 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx
@@ -10,7 +10,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { capitalize } from 'twenty-shared/utils';
-import { IconColorSwatch } from 'twenty-ui/display';
+import { IconColorSwatch } from 'twenty-ui/icon';
import { DEFAULT_COLOR_LABELS } from 'twenty-ui/navigation';
import { type ThemeColor } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx
index c6f59971596..d501404e445 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx
@@ -1,6 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { TintedIconTile, useIcons } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { useIcons } from 'twenty-ui/icon';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx
index 33e438159b4..d8cf481a4b5 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx
@@ -6,7 +6,7 @@ import {
IconRowInsertBottom,
IconRowInsertTop,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx
index f8554c5dae1..636fd8de094 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconApps } from 'twenty-ui/display';
+import { IconApps } from 'twenty-ui/icon';
import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx
index ffafb6769ff..bb83a965898 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx
@@ -25,7 +25,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { parseThemeColor } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx
index 546d70c69d1..471351a256f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx
@@ -1,14 +1,13 @@
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Avatar, TintedIconTile } from 'twenty-ui/data-display';
import {
- Avatar,
IconBuildingSkyscraper,
IconFolder,
IconLink,
IconTable,
- TintedIconTile,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx
index 44d7eb62d39..741fef22744 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx
@@ -15,7 +15,7 @@ import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPa
import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { ViewKey } from '@/views/types/ViewKey';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const SidePanelNewSidebarItemObjectSubPage = () => {
const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx
index 05a9934254d..2d6feefd2e6 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx
@@ -14,7 +14,7 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { ViewKey } from '@/views/types/ViewKey';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const SidePanelNewSidebarItemObjectSystemPickerSubPage = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx
index 16508dafe95..7d3494ac377 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx
@@ -1,4 +1,5 @@
-import { Avatar, useIcons } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { useIcons } from 'twenty-ui/icon';
import {
CoreObjectNameSingular,
NavigationMenuItemType,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx
index 33ff84f1f44..0b501f359fb 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx
@@ -1,5 +1,6 @@
import { useLingui } from '@lingui/react/macro';
-import { IconSettings, TintedIconTile } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconSettings } from 'twenty-ui/icon';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx
index 6e52cf434a2..a98a1e77659 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx
@@ -19,7 +19,7 @@ import { type View } from '@/views/types/View';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
type SidePanelNewSidebarItemViewPickerSubViewProps = {
selectedObjectMetadataIdForView: string;
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx
index 045a2bcb250..6e0a7a5f67b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx
@@ -1,5 +1,6 @@
import { useLingui } from '@lingui/react/macro';
-import { IconSettings, TintedIconTile } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconSettings } from 'twenty-ui/icon';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts
index ac316705b87..5e7031e115a 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
-import { IconFolder } from 'twenty-ui/display';
+import { IconFolder } from 'twenty-ui/icon';
import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts
index 4d921cd6935..96c8b66ceb7 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts
@@ -1,7 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { normalizeUrl } from 'twenty-shared/utils';
-import { IconLink } from 'twenty-ui/display';
+import { IconLink } from 'twenty-ui/icon';
import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts
index 06b1973b7d8..bdb2bf79083 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts
@@ -3,7 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useNavigate } from 'react-router-dom';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconDotsVertical } from 'twenty-ui/display';
+import { IconDotsVertical } from 'twenty-ui/icon';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
index e1b7e8e929a..a5f3d0c887c 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
@@ -1,11 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import {
- IconComment,
- IconHome,
- IconMessageCirclePlus,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconComment, IconHome, IconMessageCirclePlus } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index 45390d56510..5ec008dd38c 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -20,7 +20,7 @@ import {
IconList,
IconMessageCirclePlus,
IconSearch,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { NavigationBar } from 'twenty-ui/navigation';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx
index 640ad9bb0e2..2be2bfc1e40 100644
--- a/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { IconHelpCircle, IconSettings } from 'twenty-ui/display';
+import { IconHelpCircle, IconSettings } from 'twenty-ui/icon';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
diff --git a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx
index 1c75f46217b..1b91f60aed7 100644
--- a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawer.tsx
@@ -15,7 +15,7 @@ import { css } from '@linaria/core';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useIsMobile } from 'twenty-ui/utilities';
-import { AdvancedSettingsToggle } from 'twenty-ui/navigation';
+import { AdvancedSettingsToggle } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx
index 47b35c962ab..dcdfaee67e8 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx
@@ -1,6 +1,7 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
-import { TintedIconTile, useIcons } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { useIcons } from 'twenty-ui/icon';
export type ObjectMetadataIconInput = Pick<
EnrichedObjectMetadataItem,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts
index 084ca3e2e9a..be14d6b6ec4 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts
@@ -1,4 +1,4 @@
-import { type IconComponent, useIcons } from 'twenty-ui/display';
+import { type IconComponent, useIcons } from 'twenty-ui/icon';
import { type ThemeColor } from 'twenty-ui/theme';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getIconForObjectType.ts b/packages/twenty-front/src/modules/object-metadata/utils/getIconForObjectType.ts
index 52e78c88254..d2229471c2d 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getIconForObjectType.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getIconForObjectType.ts
@@ -1,4 +1,4 @@
-import { IconCheckbox, type IconComponent, IconNotes } from 'twenty-ui/display';
+import { IconCheckbox, type IconComponent, IconNotes } from 'twenty-ui/icon';
export const getIconForObjectType = (
objectType: string,
): IconComponent | undefined => {
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
index 9386aff9594..69566cd1d84 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
@@ -19,7 +19,7 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
-import { IconLibraryPlus, IconPlus } from 'twenty-ui/display';
+import { IconLibraryPlus, IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
index 380547917d0..2f231f094a6 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx
@@ -23,7 +23,7 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type AdvancedFilterCompositeSubFieldSelectMenuProps = {
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
index 4ae7e5971a5..1185e2b1e17 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx
@@ -8,7 +8,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
index f32cb131fc1..312e0935fe9 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx
@@ -13,7 +13,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
index eca26dd4287..d3b96dd77d0 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx
@@ -18,7 +18,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type AdvancedFilterRelationTargetFieldSelectMenuProps = {
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts
index 98096bc8ae1..be77823ed9a 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts
@@ -6,7 +6,7 @@ import { isValidSubFieldName } from '@/settings/data-model/utils/isValidSubField
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const useRecordFilterField = (recordFilterId: string) => {
const currentRecordFilters = useAtomComponentStateValue(
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
index df0445b96cd..98b8edd5085 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
@@ -13,7 +13,7 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
index 8aa86413f2d..800416a17ee 100644
--- a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
@@ -16,7 +16,7 @@ import {
type ChipSize,
ChipVariant,
LinkChip,
-} from 'twenty-ui/components';
+} from 'twenty-ui/data-display';
import { type TriggerEventType } from 'twenty-ui/utilities';
export type RecordChipProps = {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownActorSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownActorSelect.tsx
index 9013d7d2cca..b077596c3a2 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownActorSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownActorSelect.tsx
@@ -15,7 +15,7 @@ import {
arrayOfUuidOrVariableSchema,
jsonRelationFilterValueSchema,
} from 'twenty-shared/utils';
-import { IconUserCircle } from 'twenty-ui/display';
+import { IconUserCircle } from 'twenty-ui/icon';
export const EMPTY_ACTOR_FILTER_VALUE: string = JSON.stringify({
isCurrentWorkspaceMemberSelected: false,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
index f162dddbb36..0d765feda0b 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
@@ -11,7 +11,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
const StyledBooleanSelectContainer = styled.div<{ selected?: boolean }>`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx
index 29f8f6e151a..b3bd16435fa 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx
@@ -7,7 +7,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { ViewBarFilterDropdownFilterInputMenuHeader } from '@/views/components/ViewBarFilterDropdownFilterInputMenuHeader';
import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';
import { useContext } from 'react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
// TODO: we shouldn't guess in which parent we are, this should be splitted in two components, one for each case
export const ObjectFilterDropdownFilterInputHeader = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
index 51d25ada373..e9658ecc842 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
@@ -5,7 +5,7 @@ import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRel
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export type ObjectFilterDropdownFilterSelectMenuItemProps = {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx
index 35d3c59ea45..cb6797501da 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx
@@ -1,6 +1,6 @@
import { type SelectableItem } from '@/object-record/select/types/SelectableItem';
import { styled } from '@linaria/react';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
index 6d8604c9253..b619617f72c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
@@ -23,7 +23,7 @@ import {
isDefined,
jsonRelationFilterValueSchema,
} from 'twenty-shared/utils';
-import { IconUserCircle } from 'twenty-ui/display';
+import { IconUserCircle } from 'twenty-ui/icon';
import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowRequestsToTwentyIcons';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions.ts
index 192f6d923b5..a6450b11926 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions.ts
@@ -8,7 +8,7 @@ import {
IconSettingsAutomation,
IconUserCircle,
IconWebhook,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const getActorSourceMultiSelectOptions = (
selectedSourceNames: string[],
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
index 21d8efb4077..e1bb6b9aea7 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx
@@ -14,7 +14,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isFieldMetadataDateKind } from 'twenty-shared/utils';
-import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/icon';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownCalendarFieldsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
index 8bb9c970601..6f203d56c9f 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx
@@ -13,13 +13,13 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';
import { t } from '@lingui/core/macro';
-import { Pill } from 'twenty-ui/components';
+import { Pill } from 'twenty-ui/data-display';
import {
IconCalendarMonth,
IconCalendarWeek,
IconChevronLeft,
IconTimelineEvent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ViewCalendarLayout } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
index 36f7143d2e1..d32e182f8e0 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
@@ -24,14 +24,14 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/use
import { useLingui } from '@lingui/react/macro';
import { capitalize, isDefined } from 'twenty-shared/utils';
import {
- AppTooltip,
IconCalendar,
IconCalendarWeek,
IconLayoutList,
IconListDetails,
IconShare,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
import { MenuItem } from 'twenty-ui/navigation';
import { ViewCalendarLayout } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
index b4af4521d68..0e4a76f9481 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx
@@ -19,7 +19,7 @@ import {
IconListDetails,
IconLock,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
index dc313387deb..0fca7793ec9 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent.tsx
@@ -10,7 +10,7 @@ import { ViewFieldsVisibleDropdownSection } from '@/views/components/ViewFieldsV
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { IconChevronLeft, IconEyeOff } from 'twenty-ui/display';
+import { IconChevronLeft, IconEyeOff } from 'twenty-ui/icon';
import { MenuItemNavigate } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownFieldsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
index 42bf13b584f..3197983c5a3 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
@@ -14,7 +14,7 @@ import { ViewFieldsHiddenDropdownSection } from '@/views/components/ViewFieldsHi
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronLeft, IconSettings } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownHiddenFieldsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
index 5b54617da9a..22a5470c331 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
@@ -23,7 +23,7 @@ import { useLocation } from 'react-router-dom';
import { VIEW_GROUP_VISIBLE_OPTIONS_MAX } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronLeft, IconSettings } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
index 35cba6b9824..fcd177054af 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
@@ -33,8 +33,8 @@ import {
IconLayoutNavbar,
IconLayoutSidebarRight,
IconTable,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItem, MenuItemSelect, MenuItemToggle } from 'twenty-ui/navigation';
import {
ViewCalendarLayout,
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx
index 4703cd5af4a..3426af50595 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx
@@ -20,7 +20,7 @@ import {
IconChevronLeft,
IconLayoutNavbar,
IconLayoutSidebarRight,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownLayoutOpenInContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
index 2a4f1aa7f7d..7f1ac450582 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx
@@ -15,7 +15,8 @@ import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states
import { styled } from '@linaria/react';
import { useContext, useEffect, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
-import { OverflowingTextWithTooltip, useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
index 858bb4b18f2..587bc7f38e8 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
@@ -23,7 +23,7 @@ import { useLingui } from '@lingui/react/macro';
import { useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/icon';
import {
MenuItem,
MenuItemSelect,
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
index 432ec23f025..eff163b7e0a 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx
@@ -21,7 +21,7 @@ import {
IconHandMove,
IconSortAZ,
IconSortZA,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
export const ObjectOptionsDropdownRecordGroupSortContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
index 38d4a236c83..1bb7b48ab74 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
@@ -29,7 +29,7 @@ import {
IconEyeOff,
IconLayoutList,
IconSortDescending,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import {
MenuItem,
MenuItemNavigate,
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
index 2f8659134ec..2a53a333de5 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
@@ -17,12 +17,12 @@ import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';
import { useLingui } from '@lingui/react/macro';
import { createPortal } from 'react-dom';
import {
- AppTooltip,
IconChevronLeft,
IconCircle,
IconCircleDashed,
IconCopy,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
import {
ViewVisibility,
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 877b9f646d4..7dee8849cc0 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -32,7 +32,7 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { Trans, useLingui } from '@lingui/react/macro';
import { findByProperty } from 'twenty-shared/utils';
-import { IconX, useIcons } from 'twenty-ui/display';
+import { IconX, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { v4 } from 'uuid';
import { ViewSortDirection } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
index fdedc6ef34b..b3707bab8ed 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx
@@ -14,7 +14,7 @@ import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constan
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useContext } from 'react';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/components';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/data-display';
export const RecordBoardClickOutsideEffect = () => {
const { recordBoardId } = useContext(RecordBoardContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
index beb5153035c..1f6f63708d3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -33,7 +33,7 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
import { useDebouncedCallback } from 'use-debounce';
const StyledCardContainer = styled.div<{ isPrimaryMultiDrag?: boolean }>`
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
index 77dd1f34cea..b8cb09f2072 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
@@ -22,8 +22,8 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
-import { ChipVariant } from 'twenty-ui/components';
-import { IconEye, IconEyeOff } from 'twenty-ui/display';
+import { ChipVariant } from 'twenty-ui/data-display';
+import { IconEye, IconEyeOff } from 'twenty-ui/icon';
import { Checkbox, CheckboxVariant, LightIconButton } from 'twenty-ui/input';
const StyledCompactIconContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx
index b855379a987..7aea3c3cec3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardMultiDragCounterChip.tsx
@@ -1,7 +1,7 @@
import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
-import { NotificationCounter } from 'twenty-ui/navigation';
+import { NotificationCounter } from 'twenty-ui/data-display';
const StyledNotificationCounterContainer = styled.div`
position: absolute;
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index 53a644335f4..24d0c8958d2 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -20,8 +20,8 @@ import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown'
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { Tag } from 'twenty-ui/components';
-import { IconDotsVertical, IconPlus } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { IconDotsVertical, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
const StyledHeader = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
index c4961236104..606c7f82ff6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
@@ -4,8 +4,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { styled } from '@linaria/react';
import { type Nullable } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
-import { AppTooltip, TooltipDelay } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
const StyledTagContainer = styled.div`
width: 100%;
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
index 1931d070310..4675c5fe646 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
@@ -12,12 +12,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate';
import { isDefined } from 'twenty-shared/utils';
-import {
- Icon123,
- IconCheck,
- IconChevronLeft,
- useIcons,
-} from 'twenty-ui/display';
+import { Icon123, IconCheck, IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuItem.tsx
index fd5043224ce..1d51ddba4c1 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuItem.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const RecordBoardColumnHeaderAggregateDropdownMenuItem = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
index 411e144f775..b1366696ddd 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
@@ -19,7 +19,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate';
import isEmpty from 'lodash.isempty';
-import { IconCheck, IconChevronLeft } from 'twenty-ui/display';
+import { IconCheck, IconChevronLeft } from 'twenty-ui/icon';
export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({
availableAggregations,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
index cd5a09054dc..45dac3eb0e8 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
@@ -8,7 +8,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNewButton = styled.button`
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
index 2857f59fcd0..4d7edb5bccc 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx
@@ -13,7 +13,7 @@ import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constan
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/components';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainerContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
index 569f68e9bdc..adeff443449 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
@@ -11,7 +11,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { type Temporal } from 'temporal-polyfill';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
index b008bd49f36..fb91ea19b94 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
@@ -18,7 +18,7 @@ import {
isDefined,
turnPlainDateToShiftedDateInSystemTimeZone,
} from 'twenty-shared/utils';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/display';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
index 2685945cfde..3618b57b8c9 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx
@@ -18,7 +18,7 @@ import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/us
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { styled } from '@linaria/react';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
index 23b83f78faf..f712e150985 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
@@ -11,7 +11,7 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { styled } from '@linaria/react';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { ChipVariant } from 'twenty-ui/components';
+import { ChipVariant } from 'twenty-ui/data-display';
import { Checkbox, CheckboxVariant } from 'twenty-ui/input';
import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
index dbade26a6f9..892713f0cdb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
@@ -8,7 +8,7 @@ import { RecordDetailSectionContainer } from '@/object-record/record-field-list/
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowMerge } from 'twenty-ui/display';
+import { IconArrowMerge } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
export const RecordDetailDuplicatesSection = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
index b71a73ae30b..381d21c5dbc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownManyToOne.tsx
@@ -20,7 +20,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconForbid, IconPencil } from 'twenty-ui/display';
+import { IconForbid, IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
type RecordDetailMorphRelationSectionDropdownManyToOneProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
index 8c581922d6d..282355441fd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdownOneToMany.tsx
@@ -22,7 +22,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
type RecordDetailMorphRelationSectionDropdownOneToManyProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
index 276cd2ddbf7..0dd018fd662 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
@@ -42,10 +42,10 @@ import {
IconTrash,
IconUnlink,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
const StyledClickableZone = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
index 82b66f828fe..a6538736f42 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
@@ -40,7 +40,7 @@ import {
CustomError,
isDefined,
} from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
type RecordDetailRelationSectionDropdownToManyProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
index 4e69622bd91..8566bf74626 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToOne.tsx
@@ -26,7 +26,7 @@ import { getFieldMetadataItemById } from '@/object-metadata/utils/getFieldMetada
import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconForbid, IconPencil } from 'twenty-ui/display';
+import { IconForbid, IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
type RecordDetailRelationSectionDropdownToOneProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
index 1051c18fb1c..f7a7ac4c878 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconCopy } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/BaseChip.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/BaseChip.tsx
index d2065e6c314..1adb14a359d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/BaseChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/BaseChip.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledChip = styled.div<{ deletable: boolean; danger: boolean }>`
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
index 699cb7ce7b1..ac486438bc2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput.tsx
@@ -17,7 +17,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useId, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconMaximize } from 'twenty-ui/display';
+import { IconMaximize } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
index 11fefb120aa..1a9a4e52603 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
@@ -27,7 +27,7 @@ import { useLingui } from '@lingui/react/macro';
import { isNonEmptyArray } from '@sniptt/guards';
import { useContext, useId, useRef, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { MenuItem } from 'twenty-ui/navigation';
import { toSpliced } from '~/utils/array/toSpliced';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx
index 5a1089d27f6..76fb7fe342f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx
@@ -11,7 +11,7 @@ import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariabl
import { useLingui } from '@lingui/react/macro';
import { useContext, useId, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconCheck, IconCircleOff, IconX } from 'twenty-ui/display';
+import { IconCheck, IconCircleOff, IconX } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type FormBooleanFieldInputProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCallingCodeSelectInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCallingCodeSelectInput.tsx
index 2c4b17ac234..42f3d6fbe0c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCallingCodeSelectInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCallingCodeSelectInput.tsx
@@ -5,7 +5,7 @@ import { type VariablePickerComponent } from '@/object-record/record-field/ui/fo
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';
import { t } from '@lingui/core/macro';
-import { IconCircleOff, type IconComponentProps } from 'twenty-ui/display';
+import { IconCircleOff, type IconComponentProps } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
export type FormCallingCodeSelectInputUpdatedValue = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountryMultiSelectInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountryMultiSelectInput.tsx
index e281246a877..81f18a7ede6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountryMultiSelectInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountryMultiSelectInput.tsx
@@ -4,7 +4,7 @@ import { FormMultiSelectFieldInput } from '@/object-record/record-field/ui/form-
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
-import { type IconComponentProps } from 'twenty-ui/display';
+import { type IconComponentProps } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
export const FormCountryMultiSelectInput = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountrySelectInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountrySelectInput.tsx
index 1402f7fdf79..c063db69ced 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountrySelectInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCountrySelectInput.tsx
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
-import { IconCircleOff, type IconComponentProps } from 'twenty-ui/display';
+import { IconCircleOff, type IconComponentProps } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
export const FormCountrySelectInput = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx
index 6df65e6a474..19becd6dcf1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx
@@ -9,7 +9,7 @@ import { InputLabel } from '@/ui/input/components/InputLabel';
import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { type CurrencyCode } from 'twenty-shared/constants';
-import { IconCircleOff } from 'twenty-ui/display';
+import { IconCircleOff } from 'twenty-ui/icon';
type FormCurrencyFieldInputProps = {
label?: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
index a082ee4f000..164039561b2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
@@ -23,7 +23,7 @@ import { isArray } from '@sniptt/guards';
import { useContext, useId, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { VisibilityHidden } from 'twenty-ui/accessibility';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
index 7e15563cf64..6b189c5ed01 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
@@ -14,7 +14,7 @@ import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariabl
import { useContext, useId, useState } from 'react';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { IconCircleOff } from 'twenty-ui/display';
+import { IconCircleOff } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx
index 030a97773ac..c2e1c0f3d17 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx
@@ -10,7 +10,7 @@ import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariabl
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconForbid } from 'twenty-ui/display';
+import { IconForbid } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRecordChipContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx
index 1f2308b67b9..af2c082b328 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx
@@ -18,7 +18,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useCallback, useContext, useId } from 'react';
import { CustomError, isDefined, isValidUuid } from 'twenty-shared/utils';
-import { IconChevronDown, IconForbid } from 'twenty-ui/display';
+import { IconChevronDown, IconForbid } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFormSelectContainerWrapper = styled.div<{ readonly?: boolean }>`
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx
index a1a8c705cf3..146a4ad874b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx
@@ -10,7 +10,7 @@ import {
} from 'react';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown, IconUserCircle } from 'twenty-ui/display';
+import { IconChevronDown, IconUserCircle } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type JsonValue } from 'type-fest';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputTrigger.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputTrigger.tsx
index 5b635a85c52..90f3a534590 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputTrigger.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputTrigger.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconUserCircle } from 'twenty-ui/display';
+import { IconUserCircle } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FormFieldPlaceholder } from '@/object-record/record-field/ui/form-types/components/FormFieldPlaceholder';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/VariableChip.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/VariableChip.tsx
index 3e173d8acc3..2ebd71b5115 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/VariableChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/VariableChip.tsx
@@ -4,7 +4,7 @@ import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { extractRawVariableNamePart } from 'twenty-shared/workflow';
-import { IconAlertTriangle } from 'twenty-ui/display';
+import { IconAlertTriangle } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type VariableChipProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useGetButtonIcon.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useGetButtonIcon.test.tsx
index bc660aaea50..8ef9ec7fa7c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useGetButtonIcon.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useGetButtonIcon.test.tsx
@@ -9,7 +9,7 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
import { useGetButtonIcon } from '@/object-record/record-field/ui/hooks/useGetButtonIcon';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
const recordId = 'recordId';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
index 6f25b9c8276..1c3480f24c8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
@@ -2,7 +2,7 @@ import { useContext } from 'react';
import { getFieldButtonIcon } from '@/object-record/record-field/ui/utils/getFieldButtonIcon';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
export const useGetButtonIcon = (): IconComponent | undefined => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx
index 2a981969d8d..304d4727627 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx
@@ -1,7 +1,7 @@
import { RecordChip } from '@/object-record/components/RecordChip';
import { useChipFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay';
import { isDefined } from 'twenty-shared/utils';
-import { ChipSize } from 'twenty-ui/components';
+import { ChipSize } from 'twenty-ui/data-display';
export const ChipFieldDisplay = () => {
const {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ForbiddenFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ForbiddenFieldDisplay.tsx
index 16ea2edf66a..142ddf7fef4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ForbiddenFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ForbiddenFieldDisplay.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/MultiSelectFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/MultiSelectFieldDisplay.tsx
index fab447f2995..a0aeff5c084 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/MultiSelectFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/MultiSelectFieldDisplay.tsx
@@ -2,7 +2,7 @@ import { useFieldFocus } from '@/object-record/record-field/ui/hooks/useFieldFoc
import { useMultiSelectFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useMultiSelectFieldDisplay';
import { MultiSelectDisplay } from '@/ui/field/display/components/MultiSelectDisplay';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import { isDefined } from 'twenty-shared/utils';
export const MultiSelectFieldDisplay = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldMenuItem.tsx
index 56c6a0d056a..8e460437b0c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldMenuItem.tsx
@@ -1,7 +1,7 @@
import { FileIcon } from '@/file/components/FileIcon';
import { type FieldFilesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { getFileCategoryFromExtension } from '@/object-record/record-field/ui/utils/getFileCategoryFromExtension';
-import { Chip, ChipVariant } from 'twenty-ui/components';
+import { Chip, ChipVariant } from 'twenty-ui/data-display';
import { MultiItemFieldMenuItem } from './MultiItemFieldMenuItem';
type FilesFieldMenuItemProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx
index 2bdab5e8b92..05c902bb216 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx
@@ -15,7 +15,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconForbid } from 'twenty-ui/display';
+import { IconForbid } from 'twenty-ui/icon';
export const MorphRelationManyToOneFieldInput = () => {
const { fieldDefinition, recordId } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
index 5f2fb98e0bb..fb57c474b4e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInput.tsx
@@ -22,7 +22,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isNonEmptyString } from '@sniptt/guards';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconCheck, IconPlus } from 'twenty-ui/display';
+import { IconCheck, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
index 7b9dd8fa7fa..4c5fb0291c6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldMenuItem.tsx
@@ -12,7 +12,7 @@ import {
IconCopy,
IconPencil,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type MultiItemFieldMenuItemProps<T> = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
index 95d6454ca49..c275552791c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
@@ -9,7 +9,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useLingui } from '@lingui/react/macro';
import { useContext, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
import { CodeEditor, FloatingIconButton } from 'twenty-ui/input';
import { JsonTree, isTwoFirstDepths } from 'twenty-ui/json-visualizer';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
index ef79e910f7c..3c2960b88c3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
@@ -18,7 +18,7 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconForbid } from 'twenty-ui/display';
+import { IconForbid } from 'twenty-ui/icon';
export const RelationManyToOneFieldInput = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
index 752ec6e7e95..b344597cbb7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx
@@ -12,7 +12,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { styled } from '@linaria/react';
import { Suspense, lazy, useContext, useRef } from 'react';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { IconLayoutSidebarLeftCollapse } from 'twenty-ui/display';
+import { IconLayoutSidebarLeftCollapse } from 'twenty-ui/icon';
import { FloatingIconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldDefinition.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldDefinition.ts
index 42c8e5df358..800c8bc7730 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldDefinition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldDefinition.ts
@@ -1,6 +1,6 @@
import { type FieldMetadataType } from '~/generated-metadata/graphql';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type FieldMetadata } from './FieldMetadata';
export type FieldDefinition<T extends FieldMetadata> = {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/RecordChipData.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/RecordChipData.ts
index 74596bde843..3d3dff2cac4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/RecordChipData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/RecordChipData.ts
@@ -1,4 +1,4 @@
-import { type AvatarType } from 'twenty-ui/display';
+import { type AvatarType } from 'twenty-ui/data-display';
export type RecordChipData = {
recordId: string;
name: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/getFieldButtonIcon.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/getFieldButtonIcon.ts
index 225ee9bcfdb..57d5b783dc5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/getFieldButtonIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/getFieldButtonIcon.ts
@@ -10,7 +10,7 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
import { isFieldArray } from '@/object-record/record-field/ui/types/guards/isFieldArray';
import { isFieldFiles } from '@/object-record/record-field/ui/types/guards/isFieldFiles';
-import { IconPencil, type IconComponent } from 'twenty-ui/display';
+import { IconPencil, type IconComponent } from 'twenty-ui/icon';
export const getFieldButtonIcon = (
fieldDefinition:
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
index 694f99b0df4..9d749b1aadf 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx
@@ -6,8 +6,8 @@ import {
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
-import { IconEye, IconEyeOff } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { IconEye, IconEyeOff } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
type RecordGroupMenuItemDraggableProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
index 1d65ebca169..36ddd64bce3 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
@@ -24,7 +24,7 @@ import {
IconArrowRight,
IconEyeOff,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/object-record/record-group/types/RecordGroupActions.ts b/packages/twenty-front/src/modules/object-record/record-group/types/RecordGroupActions.ts
index 65a9dff0183..8c40542a412 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/types/RecordGroupActions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-group/types/RecordGroupActions.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type RecordGroupAction = {
id: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
index 3f03e07c2f3..685fd27efa0 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateNotShared.tsx
@@ -9,7 +9,7 @@ import {
AnimatedPlaceholderEmptySubTitle,
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
const StyledEmptyPlaceholderOuterContainer = styled.div`
height: 100%;
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageKanbanAddMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageKanbanAddMenuItem.tsx
index 4297cdf0b3f..86ec49f9d46 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageKanbanAddMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageKanbanAddMenuItem.tsx
@@ -4,7 +4,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
import { MenuItem } from 'twenty-ui/navigation';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
const StyledMenuItemContainer = styled.div`
width: calc(100% - 2 * var(--horizontal-padding));
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
index 8b45437e51a..d8ad6ea7bba 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
@@ -20,7 +20,7 @@ import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropd
import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
import { activeDropdownFocusIdState } from '@/ui/layout/dropdown/states/activeDropdownFocusIdState';
import { useStore } from 'jotai';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { RecordInlineCellContainer } from './RecordInlineCellContainer';
import {
RecordInlineCellContext,
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
index ff99d68d712..0f869d53e40 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortalContext.tsx
@@ -8,7 +8,7 @@ import {
type RecordInlineCellContextProps,
} from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
import { useContext, type ReactNode } from 'react';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
type RecordInlineCellAnchoredPortalContextProps = {
children: ReactNode;
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index 62b08f637b3..75f546873d7 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -13,7 +13,7 @@ import {
AppTooltip,
OverflowingTextWithTooltip,
TooltipDelay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/surfaces';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { useRecordInlineCellContext } from './RecordInlineCellContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
index 187cc3a7b04..64f1dab71ca 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContext.tsx
@@ -1,5 +1,5 @@
import { createContext, type ReactElement, useContext } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type RecordInlineCellContextProps = {
readonly?: boolean;
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
index 621580c83c3..12ef04edce7 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { FloatingIconButton } from 'twenty-ui/input';
-import { AnimatedContainer } from 'twenty-ui/utilities';
+import { AnimatedContainer } from 'twenty-ui/layout';
const StyledInlineCellButtonContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
index bd02997a6dd..c71a1d4c068 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
@@ -4,7 +4,7 @@ import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotke
import { styled } from '@linaria/react';
import { Key } from 'ts-key-enum';
import { t } from '@lingui/core/macro';
-import { IconArrowMerge } from 'twenty-ui/display';
+import { IconArrowMerge } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
index 4d47fc4c156..e4654ec2d5a 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
import { useLingui } from '@lingui/react/macro';
-import { IconArrowMerge, IconSettings } from 'twenty-ui/display';
+import { IconArrowMerge, IconSettings } from 'twenty-ui/icon';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
index e54d115168d..b6c8c349c75 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
@@ -9,7 +9,7 @@ import {
IconSquareNumber7,
IconSquareNumber8,
IconSquareNumber9,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type FixedLengthArray } from '@/object-record/record-merge/types/FixedLengthArray';
export const getPositionNumberIcon = (index: number) => {
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
index 3774e5fa9ce..d6ecc1baa56 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx
@@ -22,7 +22,7 @@ import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/h
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
type MultipleRecordPickerProps = {
onChange?: (morphItem: RecordPickerPickableMorphItem) => void;
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
index bd4cb168b1e..8a438be7090 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx
@@ -13,7 +13,7 @@ import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { capitalize } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
index cb2f074b106..9263968ea89 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx
@@ -11,7 +11,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { capitalize, isDefined } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItemSelectAvatar } from 'twenty-ui/navigation';
type SingleRecordPickerMenuItemProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx
index 968c8766bdf..01dac86619e 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx
@@ -21,7 +21,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
export type SingleRecordPickerMenuItemsProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx
index 76370052377..b72fdc7ae8a 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx
@@ -19,7 +19,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export type SingleRecordPickerMenuItemsWithSearchProps = {
excludedRecordIds?: string[];
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/__stories__/SingleRecordPicker.stories.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/__stories__/SingleRecordPicker.stories.tsx
index 947ba90d369..8f3622b1795 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/__stories__/SingleRecordPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/__stories__/SingleRecordPicker.stories.tsx
@@ -8,7 +8,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
import { sleep } from '~/utils/sleep';
import { SingleRecordPicker } from '@/object-record/record-picker/single-record-picker/components/SingleRecordPicker';
-import { IconUserCircle } from 'twenty-ui/display';
+import { IconUserCircle } from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
// const records = allMockPersonRecords.map<SearchRecord>((person) => ({
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
index 4b8adf4bd0c..1b43356beba 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
@@ -13,7 +13,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export const RecordTableNoRecordGroupAddNew = () => {
const { objectMetadataItem } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx
index 3b8e98f7e49..b51525bb92f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx
@@ -7,7 +7,7 @@ import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScro
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -16,7 +16,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
type AnimatedPlaceholderType,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
const StyledEmptyPlaceholderOuterContainer = styled.div`
height: 100%;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
index d4bbbd3a7ee..a6c41245912 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
@@ -4,7 +4,7 @@ import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty
import { getEmptyStateSubTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateSubTitle';
import { getEmptyStateTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateTitle';
import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export const RecordTableEmptyStateNoGroupNoRecordAtAll = () => {
const { objectMetadataItem } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
index a3bf64821ec..56e2f29d226 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
@@ -3,7 +3,7 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export const RecordTableEmptyStateNoRecordFoundForFilter = () => {
const { objectMetadataItem } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateReadOnly.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateReadOnly.tsx
index 8083e7fa512..90418c4d3fa 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateReadOnly.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateReadOnly.tsx
@@ -2,7 +2,7 @@ import { useObjectLabel } from '@/object-metadata/hooks/useObjectLabel';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export const RecordTableEmptyStateReadOnly = () => {
const { objectMetadataItem } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
index 027e4860570..d229207a036 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
@@ -2,7 +2,7 @@
import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { IconSettings } from 'twenty-ui/display';
+import { IconSettings } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const RecordTableEmptyStateRemote = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
index 11869c21d79..14816a8a9db 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
@@ -9,7 +9,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconFilterOff } from 'twenty-ui/display';
+import { IconFilterOff } from 'twenty-ui/icon';
export const RecordTableEmptyStateSoftDelete = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
index 9a243f34e69..b84934bbbbf 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButtons.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { LightIconButtonGroup } from 'twenty-ui/input';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedContainer } from 'twenty-ui/utilities';
+import { AnimatedContainer } from 'twenty-ui/layout';
const StyledButtonContainer = styled.div`
border: 1px solid ${themeCssVariables.border.color.strong};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
index b31442109db..60330a19ad8 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
@@ -7,7 +7,7 @@ import { useGetSecondaryRecordTableCellButton } from '@/object-record/record-tab
import { useOpenRecordTableCellFromCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellFromCell';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowUpRight, IconPencil } from 'twenty-ui/display';
+import { IconArrowUpRight, IconPencil } from 'twenty-ui/icon';
export const RecordTableCellEditButton = () => {
const { cellPosition } = useContext(RecordTableCellContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useGetSecondaryRecordTableCellButton.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useGetSecondaryRecordTableCellButton.ts
index 801d7b3f405..3e924791657 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useGetSecondaryRecordTableCellButton.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useGetSecondaryRecordTableCellButton.ts
@@ -13,7 +13,7 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { FieldMetadataSettingsOnClickAction } from 'twenty-shared/types';
import { ensureAbsoluteUrl, isDefined } from 'twenty-shared/utils';
-import { IconArrowUpRight, IconCopy, IconMail } from 'twenty-ui/display';
+import { IconArrowUpRight, IconCopy, IconMail } from 'twenty-ui/icon';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const useGetSecondaryRecordTableCellButton = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
index 3eef2d02197..25fc13901e6 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
@@ -6,7 +6,7 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useContext } from 'react';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
export const RecordTableColumnAggregateFooterDropdownSubmenuContent = ({
aggregateOperations,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
index c2520043b75..e329a3901b5 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
@@ -6,7 +6,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const RecordTableColumnAggregateFooterAggregateOperationMenuItems = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
index 526bc4ab823..9298f16805d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
@@ -10,7 +10,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
import { useContext, useMemo } from 'react';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
index e14ce49963b..3701d92837c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
@@ -4,7 +4,7 @@ import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
const StyledText = styled.span`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
index a30d25b706c..f339f0b6288 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
@@ -10,7 +10,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCell = styled.div<{ isUnfolded: boolean; isFirstCell: boolean }>`
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
index e6090427eec..4d8713fbe78 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
@@ -7,7 +7,7 @@ import { type RecordField } from '@/object-record/record-field/types/RecordField
import { shouldCompactRecordTableFirstColumnComponentState } from '@/object-record/record-table/states/shouldCompactRecordTableFirstColumnComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
index d4377a18149..aaca4b8a644 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx
@@ -22,7 +22,7 @@ import {
IconEyeOff,
IconFilter,
IconSortDescending,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export type RecordTableColumnHeadDropdownMenuProps = {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx
index 056469978fc..c941aeacecf 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx
@@ -18,7 +18,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { cx } from '@linaria/core';
import { useContext } from 'react';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledPlusIconHeaderCell = styled.div<{
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
index 09a8b004ce6..81b4e6311f1 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx
@@ -6,7 +6,7 @@ import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/can
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { LightIconButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
index 0e13efa1258..31504a7721a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
@@ -17,7 +17,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconSettings, useIcons } from 'twenty-ui/display';
+import { IconSettings, useIcons } from 'twenty-ui/icon';
import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation';
export const RecordTableHeaderPlusButtonContent = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
index ab60a04fe6f..3c2a4101d9e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
@@ -16,7 +16,7 @@ import {
findByProperty,
sumByProperty,
} from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragCounterChip.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragCounterChip.tsx
index fad9578d913..655ede214d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragCounterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowMultiDragCounterChip.tsx
@@ -1,7 +1,7 @@
import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
-import { NotificationCounter } from 'twenty-ui/navigation';
+import { NotificationCounter } from 'twenty-ui/data-display';
const StyledNotificationCounterContainer = styled.div`
left: -7px;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
index 8f778ab6e80..24b5928a44a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
@@ -34,8 +34,8 @@ import {
isDefined,
sumByProperty,
} from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
-import { IconChevronDown } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { AnimatedLightIconButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
index 5e51614d2a4..0ba8268fc30 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
@@ -9,7 +9,7 @@ import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/can
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
export const RecordTableRecordGroupSectionAddNew = () => {
const { objectMetadataItem } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx
index f10488ec70e..0b6194e1135 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx
@@ -5,7 +5,7 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { t } from '@lingui/core/macro';
-import { IconArrowDown } from 'twenty-ui/display';
+import { IconArrowDown } from 'twenty-ui/icon';
export const RecordTableRecordGroupSectionLoadMore = () => {
const { objectNameSingular } = useRecordTableContextOrThrow();
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
index 22a2aba8448..1a028182380 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx
@@ -8,7 +8,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
index 9e98d695a31..fa2cda7e3e9 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx
@@ -4,7 +4,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { type RecordTitleCellContainerType } from '@/object-record/record-title-cell/types/RecordTitleCellContainerType';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
index af651465407..e21d54920c6 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
@@ -8,7 +8,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDiv = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
index 0bcc5a99f8b..bb7817b5222 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
@@ -7,7 +7,7 @@ import { useLingui } from '@lingui/react/macro';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { Key } from 'ts-key-enum';
-import { IconBoxMultiple } from 'twenty-ui/display';
+import { IconBoxMultiple } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
const StyledFooterContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx
index c787eb462a9..0f953d290e9 100644
--- a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx
@@ -11,7 +11,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItem, MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';
export const MultipleSelectDropdown = ({
diff --git a/packages/twenty-front/src/modules/object-record/select/types/SelectableItem.ts b/packages/twenty-front/src/modules/object-record/select/types/SelectableItem.ts
index ae25b496f88..2a3ec6260db 100644
--- a/packages/twenty-front/src/modules/object-record/select/types/SelectableItem.ts
+++ b/packages/twenty-front/src/modules/object-record/select/types/SelectableItem.ts
@@ -1,4 +1,5 @@
-import { type AvatarType, type IconComponent } from 'twenty-ui/display';
+import { type AvatarType } from 'twenty-ui/data-display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SelectableItem<T = object> = T & {
id: string;
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx
index fe967e1137b..94e836175ca 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx
@@ -1,7 +1,7 @@
import { renderHook } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
import { type ReactNode } from 'react';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
@@ -20,7 +20,7 @@ const Wrapper = ({ children }: { children: ReactNode }) => {
);
};
-jest.mock('twenty-ui/display', () => ({
+jest.mock('twenty-ui/icon', () => ({
useIcons: jest.fn(),
}));
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildSpreadSheetImportFields.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildSpreadSheetImportFields.ts
index ec40839fa67..3b8a923a4a1 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildSpreadSheetImportFields.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildSpreadSheetImportFields.ts
@@ -20,7 +20,7 @@ import {
getUniqueConstraintsFields,
isDefined,
} from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
export const useBuildSpreadsheetImportFields = () => {
diff --git a/packages/twenty-front/src/modules/object-record/types/ObjectRecordIdentifier.ts b/packages/twenty-front/src/modules/object-record/types/ObjectRecordIdentifier.ts
index 8d0ed0be796..42c98e37126 100644
--- a/packages/twenty-front/src/modules/object-record/types/ObjectRecordIdentifier.ts
+++ b/packages/twenty-front/src/modules/object-record/types/ObjectRecordIdentifier.ts
@@ -1,4 +1,4 @@
-import { type AvatarType } from 'twenty-ui/display';
+import { type AvatarType } from 'twenty-ui/data-display';
export type ObjectRecordIdentifier = {
id: string;
name: string;
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingModalCircularIcon.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingModalCircularIcon.tsx
index 413a1bba9d2..d61fd87b15a 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingModalCircularIcon.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingModalCircularIcon.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCheckContainer = styled.div<{ color: string }>`
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
index 2cdf9c77231..b963f85b672 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
@@ -5,7 +5,7 @@ import {
IconRadiusBottomRight,
IconRadiusTopLeft,
IconRadiusTopRight,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type WidgetHandleAxis = 'n' | 's' | 'e' | 'w' | 'ne' | 'nw' | 'se' | 'sw';
type WidgetHorizontalHandleAxis = 'n' | 's';
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx
index 7205b5595e7..b227261a345 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx
@@ -10,7 +10,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useCallback, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
-import { IconPlus, useIcons } from 'twenty-ui/display';
+import { IconPlus, useIcons } from 'twenty-ui/icon';
import { TabButton } from 'twenty-ui/input';
import { isPageLayoutTabDraggingComponentState } from '@/page-layout/states/isPageLayoutTabDraggingComponentState';
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
index 402a61bd9a2..921e0f1daae 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListNewTabDropdownContent.tsx
@@ -16,7 +16,7 @@ import { useLingui } from '@lingui/react/macro';
import { useCallback, useMemo } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus, useIcons } from 'twenty-ui/display';
+import { IconPlus, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type PageLayoutTabListNewTabDropdownContentProps = {
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
index eff6a12ae83..7941e7a8e22 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabMenuItemSelectAvatar.tsx
@@ -3,7 +3,7 @@ import { type MouseEvent, useContext, useState } from 'react';
import { TabAvatar } from '@/ui/layout/tab-list/components/TabAvatar';
import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import {
StyledHoverableMenuItemBase,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
index cccf9afd7cb..8f4ea5a51f0 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx
@@ -17,7 +17,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
export const DashboardWidgetPlaceholder = () => {
const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
index 1d7358a665f..69e3724b719 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
@@ -2,7 +2,7 @@ import { ForbiddenFieldDisplay } from '@/object-record/record-field/ui/meta-type
import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';
import { plural, t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip } from 'twenty-ui/display';
+import { AppTooltip } from 'twenty-ui/surfaces';
type PageLayoutWidgetForbiddenDisplayProps = {
widgetId: string;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
index 78749603f5d..e1c42c80ccc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
@@ -2,7 +2,8 @@ import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type FallbackProps } from 'react-error-boundary';
-import { AppTooltip, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { AppTooltip } from 'twenty-ui/surfaces';
type PageLayoutWidgetInvalidConfigDisplayProps = FallbackProps;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
index 09405fbaa3e..c9470dadf42 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
-import { AppTooltip, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { AppTooltip } from 'twenty-ui/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
index 2665f45fd11..9045d0c426e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
@@ -9,7 +9,7 @@ import {
IconListSearch,
IconPlus,
IconSquarePlus,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
index 467b4063bf0..49c531b0717 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/StandaloneWidgetPlaceholder.tsx
@@ -8,7 +8,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
const StyledPlaceholderContainer = styled.div`
background: ${themeCssVariables.background.secondary};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
index c2a0406bc71..b9b92ffa9bc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
@@ -16,12 +16,8 @@ import { t } from '@lingui/core/macro';
import { Link } from 'react-router-dom';
import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- IconArrowUpRight,
- TooltipDelay,
- TooltipPosition,
-} from 'twenty-ui/display';
+import { IconArrowUpRight } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';
import { LightIconButton } from 'twenty-ui/input';
import { RelationType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
index 04f778a38b0..9e96d59c02c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
@@ -12,7 +12,7 @@ import { WidgetCardHeader } from '@/page-layout/widgets/widget-card/components/W
import { styled } from '@linaria/react';
import { type MouseEvent, useContext } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
-import { IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { WidgetType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadComposer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadComposer.tsx
index 7ac1bd306b6..30c1f3ad829 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadComposer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadComposer.tsx
@@ -10,7 +10,7 @@ import { type SidePanelFooterCommandMenuItem } from '@/ui/layout/side-panel/type
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { t } from '@lingui/core/macro';
-import { IconArrowBackUp, IconSend, IconX } from 'twenty-ui/display';
+import { IconArrowBackUp, IconSend, IconX } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { getOsControlSymbol } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
index 30dcf13ad67..f856c492207 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
import { EmailThreadMessage } from '@/activities/emails/components/EmailThreadMessage';
import { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';
import { t } from '@lingui/core/macro';
-import { IconArrowsVertical } from 'twenty-ui/display';
+import { IconArrowsVertical } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
index c8f2de154e4..830c949db99 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
@@ -34,7 +34,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { FieldDisplayMode } from '~/generated-metadata/graphql';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
index 7fabc444d31..6a0aa9e4c54 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx
@@ -5,7 +5,7 @@ import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlin
import { useOpenFieldWidgetFieldInputEditMode } from '@/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { styled } from '@linaria/react';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
index e8431400040..33ecfa0e236 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx
@@ -20,7 +20,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { styled } from '@linaria/react';
import { CustomError, isDefined } from 'twenty-shared/utils';
-import { IconPencil, IconPlus } from 'twenty-ui/display';
+import { IconPencil, IconPlus } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { RelationType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
index 44d7ff94bca..fb1645ba206 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type FieldWidgetShowMoreButtonProps = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx
index 0e8b1d0f5dc..c70e073d665 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationEditor.tsx
@@ -25,7 +25,7 @@ import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconNewSection } from 'twenty-ui/display';
+import { IconNewSection } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
const StyledGroupsDroppable = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
index 0a560ab0498..db6b7d5c89b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationFieldEditor.tsx
@@ -1,6 +1,6 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type FieldsConfigurationFieldItem } from '@/page-layout/types/FieldsConfiguration';
-import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/display';
+import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
type FieldsConfigurationFieldEditorProps = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
index 90b8051e800..51f93e93fe3 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDraggableHeader.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconGripVertical, Label } from 'twenty-ui/display';
+import { IconGripVertical } from 'twenty-ui/icon';
+import { Label } from 'twenty-ui/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
index b2aab93b76a..0e9245aea8b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupDropdown.tsx
@@ -4,7 +4,7 @@ import {
IconNewSection,
IconPencil,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx
index 33a19663331..6f1bc4299f2 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationUngroupedEditor.tsx
@@ -6,7 +6,7 @@ import { FieldsConfigurationFieldEditor } from '@/page-layout/widgets/fields/com
import { type FieldsWidgetGroupField } from '@/page-layout/widgets/fields/types/FieldsWidgetGroup';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconNewSection } from 'twenty-ui/display';
+import { IconNewSection } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
const StyledFieldsDroppable = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
index 593495cfbdc..2608402fa23 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
@@ -20,7 +20,7 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type FieldsConfiguration } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
index 70ae775168c..648709b9d36 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { AnimatedExpandableContainer, Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
index 9f43b8721d3..aebfc055777 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx
@@ -13,11 +13,8 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
import { styled } from '@linaria/react';
import { AnimatePresence, motion } from 'framer-motion';
import { useContext, useRef, useState } from 'react';
-import {
- IconChevronLeft,
- IconChevronRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { LightIconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetTooltip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetTooltip.tsx
index be773c6379b..3f30b897e2c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetTooltip.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetTooltip.tsx
@@ -7,7 +7,7 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowUpRight } from 'twenty-ui/display';
+import { IconArrowUpRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTooltip = styled.div`
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
index 87297646f06..599a718db16 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
@@ -2,12 +2,8 @@ import { formatNumberChartTrend } from '@/page-layout/widgets/graph/graph-widget
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- H1Title,
- H1TitleFontColor,
- IconTrendingDown,
- IconTrendingUp,
-} from 'twenty-ui/display';
+import { IconTrendingDown, IconTrendingUp } from 'twenty-ui/icon';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type GraphWidgetAggregateChartProps = {
value: string | number;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
index f5b2459055c..2d17c223dc3 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardColorSelectionMenu.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
import { DashboardColorIcon } from '@/page-layout/widgets/standalone-rich-text/components/DashboardColorIcon';
import { BLOCKNOTE_COLOR_DISPLAY_NAMES } from '@/page-layout/widgets/standalone-rich-text/constants/BlockNoteColorDisplayNames';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardEditorSideMenu.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardEditorSideMenu.tsx
index d82d9307fea..1400f3f1dde 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardEditorSideMenu.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardEditorSideMenu.tsx
@@ -11,7 +11,7 @@ import {
} from '@blocknote/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconColorSwatch, IconPlus, IconTrash } from 'twenty-ui/display';
+import { IconColorSwatch, IconPlus, IconTrash } from 'twenty-ui/icon';
import { isDefined } from 'twenty-shared/utils';
import { CustomSideMenuOptions } from '@/blocknote-editor/components/CustomSideMenuOptions';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
index 96b1eafdff1..87d1dd794b6 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
@@ -18,7 +18,7 @@ import {
IconMoodSmile,
IconPilcrow,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
const Icons: Record<string, IconComponent> = {
'Heading 1': IconH1,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
index ffe5fb3c6c3..7d08c236bfc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx
@@ -5,7 +5,8 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hoo
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode, useContext } from 'react';
-import { IconTrash, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { IconButton } from 'twenty-ui/input';
import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx
index db47ad1355a..eafba7f7061 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
-import { IconGripVertical } from 'twenty-ui/display';
+import { IconGripVertical } from 'twenty-ui/icon';
import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
index 406f4b376fe..62639488184 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
@@ -10,7 +10,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLingui } from '@lingui/react/macro';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
export const SettingsAccountsBlocklistSection = () => {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
index a589c2f4c37..bf42aea781c 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistTableRow.tsx
@@ -3,7 +3,8 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { formatToHumanReadableDate } from '~/utils/date-utils';
import { IconButton } from 'twenty-ui/input';
-import { IconX, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
type SettingsAccountsBlocklistTableRowProps = {
blocklistItem: BlocklistItem;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
index 155d05721a7..a5d0fd051a8 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
@@ -6,8 +6,9 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Section } from '@react-email/components';
-import { H2Title, IconUserPlus } from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { IconUserPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type CalendarChannelVisibility } from '~/generated/graphql';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
index 457f895d1e8..62d56b3826b 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
@@ -8,7 +8,7 @@ import { t } from '@lingui/core/macro';
import { Section } from '@react-email/components';
import { addMinutes, endOfDay, min, startOfDay } from 'date-fns';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
CalendarChannelVisibility,
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
index feea78b549b..180212bf4bf 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { useLingui } from '@lingui/react/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
index fb05e4d5fc3..d5ab4d4a675 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
@@ -5,7 +5,7 @@ import { computeSyncStatus } from '@/settings/accounts/utils/computeSyncStatus';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRowRightContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
index 4a8fb8b6a10..6da5bef26df 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
@@ -9,7 +9,7 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { SettingsAccountsPasswordController } from '@/settings/accounts/components/SettingsAccountsPasswordController';
import { type ConnectionFormData } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm';
import { type AccountType } from 'twenty-shared/constants';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
index 32e494756d4..f3c30a830e8 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
@@ -11,7 +11,7 @@ import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconAt, IconGoogle, IconMicrosoft } from 'twenty-ui/display';
+import { IconAt, IconGoogle, IconMicrosoft } from 'twenty-ui/icon';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
index 418a4cca088..5dac60eeafe 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
@@ -7,8 +7,10 @@ import {
MessageChannelType,
type MessageFolderImportPolicy,
} from 'twenty-shared/types';
-import { H2Title, IconBriefcase, IconUsers } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconBriefcase, IconUsers } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type MessageChannel } from '@/accounts/types/MessageChannel';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
index 98e921d4658..2169a996cb0 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
@@ -4,7 +4,7 @@ import { z } from 'zod';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { useCreateEmailGroupChannel } from '@/settings/accounts/hooks/useCreateEmailGroupChannel';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
index 3ce9ee79786..e439fd551ce 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
@@ -3,7 +3,7 @@ import { type MessageDescriptor } from '@lingui/core';
import { Trans } from '@lingui/react';
import { type ReactNode } from 'react';
import { Radio } from 'twenty-ui/input';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index ebcc16b94dd..cbcdd77e915 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -23,7 +23,7 @@ import {
IconPlayerPlay,
IconRefresh,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
index 53355f075b3..3f0aff380b5 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
@@ -5,7 +5,8 @@ import { SettingsCard } from '@/settings/components/SettingsCard';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconCalendarEvent, IconMailCog } from 'twenty-ui/display';
+import { IconCalendarEvent, IconMailCog } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
import {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx
index 2e609f7fe3e..b0602a6de56 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { Toggle } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsConnectedAccountIcon.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsConnectedAccountIcon.tsx
index a077618eedd..00a7b271a41 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsConnectedAccountIcon.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsConnectedAccountIcon.tsx
@@ -10,7 +10,7 @@ import {
IconMail,
IconMicrosoft,
IconSend,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
index 74afd4039a3..96928e18a30 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
@@ -1,6 +1,6 @@
import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
export const SettingsNewAccountSection = () => {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFolderIcon.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFolderIcon.tsx
index a68437600a1..fff9aa36353 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFolderIcon.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFolderIcon.tsx
@@ -4,7 +4,7 @@ import {
IconFolderRoot,
IconInbox,
IconSend,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
type SettingsAccountsMessageFolderIconProps = {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
index 9a0274c1891..17f2f06be62 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
@@ -16,7 +16,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMemo, useState } from 'react';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
import { Checkbox, CheckboxSize } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
index f22cbb76883..0228f9715c2 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconFolder } from 'twenty-ui/display';
+import { IconFolder } from 'twenty-ui/icon';
import { Section } from 'twenty-ui/layout';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersTreeItem.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersTreeItem.tsx
index fa566a85431..5216bcf7ad7 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersTreeItem.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersTreeItem.tsx
@@ -8,7 +8,7 @@ import { isFolderTreePartiallySelected } from '@/settings/accounts/components/me
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { Checkbox, CheckboxSize } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx
index 263b0de39ed..df1df8ed501 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { type IconComponentProps } from 'twenty-ui/display';
+import { type IconComponentProps } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type ModelsDevProviderLogoProps = {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index decafbc4d1d..30eb405ba1d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -4,8 +4,10 @@ import { useMutation, useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconBolt, IconRobot } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconBolt, IconRobot } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
index 18ccc57d8d7..74fee6045c4 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
@@ -4,7 +4,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconPlug, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconPlug } from 'twenty-ui/icon';
import { type AiProviderItem } from '@/settings/admin-panel/ai/types/AiProviderItem';
import { getProviderIcon } from '@/settings/admin-panel/ai/utils/getProviderIcon';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts
index 840df9056b6..bb97a194eb1 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts
@@ -6,7 +6,7 @@ import {
IconProviderOpenai,
IconRobot,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ModelFamily } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts
index cfd7cb9ede0..588ccd741cf 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts
@@ -6,7 +6,7 @@ import {
IconProviderOpenai,
IconRobot,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const PROVIDER_ICON_CONFIG: Record<string, { Icon: IconComponent }> = {
openai: { Icon: IconProviderOpenai },
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx
index 606bacfda84..e72b42eba80 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent, type IconComponentProps } from 'twenty-ui/display';
+import { type IconComponent, type IconComponentProps } from 'twenty-ui/icon';
import { ModelsDevProviderLogo } from '@/settings/admin-panel/ai/components/ModelsDevProviderLogo';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts
index aee6472dcb5..aeda00b7d20 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { PROVIDER_ICON_CONFIG } from '@/settings/admin-panel/ai/constants/ProviderConfig';
import { isKnownProviderId } from '@/settings/admin-panel/ai/utils/isKnownProviderId';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
index 66b6f8e6c1e..62ff0e40188 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
@@ -14,12 +14,13 @@ import { t } from '@lingui/core/macro';
import { type ReactNode, useContext, useState } from 'react';
import { assertUnreachable, getSettingsPath } from 'twenty-shared/utils';
import { SettingsPath } from 'twenty-shared/types';
-import { H2Title, IconChevronRight, IconPinned } from 'twenty-ui/display';
+import { IconChevronRight, IconPinned } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import {
type ApplicationRegistrationFragmentFragment,
ApplicationRegistrationSourceType,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatThreadMessageList.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatThreadMessageList.tsx
index 67ccbdfae63..1666f736acc 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatThreadMessageList.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatThreadMessageList.tsx
@@ -4,7 +4,7 @@ import { styled } from '@linaria/react';
import { LazyMarkdownRenderer } from '@/ai/components/LazyMarkdownRenderer';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
AgentMessageRole,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
index b4ae97cc4e0..353351bb639 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
@@ -13,7 +13,7 @@ import {
IconSettings2,
IconSparkles,
IconVariable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const SettingsAdminContent = () => {
const currentUser = useAtomStateValue(currentUserState);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
index 04a544cbd84..1a11eddc838 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
@@ -19,12 +19,10 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { currentUserState } from '@/auth/states/currentUserState';
-import {
- Avatar,
- H2Title,
- IconChevronRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
index c6777e41b6d..1d44064be6a 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
@@ -14,7 +14,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { OTPInput } from 'input-otp';
import { useState } from 'react';
-import { IconDotsVertical, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconDotsVertical } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
index b99eeeb56a1..32574e5d7cd 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
@@ -11,11 +11,9 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import {
- H2Title,
- IconChevronRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetServerAdminsDocument } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionContainer.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionContainer.tsx
index 003732345a4..126aa8837e2 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionContainer.tsx
@@ -2,7 +2,7 @@ import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { SettingsAdminVersionDisplay } from '@/settings/admin-panel/components/SettingsAdminVersionDisplay';
import { t } from '@lingui/core/macro';
-import { IconCircleDot, IconStatusChange } from 'twenty-ui/display';
+import { IconCircleDot, IconStatusChange } from 'twenty-ui/icon';
import { useQuery } from '@apollo/client/react';
import { GetVersionInfoDocument } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
index 91b710b8f79..c3e7a2ce0c8 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
@@ -3,9 +3,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import {
- H2Title,
IconBox,
IconCalendarEvent,
IconCalendarRepeat,
@@ -18,7 +17,8 @@ import {
IconStatusChange,
IconTag,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { type ThemeColor } from 'twenty-ui/theme';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
index 0370cca15c2..1ea6f5f9773 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
@@ -17,18 +17,17 @@ import {
isDefined,
} from 'twenty-shared/utils';
import { type GetUpgradeStatusQuery } from '~/generated-admin/graphql';
-import { AvatarOrIcon, LinkChip } from 'twenty-ui/components';
+import { AvatarOrIcon, LinkChip, Status } from 'twenty-ui/data-display';
import {
- H2Title,
IconCalendar,
IconHome,
IconId,
IconLink,
IconStatusChange,
IconUser,
- OverflowingTextWithTooltip,
- Status,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
index 3386fb667f9..5f1fda2f051 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
@@ -4,7 +4,7 @@ import { type ConfigVariableSourceFilter } from '@/settings/admin-panel/config-v
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { IconSettings } from 'twenty-ui/display';
+import { IconSettings } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { ConfigVariableOptionsDropdownContent } from './ConfigVariableOptionsDropdownContent';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
index c99737c1fd2..345c18c3370 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableOptionsDropdownContent.tsx
@@ -10,7 +10,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { t } from '@lingui/core/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { IconChevronLeft, IconEye, IconEyeOff } from 'twenty-ui/display';
+import { IconChevronLeft, IconEye, IconEyeOff } from 'twenty-ui/icon';
import { MenuItem, MenuItemSelectTag } from 'twenty-ui/navigation';
import { useContext } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
index f33af865785..b722f9530f8 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
@@ -10,7 +10,7 @@ import { showHiddenGroupVariablesState } from '@/settings/admin-panel/config-var
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { useQuery } from '@apollo/client/react';
import {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
index faf9491cf3a..f6ef321f7a4 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
@@ -1,7 +1,7 @@
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
index cba37ea19e1..352619e4767 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
@@ -7,7 +7,7 @@ import { SettingsAdminSigningKeysTable } from '@/settings/admin-panel/signing-ke
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusListCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusListCard.tsx
index d9da701fdf6..14745031331 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusListCard.tsx
@@ -8,7 +8,7 @@ import {
IconServer2,
IconTool,
IconUserCircle,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusRightContainer.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusRightContainer.tsx
index 7f8077042b5..dbc4bf75e6f 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusRightContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatusRightContainer.tsx
@@ -1,5 +1,5 @@
import { t } from '@lingui/core/macro';
-import { Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
import { AdminPanelHealthServiceStatus } from '~/generated-admin/graphql';
export const SettingsAdminHealthStatusRightContainer = ({
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobStateBadge.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobStateBadge.tsx
index b2ab5ef5dd5..42df253fb5b 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobStateBadge.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJobStateBadge.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { Tag, type TagColor } from 'twenty-ui/components';
+import { Tag, type TagColor } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { JobState } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
index 5ddf2abf17a..c94527b4f53 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobRowDropdownMenu.tsx
@@ -3,7 +3,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconRefresh, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconRefresh, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { JobState } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
index 7ecae3f5f9c..414352f51fe 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
@@ -17,7 +17,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { useState } from 'react';
-import { IconRefresh, IconTrash } from 'twenty-ui/display';
+import { IconRefresh, IconTrash } from 'twenty-ui/icon';
import { Button, Checkbox } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useQuery } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusListCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusListCard.tsx
index c6cabe05d0e..c145e3e559d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusListCard.tsx
@@ -8,7 +8,7 @@ import {
IconProgressCheck,
IconStatusChange,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type GetInstanceAndAllWorkspacesUpgradeStatusQuery } from '~/generated-admin/graphql';
type InstanceAndAllWorkspacesUpgradeStatus =
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusRightContainer.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusRightContainer.tsx
index dc18cfddece..d8b1e167117 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusRightContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminUpgradeStatusRightContainer.tsx
@@ -3,7 +3,7 @@ import { getUpgradeHealthStatusBadge } from '@/settings/admin-panel/utils/getUpg
import { getWorkspacesUpgradeHealth } from '@/settings/admin-panel/utils/getWorkspacesUpgradeHealth';
import { getWorkspacesUpgradeHealthText } from '@/settings/admin-panel/utils/getWorkspacesUpgradeHealthText';
import { t } from '@lingui/core/macro';
-import { Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
export const SettingsAdminUpgradeStatusRightContainer = ({
item,
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
index f84b9919c45..d721994c5b8 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
@@ -6,7 +6,8 @@ import { t } from '@lingui/core/macro';
import { lazy, Suspense, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconList } from 'twenty-ui/display';
+import { IconList } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesByHealthAccordion.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesByHealthAccordion.tsx
index 0f88937a7fc..a93b24f608a 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesByHealthAccordion.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesByHealthAccordion.tsx
@@ -4,8 +4,9 @@ import { useState } from 'react';
import { Link } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronDown, IconChevronRight } from 'twenty-ui/display';
-import { AnimatedExpandableContainer, Card } from 'twenty-ui/layout';
+import { IconChevronDown, IconChevronRight } from 'twenty-ui/icon';
+import { AnimatedExpandableContainer } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledAccordionHeaderButton = styled.button`
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
index 03bea4a9cd9..1cbd8c503ed 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
@@ -6,13 +6,13 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { UserContext } from '@/users/contexts/UserContext';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
+import { Status } from 'twenty-ui/data-display';
import {
IconAlertTriangle,
IconClock,
IconStatusChange,
IconX,
- Status,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
index 96dcb65bcb1..22a1a8dfee0 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
@@ -4,8 +4,11 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconLink, IconTool, Status } from 'twenty-ui/display';
-import { Card, CardContent, Section } from 'twenty-ui/layout';
+import { Status } from 'twenty-ui/data-display';
+import { IconLink, IconTool } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { maintenanceModeState } from '@/client-config/states/maintenanceModeState';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
index 727624fc845..831a409d6e6 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
@@ -12,8 +12,9 @@ import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag, type TagColor } from 'twenty-ui/components';
-import { IconCopy, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { Tag, type TagColor } from 'twenty-ui/data-display';
+import { IconCopy } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
index c25efa45b51..e9b14442c3e 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
+++ b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
@@ -1,7 +1,12 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { Chip, ChipAccent, ChipSize, ChipVariant } from 'twenty-ui/components';
+import {
+ Chip,
+ ChipAccent,
+ ChipSize,
+ ChipVariant,
+} from 'twenty-ui/data-display';
import {
IconBolt,
IconBuildingSkyscraper,
@@ -10,7 +15,7 @@ import {
IconUsers,
IconWindow,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type AiModelSummary } from '@/settings/ai/types/AiModelSummary';
diff --git a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
index 272b0a9fde6..4bfb3bf13da 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
@@ -4,7 +4,8 @@ import { css } from '@linaria/core';
import { styled } from '@linaria/react';
import { Trans } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip, IconTrash, TooltipDelay } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { Checkbox, IconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts b/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts
index 988b4411622..142940490d3 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts
+++ b/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { MODEL_ICON_CONFIG } from '@/settings/admin-panel/ai/constants/ModelIconConfig';
import { getProviderIcon } from '@/settings/admin-panel/ai/utils/getProviderIcon';
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
index 1a2b4c6d2d7..4e54998ea09 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import {
IconAlertTriangle,
IconBrandNpm,
@@ -11,7 +11,7 @@ import {
IconLink,
IconMail,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export type ContentEntry = {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
index 2a45fd6a59d..6877a11c7f9 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
@@ -10,7 +10,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { useQuery } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconCircleX, IconCreditCard } from 'twenty-ui/display';
+import { IconCircleX, IconCreditCard } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
index 9850595548f..9f65f706ca4 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
@@ -15,15 +15,11 @@ import { useContext } from 'react';
import { DOCUMENTATION_PATHS } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import {
- H2Title,
- HorizontalSeparator,
- IconChartBar,
- IconExternalLink,
-} from 'twenty-ui/display';
+import { IconChartBar, IconExternalLink } from 'twenty-ui/icon';
+import { HorizontalSeparator, Section } from 'twenty-ui/layout';
+import { H2Title } from 'twenty-ui/typography';
import { ProgressBar } from 'twenty-ui/feedback';
import { Button } from 'twenty-ui/input';
-import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SubscriptionStatus } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
index ab0a6fdc502..c62164fd3ca 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
@@ -34,7 +34,6 @@ import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import {
- H2Title,
IconArrowDown,
IconArrowUp,
IconCalendarEvent,
@@ -43,7 +42,8 @@ import {
IconCoins,
IconTag,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SubscriptionBenefit.tsx b/packages/twenty-front/src/modules/settings/billing/components/SubscriptionBenefit.tsx
index d7292951c83..e7b5ec08ee7 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SubscriptionBenefit.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SubscriptionBenefit.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import React, { useContext } from 'react';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledBenefitContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/PlansTags.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/PlansTags.tsx
index 15011d719d3..143bcf53139 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/PlansTags.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/PlansTags.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import { t } from '@lingui/core/macro';
import { BillingPlanKey } from '~/generated-metadata/graphql';
import { styled } from '@linaria/react';
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
index 8f8c108b835..ff97ca91d32 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
@@ -13,7 +13,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
index bb2cca51616..978cabde541 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
@@ -1,6 +1,7 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { AppTooltip, IconInfoCircle, TooltipDelay } from 'twenty-ui/display';
+import { IconInfoCircle } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsBillingLabelValueItemProps = {
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SubscriptionInfoRowContainer.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SubscriptionInfoRowContainer.tsx
index f034de2b44b..9c60d96f618 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SubscriptionInfoRowContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SubscriptionInfoRowContainer.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import React, { useContext } from 'react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/settings/components/AdvancedSettingsContentWrapperWithDot.tsx b/packages/twenty-front/src/modules/settings/components/AdvancedSettingsContentWrapperWithDot.tsx
index c7f4a55256a..b7061846bb6 100644
--- a/packages/twenty-front/src/modules/settings/components/AdvancedSettingsContentWrapperWithDot.tsx
+++ b/packages/twenty-front/src/modules/settings/components/AdvancedSettingsContentWrapperWithDot.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconPoint } from 'twenty-ui/display';
+import { IconPoint } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledWrapper = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveAndCancelButtons.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveAndCancelButtons.tsx
index 30b7dbf4b4e..0c528978ac9 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveAndCancelButtons.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveAndCancelButtons.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import type { IconComponent } from 'twenty-ui/display';
+import type { IconComponent } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { CancelButton } from './CancelButton';
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
index 81a232e200b..0efca29624e 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
@@ -1,5 +1,5 @@
import { t } from '@lingui/core/macro';
-import { type IconComponent, IconDeviceFloppy } from 'twenty-ui/display';
+import { type IconComponent, IconDeviceFloppy } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
type SaveButtonProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
index 43e2461e002..fe4a074438a 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx
@@ -2,9 +2,9 @@ import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { t } from '@lingui/core/macro';
-import { Card, CardContent } from 'twenty-ui/layout';
-import { IconChevronRight } from 'twenty-ui/display';
-import { Pill } from 'twenty-ui/components';
+import { Card, CardContent } from 'twenty-ui/surfaces';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { Pill } from 'twenty-ui/data-display';
import { isDefined } from 'twenty-shared/utils';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx
index 5383ff74b18..be2ba4d91f6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx
@@ -1,6 +1,6 @@
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
-import { IconMinus, IconPlus } from 'twenty-ui/display';
+import { IconMinus, IconPlus } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { castAsNumberOrNull } from '~/utils/cast-as-number-or-null';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCustomizeVideoModal.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCustomizeVideoModal.tsx
index bd22c3a6159..91960b72506 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsCustomizeVideoModal.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsCustomizeVideoModal.tsx
@@ -3,7 +3,7 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { TabList } from '@/ui/layout/tab-list/components/TabList';
import { styled } from '@linaria/react';
import { useState } from 'react';
-import { type IconComponent, IconX } from 'twenty-ui/display';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDatabaseEventsForm.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDatabaseEventsForm.tsx
index 1d46bf43850..93b1c520940 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDatabaseEventsForm.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDatabaseEventsForm.tsx
@@ -4,7 +4,7 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconBox, IconNorthStar, IconPlus, IconTrash } from 'twenty-ui/display';
+import { IconBox, IconNorthStar, IconPlus, IconTrash } from 'twenty-ui/icon';
import { IconButton, type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
index 9fea877079b..3e75420adb6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDatePickerInput.tsx
@@ -19,7 +19,7 @@ import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUs
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { isDefined } from 'twenty-shared/utils';
-import { IconCalendar } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const SETTINGS_DATE_PICKER_CLICK_OUTSIDE_ID = 'settings-date-picker-floating';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCard.tsx
index 2efcf932084..7b1eba49dd4 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDiscoveryHeroCard.tsx
@@ -8,7 +8,7 @@ import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useContext } from 'react';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FeatureFlagKey } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx
index 0f7c1ef15ef..7b7c4da060d 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx
@@ -5,7 +5,8 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { capitalize, isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
index 76d3003f1b1..a61b3f465a5 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
@@ -2,9 +2,9 @@ import { currentUserState } from '@/auth/states/currentUserState';
import { SettingsOptionCardContentButton } from '@/settings/components/SettingsOptions/SettingsOptionCardContentButton';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
-import { IconArrowUp, IconLock } from 'twenty-ui/display';
+import { IconArrowUp, IconLock } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
export const SettingsEnterpriseFeatureGateCard = ({
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsItemTypeTag.tsx b/packages/twenty-front/src/modules/settings/components/SettingsItemTypeTag.tsx
index 1ce8c0ed235..16eacbf9171 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsItemTypeTag.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsItemTypeTag.tsx
@@ -1,8 +1,7 @@
import { t } from '@lingui/core/macro';
import { AppChip } from '@/applications/components/AppChip';
-import { Avatar } from 'twenty-ui/display';
-import { Chip, ChipAccent, ChipVariant } from 'twenty-ui/components';
+import { Avatar, Chip, ChipAccent, ChipVariant } from 'twenty-ui/data-display';
import { isDefined } from 'twenty-shared/utils';
type SettingsItemTypeTagProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx
index 8325af95966..0aee3060082 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx
@@ -3,8 +3,8 @@ import { type ComponentType, useContext } from 'react';
import { SettingsListSkeletonCard } from '@/settings/components/SettingsListSkeletonCard';
-import { type IconComponent, IconPlus } from 'twenty-ui/display';
-import { Card, CardFooter } from 'twenty-ui/layout';
+import { type IconComponent, IconPlus } from 'twenty-ui/icon';
+import { Card, CardFooter } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsListItemCardContent } from './SettingsListItemCardContent';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
index 32c2cd8543a..0d20935cec4 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { Link } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronRight, type IconComponent } from 'twenty-ui/display';
-import { CardContent } from 'twenty-ui/layout';
+import { IconChevronRight, type IconComponent } from 'twenty-ui/icon';
+import { CardContent } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRowContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx
index f1a4c5ca4c0..f1d8157764f 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCardContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
index 53e74b13b61..8434fa9c282 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx
@@ -22,7 +22,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { IconBox, type IconComponent } from 'twenty-ui/display';
+import { IconBox, type IconComponent } from 'twenty-ui/icon';
import { MenuItem, MenuItemMultiSelect } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
index ab7baa95506..d4b72a288f0 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentButton.tsx
@@ -7,10 +7,8 @@ import {
} from '@/settings/components/SettingsOptions/SettingsCardContentBase';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
-import {
- type IconComponent,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { isDefined } from 'twenty-shared/utils';
type SettingsOptionCardContentButtonProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
index 22bd767d71d..e270617a3a6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentCounter.tsx
@@ -7,10 +7,8 @@ import {
StyledSettingsCardTitle,
} from '@/settings/components/SettingsOptions/SettingsCardContentBase';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
-import {
- type IconComponent,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
type SettingsOptionCardContentCounterProps = {
Icon?: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
index 122acaceb94..78148089e23 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentSelect.tsx
@@ -8,10 +8,8 @@ import {
import { Separator } from '@/settings/components/Separator';
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
-import {
- type IconComponent,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
type SettingsOptionCardContentSelectProps = {
Icon?: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
index 2c1fe297ddc..84b5992db5e 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
@@ -8,10 +8,8 @@ import {
import { SettingsOptionIconCustomizer } from '@/settings/components/SettingsOptions/SettingsOptionIconCustomizer';
import { styled } from '@linaria/react';
import { useContext, useId } from 'react';
-import {
- type IconComponent,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { Toggle } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionIconCustomizer.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionIconCustomizer.tsx
index 9a28858c607..ba3a1223b74 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionIconCustomizer.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionIconCustomizer.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type SettingsOptionIconCustomizerProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentCounter.stories.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentCounter.stories.tsx
index 006c990e6e2..ccc791ad159 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentCounter.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentCounter.stories.tsx
@@ -2,7 +2,7 @@ import { SettingsOptionCardContentCounter } from '@/settings/components/Settings
import { styled } from '@linaria/react';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { IconUsers } from 'twenty-ui/display';
+import { IconUsers } from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentSelect.stories.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentSelect.stories.tsx
index f2e870c6594..3c28c7c6124 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentSelect.stories.tsx
@@ -11,7 +11,7 @@ import {
IconNotes,
IconTable,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentToggle.stories.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentToggle.stories.tsx
index a85a630c1e1..f480f13453c 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentToggle.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/__stories__/SettingsOptionCardContentToggle.stories.tsx
@@ -2,7 +2,7 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO
import { styled } from '@linaria/react';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { IconBell, IconLock, IconRobot, IconUsers } from 'twenty-ui/display';
+import { IconBell, IconLock, IconRobot, IconUsers } from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx
index 8c479c52c70..fd701967971 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { CardContent } from 'twenty-ui/layout';
-import { type IconComponent } from 'twenty-ui/display';
+import { CardContent } from 'twenty-ui/surfaces';
+import { type IconComponent } from 'twenty-ui/icon';
import { Radio } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsRadioCardContainer.tsx b/packages/twenty-front/src/modules/settings/components/SettingsRadioCardContainer.tsx
index cf70ecc24ea..9aad0c000aa 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsRadioCardContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsRadioCardContainer.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { SettingsRadioCard } from '@/settings/components/SettingsRadioCard';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRadioCardContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsStatsGrid.tsx b/packages/twenty-front/src/modules/settings/components/SettingsStatsGrid.tsx
index 9332be1d034..0d8dd1fe96f 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsStatsGrid.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsStatsGrid.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { Fragment, useContext } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type SettingsStatRow = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
index 0d5fb831a15..223c6133c37 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableCard.tsx
@@ -3,11 +3,8 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- OverflowingTextWithTooltip,
- type IconComponent,
-} from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { type IconComponent } from 'twenty-ui/icon';
+import { Card, OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type TableItem = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
index d2b0990dce6..3996bad44e2 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
@@ -6,7 +6,8 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { H2Title, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsCard.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsCard.stories.tsx
index 9d188003c38..ebd3ede8afd 100644
--- a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsCard.stories.tsx
@@ -1,7 +1,7 @@
import { SettingsCard } from '@/settings/components/SettingsCard';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import React from 'react';
-import { IconMailCog } from 'twenty-ui/display';
+import { IconMailCog } from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
const meta: Meta<typeof SettingsCard> = {
diff --git a/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx b/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
index 7d503a756ff..463f33a5b79 100644
--- a/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
+++ b/packages/twenty-front/src/modules/settings/components/layout/SettingsWizardStepBar.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
index 8e9e224cd0a..8705923c9f0 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
-import { H3Title, IconCheck, IconPencil, IconX } from 'twenty-ui/display';
+import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
+import { H3Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
index 161c2134c80..a94405dd721 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableTable.tsx
@@ -6,10 +6,8 @@ import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { t } from '@lingui/core/macro';
import { TableCell } from '@/ui/layout/table/components/TableCell';
-import {
- IconChevronRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { useContext } from 'react';
const StyledTableBodyContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
index 0856e0c2e6c..a4ae57c71c1 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
import { StyledFormCardTitle } from '@/settings/data-model/fields/components/StyledFormCardTitle';
import { Trans } from '@lingui/react/macro';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
index 9fab47586d3..b6a292f7ad2 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
@@ -1,7 +1,4 @@
-import {
- type IconComponent,
- IllustrationIconOneToMany,
-} from 'twenty-ui/display';
+import { type IconComponent, IllustrationIconOneToMany } from 'twenty-ui/icon';
import { RelationType } from '~/generated-metadata/graphql';
import OneToManySvg from '@/settings/data-model/assets/OneToMany.svg';
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
index 0d326c0a006..86218e6d555 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
@@ -25,7 +25,7 @@ import {
IllustrationIconSetting,
IllustrationIconText,
IllustrationIconUser,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { FieldMetadataType } from '~/generated-metadata/graphql';
//TODO : isIncludedInUniqueConstraint refactor - https://github.com/twentyhq/core-team-issues/issues/1097
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
index 87bf1a0eb57..db0ef26ddf9 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
@@ -55,7 +55,7 @@ import {
IconCurrencyYuan,
IconCurrencyZloty,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const SETTINGS_FIELD_CURRENCY_CODES: Record<
CurrencyCode,
{ label: string; Icon: IconComponent }
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
index c5303bd5522..5505d742ca5 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
@@ -31,7 +31,7 @@ import {
IllustrationIconToggle,
IllustrationIconUid,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { FieldMetadataType } from '~/generated-metadata/graphql';
DEFAULT_DATE_VALUE.setFullYear(DEFAULT_DATE_VALUE.getFullYear() + 2);
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/MultiSelectAddressFields.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/MultiSelectAddressFields.tsx
index 9fa90431983..a990f4a1d25 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/MultiSelectAddressFields.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/MultiSelectAddressFields.tsx
@@ -11,7 +11,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { t } from '@lingui/core/macro';
import { type MouseEvent, useMemo, useState } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItem, MenuItemMultiSelectTag } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
index c276b25e367..b204d75230a 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
@@ -18,7 +18,7 @@ import {
IconMap,
IconRefresh,
type IconComponentProps,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { z } from 'zod';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
index c3edf43f001..b2bcdf4d86e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
@@ -6,7 +6,7 @@ import { BOOLEAN_DATA_MODEL_SELECT_OPTIONS } from '@/settings/data-model/fields/
import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues';
import { Select } from '@/ui/input/components/Select';
import { useLingui } from '@lingui/react/macro';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
export const settingsDataModelFieldBooleanFormSchema = z.object({
defaultValue: z.boolean(),
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/constants/BooleanDataModelSelectOptions.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/constants/BooleanDataModelSelectOptions.ts
index 0abc4f22ef9..f3267d47de8 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/constants/BooleanDataModelSelectOptions.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/constants/BooleanDataModelSelectOptions.ts
@@ -1,5 +1,5 @@
import { msg } from '@lingui/core/macro';
-import { IconCheck, IconX } from 'twenty-ui/display';
+import { IconCheck, IconX } from 'twenty-ui/icon';
export const BOOLEAN_DATA_MODEL_SELECT_OPTIONS = [
{
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
index dc15ebe11b4..17a9c746abc 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
@@ -15,13 +15,8 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { useLingui } from '@lingui/react/macro';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- IconInfoCircle,
- IconRefresh,
- TooltipDelay,
-} from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { IconInfoCircle, IconRefresh } from 'twenty-ui/icon';
+import { AppTooltip, Card, TooltipDelay } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIsUniqueForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIsUniqueForm.tsx
index 95041b05361..bc24e238975 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIsUniqueForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIsUniqueForm.tsx
@@ -6,7 +6,7 @@ import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsO
import { canBeUnique } from '@/settings/data-model/fields/forms/utils/canBeUnique';
import { t } from '@lingui/core/macro';
import { type FieldMetadataType } from 'twenty-shared/types';
-import { IconKey } from 'twenty-ui/display';
+import { IconKey } from 'twenty-ui/icon';
import { Toggle } from 'twenty-ui/input';
type SettingsDataModelFieldIsUniqueFormValues = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldMaxValuesForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldMaxValuesForm.tsx
index edd91c12fea..b57723b3aa5 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldMaxValuesForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldMaxValuesForm.tsx
@@ -12,7 +12,7 @@ import {
FieldMetadataType,
type FieldMetadataMultiItemSettings,
} from 'twenty-shared/types';
-import { IconNumber } from 'twenty-ui/display';
+import { IconNumber } from 'twenty-ui/icon';
type SettingsDataModelFieldMaxValuesFormProps = {
disabled?: boolean;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldOnClickActionForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldOnClickActionForm.tsx
index c9a0654c72a..4bfa6de74ac 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldOnClickActionForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldOnClickActionForm.tsx
@@ -11,7 +11,7 @@ import {
FieldMetadataSettingsOnClickAction,
FieldMetadataType,
} from 'twenty-shared/types';
-import { IconClick } from 'twenty-ui/display';
+import { IconClick } from 'twenty-ui/icon';
type SettingsDataModelFieldOnClickActionFormProps = {
disabled?: boolean;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
index 2f9241a0274..e2d61792d78 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
@@ -17,7 +17,8 @@ import { useContext, useState } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm.tsx
index 7e05ada4269..d4ae0bb3bba 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm.tsx
@@ -5,7 +5,7 @@ import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsO
import { TEXT_DATA_MODEL_SELECT_OPTIONS } from '@/settings/data-model/fields/forms/components/text/constants/TextDataModelSelectOptions';
import { Select } from '@/ui/input/components/Select';
import { useLingui } from '@lingui/react/macro';
-import { IconTextWrap } from 'twenty-ui/display';
+import { IconTextWrap } from 'twenty-ui/icon';
import { z } from 'zod';
type SettingsDataModelFieldTextFormProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
index a7cbae7d32b..e28f0a2fa75 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
@@ -15,11 +15,7 @@ import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fiel
import { Select } from '@/ui/input/components/Select';
import { plural } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import {
- IconCheckbox,
- IconCurrencyDollar,
- IconDecimal,
-} from 'twenty-ui/display';
+import { IconCheckbox, IconCurrencyDollar, IconDecimal } from 'twenty-ui/icon';
import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
index 074679a6bc8..8cf6727b85a 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
@@ -12,7 +12,7 @@ import { Select } from '@/ui/input/components/Select';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconSlash } from 'twenty-ui/display';
+import { IconSlash } from 'twenty-ui/icon';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx
index 57adaee95b2..0cc319aa613 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx
@@ -2,7 +2,7 @@ import { useLingui } from '@lingui/react/macro';
import { useFormContext } from 'react-hook-form';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconLink } from 'twenty-ui/display';
+import { IconLink } from 'twenty-ui/icon';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
index b7f288ea6fd..994eabcf205 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
@@ -10,7 +10,7 @@ import { NUMBER_DATA_MODEL_SELECT_OPTIONS } from '@/settings/data-model/fields/f
import { Select } from '@/ui/input/components/Select';
import { plural } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { IconDecimal, IconEye } from 'twenty-ui/display';
+import { IconDecimal, IconEye } from 'twenty-ui/icon';
import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
export const settingsDataModelFieldNumberFormSchema = z.object({
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/constants/NumberDataModelSelectOptions.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/constants/NumberDataModelSelectOptions.ts
index d821463a336..ecca1ed9c46 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/constants/NumberDataModelSelectOptions.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/constants/NumberDataModelSelectOptions.ts
@@ -8,7 +8,7 @@ import {
IconPercentage,
type IconComponent,
type IconComponentProps,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
type NumberDataModelSelectOptions = {
Icon: ForwardRefExoticComponent<
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm.tsx
index 67112ce36bd..365215a0808 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm.tsx
@@ -15,7 +15,7 @@ import {
IconCircleOff,
IconMap,
type IconComponentProps,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { z } from 'zod';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
import { stripSimpleQuotesFromString } from '~/utils/string/stripSimpleQuotesFromString';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
index 82ae9033ec7..0505c0fafce 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/AddSelectOptionMenuItem.tsx
@@ -1,7 +1,7 @@
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type AddSelectOptionMenuItemProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
index 2c654d3051f..556238fb180 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
@@ -39,9 +39,9 @@ import {
IconPlus,
IconPoint,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightButton, LightIconButton } from 'twenty-ui/input';
-import { CardContent, CardFooter } from 'twenty-ui/layout';
+import { CardContent, CardFooter } from 'twenty-ui/surfaces';
import { MenuItem } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsDataModelFieldSelectFormOptionRow } from './SettingsDataModelFieldSelectFormOptionRow';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index 121bfe5ca1f..95cf29d395d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -9,14 +9,14 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { t } from '@lingui/core/macro';
+import { ColorSample } from 'twenty-ui/data-display';
import {
- ColorSample,
IconCheck,
IconDotsVertical,
IconGripVertical,
IconTrash,
IconX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import {
type ColorLabels,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
index 374c49247a1..561e3556e7e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
@@ -11,7 +11,7 @@ import { SettingsDataModelLabelIdentifierPreviewContextWrapper } from '@/setting
import { SettingsDataModelSetFieldValueEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect';
import { SettingsDataModelSetLabelIdentifierRecordEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetLabelIdentifierRecordEffect';
import { useFieldPreviewValue } from '@/settings/data-model/fields/preview/hooks/useFieldPreviewValue';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx
index 2f40d9d0311..b4adbfc6a22 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx
@@ -4,7 +4,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { SettingsDataModelFieldPreview } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview';
import { SettingsDataModelObjectPreview } from '@/settings/data-model/objects/components/SettingsDataModelObjectSummary';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview.tsx
index 4d275b558eb..57eed7de953 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview.tsx
@@ -9,7 +9,7 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { SettingsDataModelSetFieldValueEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect';
import { useFieldPreviewValue } from '@/settings/data-model/fields/preview/hooks/useFieldPreviewValue';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx
index 04c26093d60..8466a02d68d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx
@@ -5,7 +5,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte
import { SettingsDataModelRelationFieldPreview } from '@/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview';
import { SettingsDataModelObjectPreview } from '@/settings/data-model/objects/components/SettingsDataModelObjectSummary';
import { isDefined } from 'twenty-shared/utils';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export type SettingsDataModelRelationFieldPreviewSubWidgetProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
index b65bb3f7926..adafc524843 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
@@ -29,7 +29,7 @@ import {
IconMinus,
IconPlus,
IconX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button, IconButtonGroup } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation.tsx
index c733a71dfa2..bf1c6a5d343 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation.tsx
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { styled } from '@linaria/react';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
index 81fd03a4d40..bf95d9dfc6a 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
@@ -15,7 +15,7 @@ import { ObjectFieldRowWithoutRelation } from '@/settings/data-model/graph-overv
import '@xyflow/react/dist/style.css';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsDataModelOverviewObjectNode = Node<
diff --git a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx
index bf5e0d91539..048a9070c87 100644
--- a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
-import { IconTrash, useIcons } from 'twenty-ui/display';
+import { IconTrash, useIcons } from 'twenty-ui/icon';
import { IconButton, type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type SettingsObjectNewIndexFormValues } from '~/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues';
diff --git a/packages/twenty-front/src/modules/settings/data-model/indexes/utils/buildIndexableSelectOptions.ts b/packages/twenty-front/src/modules/settings/data-model/indexes/utils/buildIndexableSelectOptions.ts
index 7be75af53a9..3bad1c76929 100644
--- a/packages/twenty-front/src/modules/settings/data-model/indexes/utils/buildIndexableSelectOptions.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/indexes/utils/buildIndexableSelectOptions.ts
@@ -1,5 +1,5 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { compositeTypeDefinitions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx
index baf888a18ac..4bb849ba8f8 100644
--- a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx
@@ -4,7 +4,7 @@ import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import {
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
index 1afee5bf227..94c94e9a897 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';
-import { type IconComponent, IconTwentyStar } from 'twenty-ui/display';
+import { type IconComponent, IconTwentyStar } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
index f5e7d02aec4..5c61e2d0e42 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
@@ -10,7 +10,7 @@ import {
IconEye,
IconPencil,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { type FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index 301dcc12365..ad36a8e2004 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -23,7 +23,7 @@ import {
IconMinus,
IconPlus,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
index 8be22005beb..685113b3b66 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
@@ -17,7 +17,7 @@ import { useContext, useMemo } from 'react';
import { Link } from 'react-router-dom';
import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconChevronRight, useIcons } from 'twenty-ui/display';
+import { IconChevronRight, useIcons } from 'twenty-ui/icon';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
index 4372da7e4b8..da2661d6fa6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
@@ -24,7 +24,7 @@ import {
IconFilter,
IconSearch,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
index efc1b2e600b..fd0400f1a98 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
@@ -8,7 +8,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLingui } from '@lingui/react/macro';
import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
index b9b9bb09d6b..c9bcc728192 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
@@ -4,7 +4,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconLayoutDashboard, IconReload } from 'twenty-ui/display';
+import { IconLayoutDashboard, IconReload } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
index 78f8628a029..fb70e8b3182 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
@@ -16,7 +16,8 @@ import { styled } from '@linaria/react';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { H2Title, IconArchive, IconTrash } from 'twenty-ui/display';
+import { IconArchive, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
index 43cecfcfc62..d862dd9a3c3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
@@ -9,7 +9,7 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useMemo, useState } from 'react';
-import { IconEyeOff, IconPlus } from 'twenty-ui/display';
+import { IconEyeOff, IconPlus } from 'twenty-ui/icon';
import { Button, SearchInput } from 'twenty-ui/input';
import { MenuItemToggle, UndecoratedLink } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
index 753dcf5561d..54d036612c3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
@@ -13,8 +13,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useMemo, useState } from 'react';
-import { IconEye, IconSearch, useIcons } from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { IconEye, IconSearch, useIcons } from 'twenty-ui/icon';
+import { Card } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsObjectSearchSectionProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
index 2ba54b143fb..ddb68af4e07 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx
@@ -5,7 +5,8 @@ import { useContext } from 'react';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
-import { IconBox, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconBox } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type SettingsDataModelObjectPreviewProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
index 40a6f485fbc..5948af252ea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
@@ -4,7 +4,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index 839c76a056d..617e3303f5b 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -13,15 +13,9 @@ import { useContext } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { capitalize, isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- IconInfoCircle,
- IconLink,
- IconRefresh,
- TooltipDelay,
- InlineBanner,
-} from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { InlineBanner } from 'twenty-ui/feedback';
+import { IconInfoCircle, IconLink, IconRefresh } from 'twenty-ui/icon';
+import { AppTooltip, Card, TooltipDelay } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { parseThemeColor } from 'twenty-ui/utilities';
import { type StringKeyOf } from 'type-fest';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
index a05bca90752..c6acee738a2 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
@@ -16,7 +16,7 @@ import {
isLabelIdentifierFieldMetadataTypes,
isSearchableFieldType,
} from 'twenty-shared/utils';
-import { IconCircleOff, IconPlus, useIcons } from 'twenty-ui/display';
+import { IconCircleOff, IconPlus, useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type z } from 'zod';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
index d16035a7ee9..14b2562813f 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
@@ -8,7 +8,7 @@ import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/field
import { SettingsDataModelObjectPreview } from '@/settings/data-model/objects/components/SettingsDataModelObjectSummary';
import { SettingsDataModelObjectIdentifiersForm } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
import { Trans } from '@lingui/react/macro';
-import { Card, CardContent } from 'twenty-ui/layout';
+import { Card, CardContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsDataModelObjectSettingsFormCardProps = {
diff --git a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
index a6fe74101ad..8d91e3f8678 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
@@ -1,7 +1,7 @@
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconCopy } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
index 211f715be38..767ea90ffc5 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
@@ -7,7 +7,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconChevronRight } from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { type ApiKey } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersRoleSelector.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersRoleSelector.tsx
index c36ede1d3e6..acddde47499 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersRoleSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersRoleSelector.tsx
@@ -1,6 +1,6 @@
import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
import { Select } from '@/ui/input/components/Select';
-import { type IconComponent, useIcons } from 'twenty-ui/display';
+import { type IconComponent, useIcons } from 'twenty-ui/icon';
type SettingsDevelopersRoleSelectorProps = {
value?: string | null | undefined;
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
index de3a460ef59..ea6a08b212a 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
@@ -18,7 +18,8 @@ import {
isDefined,
isValidUrl,
} from 'twenty-shared/utils';
-import { H2Title, IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
index e8c4316b023..60ec6ac19d2 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
@@ -4,10 +4,8 @@ import { WEBHOOK_TABLE_ROW_GRID_TEMPLATE_COLUMNS } from '@/settings/developers/c
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { getUrlHostnameOrThrow, isValidUrl } from 'twenty-shared/utils';
-import {
- IconChevronRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Webhook } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
index 086e6b97277..d70560ef694 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
@@ -24,7 +24,7 @@ import {
IconNorthStar,
IconSettings,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
index 5ce1839055c..e8867adfbff 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
@@ -1,5 +1,6 @@
import { Section } from 'twenty-ui/layout';
-import { H2Title, IconReload, IconTrash } from 'twenty-ui/display';
+import { IconReload, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Trans, useLingui } from '@lingui/react/macro';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { SettingsPath } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
index 5701555e493..4e7fc1f666f 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomainRowDropdownMenu.tsx
@@ -4,7 +4,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useMutation, useQuery } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
index 6b4486054dd..a8f584b86d6 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
@@ -13,7 +13,8 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconReload, IconTrash } from 'twenty-ui/display';
+import { IconReload, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button, ButtonGroup } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
index 8bd32c52db9..bd591b24baf 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { SettingsDnsRecordsTable } from '@/settings/components/SettingsDnsRecordsTable';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { type ThemeColor } from 'twenty-ui/theme';
import {
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
index 105c222b3dc..ee17b687654 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
@@ -5,7 +5,8 @@ import { selectedPublicDomainState } from '@/settings/domains/states/selectedPub
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
-import { IconAt, IconMailCog, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconAt, IconMailCog } from 'twenty-ui/icon';
import { useQuery } from '@apollo/client/react';
import {
type PublicDomain,
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
index e0f7fed6bd3..c98d719aaf0 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
@@ -14,7 +14,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
index 1072dce9405..d25bb0fcd89 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsWorkspaceDomainCard.tsx
@@ -7,7 +7,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconWorld, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconWorld } from 'twenty-ui/icon';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
index 1f51c180556..5934574ddd7 100644
--- a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
@@ -4,7 +4,7 @@ import { useLingui } from '@lingui/react/macro';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { VerifyEmailingDomainDocument } from '~/generated-metadata/graphql';
-import { IconRefresh } from 'twenty-ui/display';
+import { IconRefresh } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
type SettingsEmailingDomainVerifyButtonProps = {
diff --git a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
index 7b54e24b825..f69070989cf 100644
--- a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
+++ b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
@@ -11,7 +11,7 @@ import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { Loader } from 'twenty-ui/feedback';
import { CardPicker, MainButton } from 'twenty-ui/input';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export const ENTERPRISE_PLAN_MODAL_ID = 'enterprise-plan-modal';
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
index b97f705cd0b..b2839b58ae6 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogFilters.tsx
@@ -7,7 +7,7 @@ import { TextInput } from '@/ui/input/components/TextInput';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconBox, IconUser, useIcons } from 'twenty-ui/display';
+import { IconBox, IconUser, useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
index f9e7899ecf4..a700207915a 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
@@ -21,9 +21,9 @@ import {
IconLock,
IconPlayerPause,
IconPlayerPlay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button, IconButton } from 'twenty-ui/input';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
index a9f7dd306e8..5243b1893fb 100644
--- a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
+++ b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
@@ -17,7 +17,6 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import {
IconApi,
- // IconApps, // TODO: Re-enable when integrations page is ready
IconAt,
IconCalendarEvent,
IconColorSwatch,
@@ -35,7 +34,7 @@ import {
IconSparkles,
IconUserCircle,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { PermissionFlagType } from '~/generated-metadata/graphql';
export type SettingsNavigationSection = {
diff --git a/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
index 289373122a2..70a526de3c4 100644
--- a/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
+++ b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
@@ -9,8 +9,8 @@ import {
IconRelationManyToMany,
IconSparkles,
type IconComponent,
-} from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+} from 'twenty-ui/icon';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FeatureFlagKey } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/layout/components/SettingsLayoutItemsStats.tsx b/packages/twenty-front/src/modules/settings/layout/components/SettingsLayoutItemsStats.tsx
index 95f7c2d5e63..851e788d5b8 100644
--- a/packages/twenty-front/src/modules/settings/layout/components/SettingsLayoutItemsStats.tsx
+++ b/packages/twenty-front/src/modules/settings/layout/components/SettingsLayoutItemsStats.tsx
@@ -12,7 +12,7 @@ import {
IconLayoutSidebarLeftExpand,
IconPuzzle,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const SettingsLayoutItemsStats = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
index 7cc9d64fe85..4149b07f21d 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
@@ -4,8 +4,10 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconClockHour8 } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconClockHour8 } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledInputsContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
index 45d03d74605..171b76dbe5f 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
@@ -8,7 +8,8 @@ import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTab
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconPlayerPlay } from 'twenty-ui/display';
+import { IconPlayerPlay } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button, CoreEditorHeader } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTabEnvironmentVariableTableRow.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTabEnvironmentVariableTableRow.tsx
index 5a7c1839b1d..d382445f893 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTabEnvironmentVariableTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTabEnvironmentVariableTableRow.tsx
@@ -13,8 +13,8 @@ import {
IconPencil,
IconTrash,
IconX,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import type { ApplicationVariable } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
index 68cc7caac8e..e336a93a3e6 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
@@ -12,14 +12,14 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
import {
- H2Title,
IconClock,
IconDatabase,
IconPlayerPlay,
IconTool,
IconWebhook,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button, CodeEditor, CoreEditorHeader } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
index 214362b11d5..38038ec0ba8 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab.tsx
@@ -7,7 +7,8 @@ import { SettingsLogicFunctionWorkflowActionTriggerSection } from '@/settings/lo
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Callout, IconInfoCircle } from 'twenty-ui/display';
+import { Callout } from 'twenty-ui/feedback';
+import { IconInfoCircle } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledEmptyState = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
index 15c5037922c..c153996f948 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
@@ -18,7 +18,7 @@ import {
IconHttpPost,
IconHttpPut,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Toggle } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
index 98ab349a2f6..f1878f678ae 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext, type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Toggle } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
index 931740ac102..729c38c5cc3 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
@@ -6,7 +6,7 @@ import { MemberNameFields } from '@/settings/members/components/MemberNameFields
import { WorkspaceMemberPictureUploader } from '@/settings/workspace-member/components/WorkspaceMemberPictureUploader';
import { type WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
index 2ebe2591bd6..f8d46eca1c9 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
@@ -10,12 +10,8 @@ import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import {
- H2Title,
- IconArrowUpRight,
- IconUser,
- useIcons,
-} from 'twenty-ui/display';
+import { IconArrowUpRight, IconUser, useIcons } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/playground/components/PlaygroundSetupForm.tsx b/packages/twenty-front/src/modules/settings/playground/components/PlaygroundSetupForm.tsx
index 2706c0d1205..07709132748 100644
--- a/packages/twenty-front/src/modules/settings/playground/components/PlaygroundSetupForm.tsx
+++ b/packages/twenty-front/src/modules/settings/playground/components/PlaygroundSetupForm.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { zodResolver } from '@hookform/resolvers/zod';
import { useLingui } from '@lingui/react/macro';
import { Controller, useForm } from 'react-hook-form';
-import { IconApi, IconBrandGraphql } from 'twenty-ui/display';
+import { IconApi, IconBrandGraphql } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { z } from 'zod';
diff --git a/packages/twenty-front/src/modules/settings/playground/components/SettingsMcpSetup.tsx b/packages/twenty-front/src/modules/settings/playground/components/SettingsMcpSetup.tsx
index 1b9a4365be2..35a62d37c0e 100644
--- a/packages/twenty-front/src/modules/settings/playground/components/SettingsMcpSetup.tsx
+++ b/packages/twenty-front/src/modules/settings/playground/components/SettingsMcpSetup.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';
import ModelContextProtocolLogo from '@/settings/playground/assets/model-context-protocol-logo.svg?react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { CodeEditor, CoreEditorHeader } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/playground/constants/SettingsPlaygroundFormSchemaSelectOptions.ts b/packages/twenty-front/src/modules/settings/playground/constants/SettingsPlaygroundFormSchemaSelectOptions.ts
index f0bb06d5c5e..7e2a5755bac 100644
--- a/packages/twenty-front/src/modules/settings/playground/constants/SettingsPlaygroundFormSchemaSelectOptions.ts
+++ b/packages/twenty-front/src/modules/settings/playground/constants/SettingsPlaygroundFormSchemaSelectOptions.ts
@@ -1,6 +1,6 @@
import { PlaygroundSchemas } from '@/settings/playground/types/PlaygroundSchemas';
import { msg } from '@lingui/core/macro';
-import { IconBracketsAngle, IconFolderRoot } from 'twenty-ui/display';
+import { IconBracketsAngle, IconFolderRoot } from 'twenty-ui/icon';
export const SETTINGS_PLAYGROUND_FORM_SCHEMA_SELECT_OPTIONS = [
{
value: PlaygroundSchemas.CORE,
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index be05f1bd24a..6c7eaa8b9c9 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -10,7 +10,7 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
index 1fc5d9ea8d6..6f7feef22ba 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
@@ -6,7 +6,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useRedirectToDefaultDomain } from '@/domain-manager/hooks/useRedirectToDefaultDomain';
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { H2Title, IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { useMutation } from '@apollo/client/react';
import { DeleteCurrentWorkspaceDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
index 10afad82912..a2447f04be5 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
@@ -7,13 +7,8 @@ import { useCanEditProfileField } from '@/settings/profile/hooks/useCanEditProfi
import { useUpdateEmail } from '@/settings/profile/hooks/useUpdateEmail';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import {
- AppTooltip,
- IconCheck,
- IconPencil,
- IconX,
- TooltipDelay,
-} from 'twenty-ui/display';
+import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
index c6687f556aa..1c589080301 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
@@ -1,7 +1,7 @@
import { useHandleResetPassword } from '@/auth/sign-in-up/hooks/useHandleResetPassword';
import { currentUserState } from '@/auth/states/currentUserState';
import { useLingui } from '@lingui/react/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
index a38965855c0..379a952fa6c 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
@@ -8,8 +8,10 @@ import { Select } from '@/ui/input/components/Select';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconUserPin, useIcons } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconUserPin, useIcons } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { useMutation } from '@apollo/client/react';
import {
type UpdateWorkspaceMutation,
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
index f92221acf75..e67386e5ba4 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -13,13 +13,13 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import {
- H2Title,
IconFilter,
IconKey,
IconPlus,
IconRobot,
IconSearch,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItemToggle } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
index 93d7ec4e186..3bae4af5a2f 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
@@ -6,14 +6,9 @@ import React, { useContext } from 'react';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- Avatar,
- IconChevronRight,
- IconLock,
- TooltipDelay,
- useIcons,
-} from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconChevronRight, IconLock, useIcons } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index 8ba8f5d4027..0d11d9a9055 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -4,7 +4,8 @@ import { SettingsRoleAssignmentWorkspaceMemberPickerDropdown } from '@/settings/
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
-import { AppTooltip, IconPlus, TooltipDelay } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModalSubtitle.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModalSubtitle.tsx
index 96de8a3361f..4428730ff9a 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModalSubtitle.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModalSubtitle.tsx
@@ -4,7 +4,7 @@ import { type SettingsRoleAssignmentConfirmationModalSelectedRoleTarget } from '
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
index e797692b7a3..19f795d3d86 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
@@ -12,7 +12,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
-import { H2Title, IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
index 9beb51af6fc..437d4556341 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
@@ -6,12 +6,9 @@ import { useContext } from 'react';
import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import {
- Avatar,
- IconKey,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconKey, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
index bd18ee23eb0..b761e702aa3 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
@@ -9,7 +9,8 @@ import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
-import { H2Title, IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
index 128695cea06..a0233a51a13 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
@@ -8,7 +8,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip, TooltipDelay } from 'twenty-ui/display';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
index 082e086474b..b53a5001869 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
@@ -12,7 +12,7 @@ import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
index 000ff7125f8..3982421cb36 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx
@@ -11,7 +11,7 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNameLabel = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
index 87f031e373d..66358f522ba 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRowOptionsDropdown.tsx
@@ -4,7 +4,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
index ae4e95cfe97..f8d8f3d9af9 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
@@ -20,7 +20,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isNonEmptyArray } from 'twenty-shared/utils';
-import { H2Title, IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { sortByProperty } from '~/utils/array/sortByProperty';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
index 7730c76db94..ba29e6ea9f7 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow.tsx
@@ -10,7 +10,7 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledSectionHeader = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow.tsx
index c3b4da01422..6b1fdbbdec8 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow.tsx
@@ -12,7 +12,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { useContext, useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
import {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
index 68e2dd433e6..46dcd3cbb78 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx
@@ -1,9 +1,9 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconReload, IconX } from 'twenty-ui/display';
+import { IconReload, IconX } from 'twenty-ui/icon';
import { Checkbox } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedRotate } from 'twenty-ui/utilities';
+import { AnimatedRotate } from 'twenty-ui/layout';
export type OverridableCheckboxType = 'default' | 'override' | 'no_cta';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
index eec137426c8..962979730c3 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
@@ -6,7 +6,7 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
index fcf4dc1bc71..7dd9123de13 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx
@@ -5,7 +5,7 @@ import {
FieldMetadataType,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
index 3122b17c3eb..e0554790456 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
@@ -3,7 +3,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconFilter, IconPlus } from 'twenty-ui/display';
+import { IconFilter, IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
index 100e3c92152..1173cae0c92 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx
@@ -9,7 +9,7 @@ import {
CoreObjectNameSingular,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconUserCircle, IconX, useIcons } from 'twenty-ui/display';
+import { IconUserCircle, IconX, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
index 1cc1892df7f..42ef293fbf1 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
@@ -5,7 +5,8 @@ import { t } from '@lingui/core/macro';
import { useContext, useMemo } from 'react';
import { FieldMetadataType, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip, IconEraser, TooltipDelay } from 'twenty-ui/display';
+import { IconEraser } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { type JsonValue } from 'type-fest';
import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx
index a9abda66616..974581ee8f4 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx
@@ -1,7 +1,7 @@
/* @license Enterprise */
import { styled } from '@linaria/react';
-import { IconVariablePlus } from 'twenty-ui/display';
+import { IconVariablePlus } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
index e99c5958caf..5b693b7d535 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
@@ -2,8 +2,10 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconArrowUp, IconLock } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconArrowUp, IconLock } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { billingState } from '@/client-config/states/billingState';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
index 17d043c71f5..d6808e3eb83 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
@@ -6,7 +6,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig.ts
index 37a767a562a..f203bd47c7f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig.ts
@@ -8,7 +8,7 @@ import {
IconTrashOff,
IconTrashX,
IconTrashXOff,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
type SettingsRoleObjectPermissionIconConfig = {
Icon: IconComponent;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
index d52acbbd230..e1bf2ead6dd 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
@@ -7,8 +7,10 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconSettings } from 'twenty-ui/display';
-import { AnimatedExpandableContainer, Card, Section } from 'twenty-ui/layout';
+import { IconSettings } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { AnimatedExpandableContainer, Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTable = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
index bb95fbc2e3b..c9adbae90a0 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
@@ -8,8 +8,10 @@ import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAt
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconTool } from 'twenty-ui/display';
-import { AnimatedExpandableContainer, Card, Section } from 'twenty-ui/layout';
+import { IconTool } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { AnimatedExpandableContainer, Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTable = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useActionRolePermissionFlagConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useActionRolePermissionFlagConfig.ts
index 561a262f50f..3c6b1f2a8bc 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useActionRolePermissionFlagConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useActionRolePermissionFlagConfig.ts
@@ -13,7 +13,7 @@ import {
IconSparkles,
IconTable,
IconUser,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { PermissionFlagType } from '~/generated-metadata/graphql';
type UseActionRolePermissionFlagConfigParams = {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useSettingsRolePermissionFlagConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useSettingsRolePermissionFlagConfig.ts
index ce46ad9612a..ddd26339c56 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useSettingsRolePermissionFlagConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/hooks/useSettingsRolePermissionFlagConfig.ts
@@ -15,7 +15,7 @@ import {
IconSparkles,
IconSpy,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { PermissionFlagType } from '~/generated-metadata/graphql';
type UseSettingsRolePermissionFlagConfigParams = {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
index 2c878bade6c..cec6316fb2f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type PermissionFlagType } from '~/generated-metadata/graphql';
export type SettingsRolePermissionsSettingPermission = {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
index 5feae59b60c..8085b0d3799 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title, IconKey, IconRobot, IconUsers } from 'twenty-ui/display';
+import { IconKey, IconRobot, IconUsers } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Checkbox } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { useContext } from 'react';
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
index 60d1f546136..132ec633d84 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
@@ -11,7 +11,7 @@ import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAt
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
index 98b4cb92f08..ea13f23593d 100644
--- a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
@@ -22,7 +22,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconLockOpen, IconSettings, IconUserPlus } from 'twenty-ui/display';
+import { IconLockOpen, IconSettings, IconUserPlus } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { getDirtyFields } from '~/utils/getDirtyFields';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx
index f43fde66b6d..ba96cdc12cc 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx
@@ -10,7 +10,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactElement, useMemo } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
-import { H2Title, type IconComponent, IconKey } from 'twenty-ui/display';
+import { type IconComponent, IconKey } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { IdentityProviderType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx
index 7596d280c22..2024f0e0cf1 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx
@@ -16,7 +16,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useEffect } from 'react';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconKey } from 'twenty-ui/display';
+import { IconKey } from 'twenty-ui/icon';
import { GetSsoIdentityProvidersDocument } from '~/generated-metadata/graphql';
const StyledLinkContainer = styled.div<{ isDisabled: boolean }>`
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx
index 5cf947828ac..927e413ee88 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx
@@ -4,7 +4,7 @@ import { SettingsSecuritySSORowDropdownMenu } from '@/settings/security/componen
import { type SSOIdentityProvider } from '@/settings/security/types/SSOIdentityProvider';
import { getColorBySSOIdentityProviderStatus } from '@/settings/security/utils/getColorBySSOIdentityProviderStatus';
import { styled } from '@linaria/react';
-import { Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRowRightContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx
index 302a8359541..31584edc02f 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx
@@ -4,7 +4,8 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { Controller, useFormContext } from 'react-hook-form';
-import { H2Title, IconCopy } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx
index 69ef61f9921..eb5d9bc46db 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx
@@ -8,16 +8,10 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useFormContext } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
-import {
- H2Title,
- HorizontalSeparator,
- IconCheck,
- IconCopy,
- IconDownload,
- IconUpload,
-} from 'twenty-ui/display';
+import { IconCheck, IconCopy, IconDownload, IconUpload } from 'twenty-ui/icon';
+import { HorizontalSeparator, Section } from 'twenty-ui/layout';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
-import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx
index ebeb5b4c019..76fb8ed0b34 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx
@@ -8,7 +8,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconArchive, IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconArchive, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { SsoIdentityProviderStatus } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
index 9b30d09523a..34f2421a72c 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthBypassOptionsList.tsx
@@ -6,8 +6,8 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { capitalize } from 'twenty-shared/utils';
-import { IconGoogle, IconMicrosoft, IconPassword } from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { IconGoogle, IconMicrosoft, IconPassword } from 'twenty-ui/icon';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation } from '@apollo/client/react';
import {
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
index 7249ca0808d..16fe56cc3c5 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx
@@ -14,8 +14,8 @@ import {
IconLink,
IconMicrosoft,
IconPassword,
-} from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+} from 'twenty-ui/icon';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation } from '@apollo/client/react';
import {
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
index 210d343a482..5a8bd28e39d 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityEditableProfileFields.tsx
@@ -16,7 +16,7 @@ import {
IconUser,
IconUserCircle,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemMultiSelect } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
index acd83e9675a..c4c8a9b8c40 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
@@ -26,13 +26,14 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { useMutation } from '@apollo/client/react';
import {
- H2Title,
IconClockHour8,
IconHistory,
IconMail,
IconTrash,
-} from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
diff --git a/packages/twenty-front/src/modules/settings/security/components/Toggle2FA.tsx b/packages/twenty-front/src/modules/settings/security/components/Toggle2FA.tsx
index 38c25b3ff5f..3201d84926f 100644
--- a/packages/twenty-front/src/modules/settings/security/components/Toggle2FA.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/Toggle2FA.tsx
@@ -4,7 +4,7 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
-import { IconLifebuoy } from 'twenty-ui/display';
+import { IconLifebuoy } from 'twenty-ui/icon';
import { useMutation } from '@apollo/client/react';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsApprovedAccessDomainsListCard.tsx b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsApprovedAccessDomainsListCard.tsx
index 8567b6056bb..f757f8ab5b0 100644
--- a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsApprovedAccessDomainsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsApprovedAccessDomainsListCard.tsx
@@ -14,7 +14,8 @@ import { useLingui } from '@lingui/react/macro';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconAt, IconMailCog, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconAt, IconMailCog } from 'twenty-ui/icon';
import { useQuery } from '@apollo/client/react';
import { GetApprovedAccessDomainsDocument } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
diff --git a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
index b73dfe436b7..3755344edc3 100644
--- a/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/approvedAccessDomains/SettingsSecurityApprovedAccessDomainRowDropdownMenu.tsx
@@ -7,7 +7,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useMutation } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts b/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts
index 8dc0667479a..a415002cf37 100644
--- a/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts
+++ b/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts
@@ -3,7 +3,7 @@ import {
IconGoogle,
IconKey,
IconMicrosoftOutlook,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const guessSSOIdentityProviderIconByUrl = (
url: string,
): IconComponent => {
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
index d20681b2130..64cc71a17eb 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
@@ -9,7 +9,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { useMutation } from '@apollo/client/react';
import { DeleteTwoFactorAuthenticationMethodDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/unsubscribe-topics/components/SettingsWorkspaceUnsubscribeTopicSection.tsx b/packages/twenty-front/src/modules/settings/unsubscribe-topics/components/SettingsWorkspaceUnsubscribeTopicSection.tsx
index a04d0f4bf6c..d43b5507511 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribe-topics/components/SettingsWorkspaceUnsubscribeTopicSection.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribe-topics/components/SettingsWorkspaceUnsubscribeTopicSection.tsx
@@ -10,7 +10,8 @@ import {
type UnsubscribeTopicsQuery,
UnsubscribeTopicVisibility,
} from '~/generated-metadata/graphql';
-import { IconExternalLink, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconExternalLink } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
index 918c6eac742..a16ed6816ee 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
@@ -11,7 +11,8 @@ import { t } from '@lingui/core/macro';
import { Link } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconSparkles } from 'twenty-ui/display';
+import { IconSparkles } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
index 49ceab712ae..4385afe3ec2 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
@@ -8,7 +8,7 @@ import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueForm
import { getOperationTypeLabel } from '@/settings/usage/utils/getOperationTypeLabel';
import { Select } from '@/ui/input/components/Select';
import { useContext } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { type UsageOperationType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
index 5a57edf350c..f88ff3eb6a6 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
@@ -9,7 +9,9 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
-import { Avatar, H2Title, IconChevronRight } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
index adcb55574b2..d3a7834cc1c 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
@@ -7,7 +7,7 @@ import { useUsageAnalyticsData } from '@/settings/usage/hooks/useUsageAnalyticsD
import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';
import { Select } from '@/ui/input/components/Select';
import { styled } from '@linaria/react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { type UsageOperationType } from '~/generated-metadata/graphql';
import { formatDate } from '~/utils/date-utils';
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
index 198dac42113..d323836de96 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx
@@ -6,7 +6,7 @@ import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';
import { getColorByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor';
import { getTextByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusText';
import { isDefined } from 'twenty-shared/utils';
-import { Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
type SettingsWorkspaceEmailChannelDomainStatusCellProps = {
item: MessageChannel;
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
index e21c6151404..2d0ef5cc07c 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailGroupSourceCell.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { type MessageChannel } from '@/accounts/types/MessageChannel';
-import { IconMail, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconMail } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledNameCell = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/ToggleImpersonate.tsx b/packages/twenty-front/src/modules/settings/workspace/components/ToggleImpersonate.tsx
index 969fa5603a8..cec171e3150 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/ToggleImpersonate.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/ToggleImpersonate.tsx
@@ -4,8 +4,8 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
-import { IconLifebuoy } from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { IconLifebuoy } from 'twenty-ui/icon';
+import { Card } from 'twenty-ui/surfaces';
import { useMutation } from '@apollo/client/react';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelAskAiInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelAskAiInfo.tsx
index 51abb47b6f9..8494caf278a 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelAskAiInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelAskAiInfo.tsx
@@ -4,7 +4,7 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hoo
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledPageTitle = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
index 66d2db7972f..46cb06adc15 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelBackButton.tsx
@@ -7,7 +7,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { styled } from '@linaria/react';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
index 897975e453c..3ec65bdae3b 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextChip.tsx
@@ -4,7 +4,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { Fragment } from 'react/jsx-runtime';
import { type SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledChip = styled.button<{
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextRecordChipAvatars.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextRecordChipAvatars.tsx
index b181a1b9d34..1f489abcb4b 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelContextRecordChipAvatars.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelContextRecordChipAvatars.tsx
@@ -4,7 +4,7 @@ import { useRecordChipData } from '@/object-record/hooks/useRecordChipData';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledIconWrapper = styled.div<{ withIconBackground?: boolean }>`
align-items: center;
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx
index 8cf09e89ab0..9b9022980ed 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx
@@ -2,7 +2,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { TintedIconTile, useIcons } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { useIcons } from 'twenty-ui/icon';
import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
index b630519a509..01158d873fb 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelGroup.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import React from 'react';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx
index f9c157d9163..2e79ce6167c 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, lazy, Suspense, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx
index 8a03610147f..e5dff4c5ff1 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx
@@ -1,7 +1,7 @@
import { useLingui } from '@lingui/react/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconLink, IconWorld } from 'twenty-ui/display';
+import { IconLink, IconWorld } from 'twenty-ui/icon';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelMultipleRecordsInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelMultipleRecordsInfo.tsx
index 7e90a478c08..f0471b29acd 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelMultipleRecordsInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelMultipleRecordsInfo.tsx
@@ -2,7 +2,7 @@ import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageIn
import { useFindManyRecordsSelectedInContextStore } from '@/context-store/hooks/useFindManyRecordsSelectedInContextStore';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type SidePanelMultipleRecordsInfoProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx
index d14a053c85c..af4c8c9ab4d 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx
@@ -1,6 +1,6 @@
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { SidePanelObjectFilterDropdownContent } from '@/side-panel/components/SidePanelObjectFilterDropdownContent';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
index 7b9754c0bb8..40e7401dc0e 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx
@@ -1,7 +1,8 @@
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';
-import { IconCube, TintedIconTile } from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconCube } from 'twenty-ui/icon';
import { MenuItemSelectAvatar, MenuItemToggle } from 'twenty-ui/navigation';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx
index 0e96071cd75..0bc33682359 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx
@@ -1,5 +1,5 @@
import { useLingui } from '@lingui/react/macro';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageInfoLayout';
import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
index e05f0a1b4d2..22d15032184 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx
@@ -1,9 +1,7 @@
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconColumnInsertRight,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { IconColumnInsertRight } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx
index 996947ebbc3..92bc031d84b 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageLayoutInfoContent.tsx
@@ -19,7 +19,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useState } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { SidePanelPageInfoLayout } from './SidePanelPageInfoLayout';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordInfo.tsx
index 60fc772f442..78e8610ed75 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordInfo.tsx
@@ -19,7 +19,7 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { AppPath } from 'twenty-shared/types';
import { getAppPath } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
index 12c8b52ebcf..cf97b74cc13 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
@@ -11,7 +11,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { motion } from 'framer-motion';
import { useContext } from 'react';
-import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/display';
+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';
import { AnimatedButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
index 06a6df40a5c..9e6b5be18ec 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
@@ -20,7 +20,7 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext, useRef } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx
index 3c8d9e50d30..55bda587616 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx
@@ -7,7 +7,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconEdit } from 'twenty-ui/display';
+import { IconEdit } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx
index ff34baf1312..b377a442eca 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx
@@ -24,7 +24,7 @@ import { useContext, useState } from 'react';
import { CoreObjectNameSingular, SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { SidePanelPageInfoLayout } from './SidePanelPageInfoLayout';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
index 801edfbb4ec..ef4f9bec9ff 100644
--- a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
@@ -16,7 +16,7 @@ import { PageFocusId } from '@/types/PageFocusId';
import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconDotsVertical } from 'twenty-ui/display';
+import { IconDotsVertical } from 'twenty-ui/icon';
jest.mock('@/side-panel/components/SidePanelTopBarInputFocusEffect', () => ({
SidePanelTopBarInputFocusEffect: () => null,
diff --git a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts
index 0ba99291d3b..d6efdfe8f86 100644
--- a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts
+++ b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts
@@ -15,7 +15,7 @@ import {
IconTable,
type IconComponent,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useNavigateSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useNavigateSidePanel.test.tsx
index 1fc328bb970..3837d2be7bb 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useNavigateSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useNavigateSidePanel.test.tsx
@@ -9,7 +9,7 @@ import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';
import { SidePanelPages } from 'twenty-shared/types';
-import { Icon123, useIcons } from 'twenty-ui/display';
+import { Icon123, useIcons } from 'twenty-ui/icon';
import { getJestMetadataAndApolloMocksAndCommandMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndCommandMenuWrapper';
import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
index 5a6f58cd34e..6d411627e39 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
@@ -6,7 +6,7 @@ import { useOpenAskAiPageInSidePanel } from '@/side-panel/hooks/useOpenAskAiPage
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconSparkles } from 'twenty-ui/display';
+import { IconSparkles } from 'twenty-ui/icon';
const navigateSidePanelMenuMock = jest.fn();
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenCalendarEventInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenCalendarEventInSidePanel.test.tsx
index 7088f97a040..958c02554d9 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenCalendarEventInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenCalendarEventInSidePanel.test.tsx
@@ -7,7 +7,7 @@ import { viewableRecordIdComponentState } from '@/side-panel/pages/record-page/s
import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconCalendarEvent } from 'twenty-ui/display';
+import { IconCalendarEvent } from 'twenty-ui/icon';
import { getJestMetadataAndApolloMocksAndCommandMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndCommandMenuWrapper';
import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordInSidePanel.test.tsx
index 007535d85c7..9ecbfdd058e 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordInSidePanel.test.tsx
@@ -15,7 +15,7 @@ import { sidePanelNavigationMorphItemsByPageState } from '@/side-panel/states/si
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { ContextStorePageType, SidePanelPages } from 'twenty-shared/types';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { getJestMetadataAndApolloMocksAndCommandMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndCommandMenuWrapper';
import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
index cb959f8bc3e..ea35ea30fe5 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelCloseAnimationCompleteCleanup.test.tsx
@@ -16,7 +16,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconList } from 'twenty-ui/display';
+import { IconList } from 'twenty-ui/icon';
const mockCloseDropdown = jest.fn();
const mockResetSelectedItem = jest.fn();
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
index 470dad55f58..05f98d2d045 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
@@ -11,7 +11,7 @@ import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconList, IconSearch } from 'twenty-ui/display';
+import { IconList, IconSearch } from 'twenty-ui/icon';
const Wrapper = ({ children }: { children: React.ReactNode }) => (
<JotaiProvider store={jotaiStore}>
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useUpdateSidePanelPageInfo.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useUpdateSidePanelPageInfo.test.tsx
index ecb7d64934c..c7574f400de 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useUpdateSidePanelPageInfo.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useUpdateSidePanelPageInfo.test.tsx
@@ -6,7 +6,7 @@ import { renderHook } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
import { act } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconArrowDown, IconDotsVertical } from 'twenty-ui/display';
+import { IconArrowDown, IconDotsVertical } from 'twenty-ui/icon';
const mockedPageInfo = {
title: 'Initial Title',
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts
index edb9bc060a7..932ae7c04d5 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts
@@ -14,7 +14,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { type SidePanelPages } from 'twenty-shared/types';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { v4 } from 'uuid';
export type SidePanelNavigationStackItem = {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
index e31836ada2f..55c86bfd5fe 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
@@ -4,7 +4,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconSparkles } from 'twenty-ui/display';
+import { IconSparkles } from 'twenty-ui/icon';
import { v4 } from 'uuid';
export const useOpenAskAiPageInSidePanel = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCalendarEventInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCalendarEventInSidePanel.ts
index 9fccf5606a9..ec30480c22a 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCalendarEventInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCalendarEventInSidePanel.ts
@@ -3,7 +3,7 @@ import { viewableRecordIdComponentState } from '@/side-panel/pages/record-page/s
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconCalendarEvent } from 'twenty-ui/display';
+import { IconCalendarEvent } from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useStore } from 'jotai';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignComposerInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignComposerInSidePanel.ts
index d9f30018f51..7408380d060 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignComposerInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignComposerInSidePanel.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconSend } from 'twenty-ui/display';
+import { IconSend } from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeEmailInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeEmailInSidePanel.ts
index 52c92306d71..5d0a24ed073 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeEmailInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeEmailInSidePanel.ts
@@ -2,11 +2,7 @@ import { useCallback } from 'react';
import { useStore } from 'jotai';
import { SidePanelPages } from 'twenty-shared/types';
-import {
- type IconComponent,
- IconArrowBackUp,
- IconMail,
-} from 'twenty-ui/display';
+import { type IconComponent, IconArrowBackUp, IconMail } from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenFrontComponentInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenFrontComponentInSidePanel.ts
index c0f09ea2537..4efd72142f4 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenFrontComponentInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenFrontComponentInSidePanel.ts
@@ -3,7 +3,7 @@ import { viewableFrontComponentIdComponentState } from '@/side-panel/pages/front
import { viewableFrontComponentRecordContextComponentState } from '@/side-panel/pages/front-component/states/viewableFrontComponentRecordContextComponentState';
import { useStore } from 'jotai';
import { SidePanelPages } from 'twenty-shared/types';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { v4 } from 'uuid';
export const useOpenFrontComponentInSidePanel = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx
index 27b1338d96f..c2caf97ebd5 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx
@@ -8,7 +8,7 @@ import { SidePanelPages } from 'twenty-shared/types';
import { msg, t } from '@lingui/core/macro';
import { useCallback } from 'react';
-import { IconArrowMerge } from 'twenty-ui/display';
+import { IconArrowMerge } from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useStore } from 'jotai';
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordInSidePanel.ts
index c310752670a..c08e01d185b 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordInSidePanel.ts
@@ -25,7 +25,7 @@ import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { v4 } from 'uuid';
export const useOpenRecordInSidePanel = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordsSearchPageInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordsSearchPageInSidePanel.ts
index 2c5d43f0c09..eecf77a194a 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordsSearchPageInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRecordsSearchPageInSidePanel.ts
@@ -3,7 +3,7 @@ import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedSta
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
import { v4 } from 'uuid';
export const useOpenRecordsSearchPageInSidePanel = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRichTextInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRichTextInSidePanel.ts
index f561a5e867c..d147e937c39 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenRichTextInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenRichTextInSidePanel.ts
@@ -4,7 +4,7 @@ import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
-import { IconPencil } from 'twenty-ui/display';
+import { IconPencil } from 'twenty-ui/icon';
export const useOpenRichTextInSidePanel = () => {
const { navigateSidePanelMenu, openSidePanelMenu } = useSidePanelMenu();
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenUpdateMultipleRecordsPageInSidePanel.tsx b/packages/twenty-front/src/modules/side-panel/hooks/useOpenUpdateMultipleRecordsPageInSidePanel.tsx
index 041cc838312..b0d9f6554fb 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenUpdateMultipleRecordsPageInSidePanel.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenUpdateMultipleRecordsPageInSidePanel.tsx
@@ -3,7 +3,7 @@ import { SidePanelPages } from 'twenty-shared/types';
import { msg, t } from '@lingui/core/macro';
import { useCallback } from 'react';
-import { IconBoxMultiple } from 'twenty-ui/display';
+import { IconBoxMultiple } from 'twenty-ui/icon';
type UseOpenUpdateMultipleRecordsPageInSidePanelProps = {
contextStoreInstanceId: string;
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts
index f4c0b4a81df..7a29d406e61 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts
@@ -17,7 +17,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconColumnInsertRight, IconDotsVertical } from 'twenty-ui/display';
+import { IconColumnInsertRight, IconDotsVertical } from 'twenty-ui/icon';
export const useSidePanelMenu = () => {
const store = useStore();
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useUpdateSidePanelPageInfo.ts b/packages/twenty-front/src/modules/side-panel/hooks/useUpdateSidePanelPageInfo.ts
index 333169d857c..1834c155136 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useUpdateSidePanelPageInfo.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useUpdateSidePanelPageInfo.ts
@@ -1,7 +1,7 @@
import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState';
import { useCallback } from 'react';
-import { type IconComponent, IconDotsVertical } from 'twenty-ui/display';
+import { type IconComponent, IconDotsVertical } from 'twenty-ui/icon';
import { useStore } from 'jotai';
export const useUpdateSidePanelPageInfo = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/common/components/SidePanelSubPageNavigationHeader.tsx b/packages/twenty-front/src/modules/side-panel/pages/common/components/SidePanelSubPageNavigationHeader.tsx
index 35a675b1702..9335b63ec56 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/common/components/SidePanelSubPageNavigationHeader.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/common/components/SidePanelSubPageNavigationHeader.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-campaign/components/SidePanelCampaignComposerPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-campaign/components/SidePanelCampaignComposerPage.tsx
index 0d7e8a6469f..1b61509c580 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-campaign/components/SidePanelCampaignComposerPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-campaign/components/SidePanelCampaignComposerPage.tsx
@@ -6,7 +6,7 @@ import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFoot
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSend } from 'twenty-ui/display';
+import { IconSend } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { getOsControlSymbol } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
index 8e50029ba6b..5a9056bb3a0 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
@@ -13,7 +13,7 @@ import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotke
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSend } from 'twenty-ui/display';
+import { IconSend } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { getOsControlSymbol } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/CanvasTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/CanvasTabSettingsContent.tsx
index 5654cf0c380..0352ec868ac 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/CanvasTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/CanvasTabSettingsContent.tsx
@@ -13,14 +13,14 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
import {
- AppTooltip,
IconChevronLeft,
IconChevronRight,
IconEyeX,
IconPinned,
IconRefreshDot,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
const RESET_TAB_TO_DEFAULT_MODAL_ID = 'reset-canvas-tab-to-default-modal';
const RESET_TAB_TO_DEFAULT_MENU_ITEM_ID =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
index 4b491319f9a..97044101762 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
@@ -1,7 +1,7 @@
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
-import { SidePanelInformationBanner } from 'twenty-ui/display';
+import { SidePanelInformationBanner } from 'twenty-ui/feedback';
type ChartFiltersDeletedFieldsWarningProps = {
validFieldMetadataIds: Set<string>;
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
index 0eb796f6c9f..c2bb646b44e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartLimitInfoBanner.tsx
@@ -1,6 +1,6 @@
import { getChartLimitMessage } from '@/side-panel/pages/page-layout/utils/getChartLimitMessage';
import { t } from '@lingui/core/macro';
-import { SidePanelInformationBanner } from 'twenty-ui/display';
+import { SidePanelInformationBanner } from 'twenty-ui/feedback';
import { type WidgetConfigurationType } from '~/generated-metadata/graphql';
type ChartLimitInfoBannerProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/NewFieldDefaultVisibilityToggle.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/NewFieldDefaultVisibilityToggle.tsx
index 7141a6e7162..e9fc79927c7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/NewFieldDefaultVisibilityToggle.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/NewFieldDefaultVisibilityToggle.tsx
@@ -3,7 +3,7 @@ import { useGetNewFieldDefaultVisibility } from '@/page-layout/widgets/fields/ho
import { useUpdateNewFieldDefaultVisibility } from '@/page-layout/widgets/fields/hooks/useUpdateNewFieldDefaultVisibility';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useLingui } from '@lingui/react/macro';
-import { IconEye } from 'twenty-ui/display';
+import { IconEye } from 'twenty-ui/icon';
export const NewFieldDefaultVisibilityToggle = ({
pageLayoutId,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
index e38b258fbbe..3bfe8a0aea5 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
@@ -7,14 +7,14 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useLingui } from '@lingui/react/macro';
import {
- AppTooltip,
IconChevronLeft,
IconChevronRight,
IconCopyPlus,
IconPinned,
IconRefreshDot,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
const RESET_TAB_TO_DEFAULT_MODAL_ID = 'reset-regular-tab-to-default-modal';
const RESET_TAB_TO_DEFAULT_MENU_ITEM_ID =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
index c0516bf55c6..5ee4bf42873 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
@@ -32,7 +32,7 @@ import {
IconChartPie,
IconFrame,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type FrontComponent, WidgetType } from '~/generated-metadata/graphql';
export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
index cbca95d0eeb..5bb3e45de0e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
@@ -31,7 +31,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconApps, IconList } from 'twenty-ui/display';
+import { IconApps, IconList } from 'twenty-ui/icon';
import { v4 as uuidv4 } from 'uuid';
import {
type FrontComponent,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
index 54121376edd..6ffd514c4ac 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx
@@ -10,7 +10,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useLingui } from '@lingui/react/macro';
import { useId } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconCopyPlus, IconTrash } from 'twenty-ui/display';
+import { IconCopyPlus, IconTrash } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const WidgetSettingsFooter = ({
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
index c411b03d6ee..bd69fd4e0ff 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
@@ -21,12 +21,12 @@ import { isNonEmptyString } from '@sniptt/guards';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import {
- AppTooltip,
IconEyeX,
IconRefreshDot,
IconSwitchHorizontal,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
const RESET_WIDGET_TO_DEFAULT_MODAL_ID = 'reset-widget-to-default-modal';
const RESET_WIDGET_TO_DEFAULT_MENU_ITEM_ID =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
index 2a263076832..cdc8852c18c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
@@ -25,7 +25,7 @@ import {
IconChevronUp,
IconRowInsertBottom,
IconRowInsertTop,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
type WidgetSettingsPlacementSectionProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
index 3b66ce018c4..a034fb01d2f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx
@@ -26,7 +26,7 @@ import {
IconFilter,
IconListDetails,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { WidgetConfigurationType } from '~/generated-metadata/graphql';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
index 5c52e3c3fcc..8f1cd620d94 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx
@@ -22,7 +22,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
export const ChartAggregateOperationSelectionDropdownContent = ({
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx
index 3b97cbad0c3..10e54ac5c9f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx
@@ -4,7 +4,7 @@ import { generateGroupColor } from '@/page-layout/widgets/graph/utils/generateGr
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { ColorSample } from 'twenty-ui/display';
+import { ColorSample } from 'twenty-ui/data-display';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type ThemeColor } from 'twenty-ui/theme';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx
index edf9d4da5bd..cbb511d58d5 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx
@@ -5,7 +5,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { ColorSample } from 'twenty-ui/display';
+import { ColorSample } from 'twenty-ui/data-display';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { getMainColorNameFromPaletteColorName } from 'twenty-ui/utilities';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
index c903f81ed12..20e0369c480 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx
@@ -22,7 +22,7 @@ import { t } from '@lingui/core/macro';
import { Trans } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, IconSettings } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
index aaaed54117c..b8160bacd5e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx
@@ -16,7 +16,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx
index 73c54f75b0f..6eab2da1d27 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx
@@ -12,7 +12,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
type ChartGroupByFieldSelectionCompositeFieldViewProps = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
index f9a8d36eb74..401fa6a7600 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx
@@ -28,7 +28,7 @@ import {
isDefined,
isFieldMetadataSupportedInGroupBy,
} from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { RelationType } from '~/generated-metadata/graphql';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx
index 279e8ea7cc6..91bc77700e8 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx
@@ -14,7 +14,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { RelationType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx
index e556d2fb96a..bcc0652c264 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx
@@ -18,7 +18,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
index 179b0c62da7..fb8d9b35681 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx
@@ -15,8 +15,8 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
import { type WidgetConfiguration } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
index d3c91eb3df4..78665d79718 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx
@@ -8,7 +8,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { IconCheck, IconX } from 'twenty-ui/display';
+import { IconCheck, IconX } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { AggregateOperations } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
index 60564f1ad42..1bd54c97ea3 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx
@@ -15,7 +15,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { type ThemeColor } from 'twenty-ui/theme';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
index 60d5b29d559..4e497b63318 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx
@@ -21,7 +21,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { type FieldConfiguration } from '~/generated-metadata/graphql';
import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
index 4182822890b..5a024b17671 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
@@ -21,7 +21,7 @@ import {
IconLayoutKanban,
IconListDetails,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import {
FieldDisplayMode,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
index 15516d73a7b..5a86d1f1e5e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx
@@ -24,7 +24,7 @@ import {
IconLayoutSidebarRight,
IconList,
IconListDetails,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import {
FieldDisplayMode,
type FieldConfiguration,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
index 213044802e8..80bb221ced8 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldsSettings.tsx
@@ -17,7 +17,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown, IconLayoutSidebarRight } from 'twenty-ui/display';
+import { IconChevronDown, IconLayoutSidebarRight } from 'twenty-ui/icon';
import { type FieldsConfiguration } from '~/generated-metadata/graphql';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
index d6a1e48948b..46281d7baa0 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx
@@ -11,7 +11,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, IconEye, useIcons } from 'twenty-ui/display';
+import { IconChevronLeft, IconEye, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { v4 } from 'uuid';
import { sortByProperty } from '~/utils/array/sortByProperty';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
index 67705358036..075608ad014 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx
@@ -13,7 +13,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { type DropResult } from '@hello-pangea/dnd';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconEyeOff, useIcons } from 'twenty-ui/display';
+import { IconEyeOff, useIcons } from 'twenty-ui/icon';
import { MenuItemDraggable, MenuItemNavigate } from 'twenty-ui/navigation';
import { sortByProperty } from '~/utils/array/sortByProperty';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
index ea66abd9973..313a1568684 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsFieldVisibility.tsx
@@ -6,7 +6,7 @@ import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableLi
import { type DropResult } from '@hello-pangea/dnd';
import { styled } from '@linaria/react';
import { useMemo } from 'react';
-import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/display';
+import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
index d193c070469..c2631546802 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSorts.tsx
@@ -10,7 +10,7 @@ import { InputLabel } from '@/ui/input/components/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ViewSortDirection } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
index 76ed6493c82..77b34631575 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
@@ -4,7 +4,7 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowsSort, IconTrash } from 'twenty-ui/display';
+import { IconArrowsSort, IconTrash } from 'twenty-ui/icon';
import { Button, type SelectOption } from 'twenty-ui/input';
import { Select } from '@/ui/input/components/Select';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/AggregateSortByOptions.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/AggregateSortByOptions.ts
index ef34b3d701b..96f94704fa6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/AggregateSortByOptions.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/AggregateSortByOptions.ts
@@ -2,7 +2,7 @@ import {
IconHandMove,
IconSortAscending,
IconSortDescending,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { GraphOrderBy } from '~/generated-metadata/graphql';
export const AGGREGATE_SORT_BY_OPTIONS = [
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/GraphTypeInformation.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/GraphTypeInformation.ts
index d97b71ebfea..3ca3c6e215f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/GraphTypeInformation.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/GraphTypeInformation.ts
@@ -13,7 +13,7 @@ import {
IconChartPie,
type IconComponent,
IconSum,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { BarChartLayout } from '~/generated-metadata/graphql';
export const GRAPH_TYPE_INFORMATION: Record<
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/XSortByOptions.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/XSortByOptions.ts
index 4a897a5a01a..7b99c9bfa85 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/XSortByOptions.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/XSortByOptions.ts
@@ -5,7 +5,7 @@ import {
IconSortDescending,
IconTrendingDown,
IconTrendingUp,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { GraphOrderBy } from '~/generated-metadata/graphql';
type XSortByOption = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/AxisNameSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/AxisNameSetting.ts
index a0b6bf1d224..b7f5cf04adc 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/AxisNameSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/AxisNameSetting.ts
@@ -2,7 +2,7 @@ import { ChartAxisNameSelectionDropdownContent } from '@/side-panel/pages/page-l
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconGizmo } from 'twenty-ui/display';
+import { IconGizmo } from 'twenty-ui/icon';
export const AXIS_NAME_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CenterMetricSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CenterMetricSetting.ts
index 73bc0fbc754..cde4a9c35d7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CenterMetricSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CenterMetricSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconNumber123 } from 'twenty-ui/display';
+import { IconNumber123 } from 'twenty-ui/icon';
export const CENTER_METRIC_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ChartDataSourceSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ChartDataSourceSetting.ts
index f70d1d05fa7..ba518cc896b 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ChartDataSourceSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ChartDataSourceSetting.ts
@@ -2,7 +2,7 @@ import { ChartDataSourceDropdownContent } from '@/side-panel/pages/page-layout/c
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconDatabase } from 'twenty-ui/display';
+import { IconDatabase } from 'twenty-ui/icon';
export const CHART_DATA_SOURCE_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ColorsSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ColorsSetting.ts
index 8ed2aa33cbb..853a1666825 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ColorsSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ColorsSetting.ts
@@ -3,7 +3,7 @@ import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layo
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { IconColorSwatch } from 'twenty-ui/display';
+import { IconColorSwatch } from 'twenty-ui/icon';
export const COLORS_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CumulativeSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CumulativeSetting.ts
index 684fae2d906..fd6f6e88fdb 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CumulativeSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/CumulativeSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconChartBarPopular } from 'twenty-ui/display';
+import { IconChartBarPopular } from 'twenty-ui/icon';
export const CUMULATIVE_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayAggregateSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayAggregateSetting.ts
index fe6336e56a0..9b08bdbedee 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayAggregateSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayAggregateSetting.ts
@@ -2,7 +2,7 @@ import { ChartFieldSelectionForAggregateOperationDropdownContent } from '@/side-
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconSum } from 'twenty-ui/display';
+import { IconSum } from 'twenty-ui/icon';
export const DATA_DISPLAY_AGGREGATE_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayPieChartSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayPieChartSetting.ts
index 140d03eb265..4b9f6335759 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayPieChartSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayPieChartSetting.ts
@@ -2,7 +2,7 @@ import { ChartPieFieldSelectionDropdownContent } from '@/side-panel/pages/page-l
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconChartPie } from 'twenty-ui/display';
+import { IconChartPie } from 'twenty-ui/icon';
export const DATA_DISPLAY_PIE_CHART_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayXSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayXSetting.ts
index 0c4190f1e52..7501f8075ff 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayXSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayXSetting.ts
@@ -2,7 +2,7 @@ import { ChartXAxisFieldSelectionDropdownContent } from '@/side-panel/pages/page
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconAxisX } from 'twenty-ui/display';
+import { IconAxisX } from 'twenty-ui/icon';
export const DATA_DISPLAY_X_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayYSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayYSetting.ts
index 241c580970d..91739b55ca6 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayYSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataDisplayYSetting.ts
@@ -2,7 +2,7 @@ import { ChartFieldSelectionForAggregateOperationDropdownContent } from '@/side-
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconAxisY } from 'twenty-ui/display';
+import { IconAxisY } from 'twenty-ui/icon';
export const DATA_DISPLAY_Y_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataLabelsSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataLabelsSetting.ts
index c9f4acf9f31..072bf355b77 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataLabelsSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DataLabelsSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconBadge2k } from 'twenty-ui/display';
+import { IconBadge2k } from 'twenty-ui/icon';
export const DATA_LABELS_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularitySetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularitySetting.ts
index 6b1710f7a95..3133999178a 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularitySetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularitySetting.ts
@@ -2,7 +2,7 @@ import { ChartDateGranularitySelectionDropdownContent } from '@/side-panel/pages
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconCalendar } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
export const DATE_GRANULARITY_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityXSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityXSetting.ts
index 6e1a3b76968..30a1f2a0662 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityXSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityXSetting.ts
@@ -2,7 +2,7 @@ import { ChartDateGranularityXSelectionDropdownContent } from '@/side-panel/page
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconCalendar } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
export const DATE_GRANULARITY_X_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityYSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityYSetting.ts
index e7170b34bd0..f267910d6fb 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityYSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/DateGranularityYSetting.ts
@@ -2,7 +2,7 @@ import { ChartDateGranularityYSelectionDropdownContent } from '@/side-panel/page
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconCalendar } from 'twenty-ui/display';
+import { IconCalendar } from 'twenty-ui/icon';
export const DATE_GRANULARITY_Y_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/EachSliceRepresentsSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/EachSliceRepresentsSetting.ts
index 40955d2a130..0cdfcc71efa 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/EachSliceRepresentsSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/EachSliceRepresentsSetting.ts
@@ -2,7 +2,7 @@ import { ChartFieldSelectionForAggregateOperationDropdownContent } from '@/side-
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconChartPie } from 'twenty-ui/display';
+import { IconChartPie } from 'twenty-ui/icon';
export const EACH_SLICE_REPRESENTS_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FilterSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FilterSetting.ts
index 2d0b614920b..49d960fca35 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FilterSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FilterSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
export const FILTER_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FormatSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FormatSetting.ts
index 49e2728993e..d597e832a99 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FormatSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/FormatSetting.ts
@@ -2,7 +2,7 @@ import { ChartNumberFormatSelectionDropdownContent } from '@/side-panel/pages/pa
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { Icon123 } from 'twenty-ui/display';
+import { Icon123 } from 'twenty-ui/icon';
export const FORMAT_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/GroupBySetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/GroupBySetting.ts
index 72b99f54a83..17d728bcd81 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/GroupBySetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/GroupBySetting.ts
@@ -2,7 +2,7 @@ import { ChartGroupByFieldSelectionDropdownContent } from '@/side-panel/pages/pa
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconFilters } from 'twenty-ui/display';
+import { IconFilters } from 'twenty-ui/icon';
export const GROUP_BY_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/HideEmptyCategorySetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/HideEmptyCategorySetting.ts
index 222081037ad..2488dce52f2 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/HideEmptyCategorySetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/HideEmptyCategorySetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconEyeOff } from 'twenty-ui/display';
+import { IconEyeOff } from 'twenty-ui/icon';
export const HIDE_EMPTY_CATEGORY_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/OmitNullValuesSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/OmitNullValuesSetting.ts
index 76f838b9fbb..c9b6e097f04 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/OmitNullValuesSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/OmitNullValuesSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconEyeOff } from 'twenty-ui/display';
+import { IconEyeOff } from 'twenty-ui/icon';
export const OMIT_NULL_VALUES_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrefixSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrefixSetting.ts
index 7450a78c4b8..7c67f233a6d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrefixSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrefixSetting.ts
@@ -2,7 +2,7 @@ import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layo
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { msg } from '@lingui/core/macro';
-import { IconCaretLeft } from 'twenty-ui/display';
+import { IconCaretLeft } from 'twenty-ui/icon';
export const PREFIX_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrimarySortBySetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrimarySortBySetting.ts
index 9111dcd06d0..7170934ad59 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrimarySortBySetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/PrimarySortBySetting.ts
@@ -2,7 +2,7 @@ import { ChartSortBySelectionDropdownContent } from '@/side-panel/pages/page-lay
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconArrowsSort } from 'twenty-ui/display';
+import { IconArrowsSort } from 'twenty-ui/icon';
export const PRIMARY_SORT_BY_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMaxSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMaxSetting.ts
index 60abecc6a67..5a7180e4e86 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMaxSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMaxSetting.ts
@@ -2,7 +2,7 @@ import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layo
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { msg } from '@lingui/core/macro';
-import { IconMathMax } from 'twenty-ui/display';
+import { IconMathMax } from 'twenty-ui/icon';
export const RANGE_MAX_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMinSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMinSetting.ts
index 6e920816cdd..449641ac35e 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMinSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/RangeMinSetting.ts
@@ -2,7 +2,7 @@ import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layo
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { msg } from '@lingui/core/macro';
-import { IconMathMin } from 'twenty-ui/display';
+import { IconMathMin } from 'twenty-ui/icon';
export const RANGE_MIN_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ShowLegendSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ShowLegendSetting.ts
index 3f26ab9b046..36791654b1c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ShowLegendSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/ShowLegendSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconTextCaption } from 'twenty-ui/display';
+import { IconTextCaption } from 'twenty-ui/icon';
export const SHOW_LEGEND_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SortByGroupByFieldSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SortByGroupByFieldSetting.ts
index 394dda0b542..85972afc639 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SortByGroupByFieldSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SortByGroupByFieldSetting.ts
@@ -2,7 +2,7 @@ import { ChartSortByGroupByFieldDropdownContent } from '@/side-panel/pages/page-
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconArrowsSort } from 'twenty-ui/display';
+import { IconArrowsSort } from 'twenty-ui/icon';
export const SORT_BY_GROUP_BY_FIELD_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsXSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsXSetting.ts
index ec61c4ad03a..908116c5ad4 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsXSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsXSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconArrowsSplit2 } from 'twenty-ui/display';
+import { IconArrowsSplit2 } from 'twenty-ui/icon';
export const SPLIT_MULTI_VALUE_FIELDS_X_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsYSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsYSetting.ts
index a7e6f66ff49..18834c07bba 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsYSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsYSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconArrowsSplit2 } from 'twenty-ui/display';
+import { IconArrowsSplit2 } from 'twenty-ui/icon';
export const SPLIT_MULTI_VALUE_FIELDS_Y_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedBarsSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedBarsSetting.ts
index 50298477a9e..3a3fa526a96 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedBarsSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedBarsSetting.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconStack2 } from 'twenty-ui/display';
+import { IconStack2 } from 'twenty-ui/icon';
export const STACKED_BARS_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedLineSettings.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedLineSettings.ts
index 20c82a58852..eb37a4a7473 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedLineSettings.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/StackedLineSettings.ts
@@ -1,7 +1,7 @@
import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layout/constants/settings/ChartConfigurationSettingLabels';
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconStack2 } from 'twenty-ui/display';
+import { IconStack2 } from 'twenty-ui/icon';
export const STACKED_LINES_SETTING: ChartSettingsItem = {
isBoolean: true,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SuffixSetting.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SuffixSetting.ts
index 6f609f8a3d0..7ee5f493153 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SuffixSetting.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/settings/SuffixSetting.ts
@@ -2,7 +2,7 @@ import { CHART_CONFIGURATION_SETTING_LABELS } from '@/side-panel/pages/page-layo
import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
import { msg } from '@lingui/core/macro';
-import { IconCaretRight } from 'twenty-ui/display';
+import { IconCaretRight } from 'twenty-ui/icon';
export const SUFFIX_SETTING: ChartSettingsItem = {
isBoolean: false,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
index 1e5161228f3..41fe943c868 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel.ts
@@ -4,7 +4,7 @@ import { getPageLayoutIcon } from '@/side-panel/pages/page-layout/utils/getPageL
import { getPageLayoutPageTitle } from '@/side-panel/pages/page-layout/utils/getPageLayoutPageTitle';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
type NavigatePageLayoutSidePanelProps = {
sidePanelPage: PageLayoutSidePanelPage;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartSettingsGroup.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartSettingsGroup.ts
index 9fe1dd2ecfa..5619bf1f063 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartSettingsGroup.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartSettingsGroup.ts
@@ -1,7 +1,7 @@
import { type CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';
import { type MessageDescriptor } from '@lingui/core';
import { type ComponentType } from 'react';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type ChartSettingsGroup = {
heading: MessageDescriptor;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
index 951fa427eea..ded0b70abcc 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
@@ -18,7 +18,7 @@ import { SHOW_LEGEND_SETTING } from '@/side-panel/pages/page-layout/constants/se
import { SORT_BY_GROUP_BY_FIELD_SETTING } from '@/side-panel/pages/page-layout/constants/settings/SortByGroupByFieldSetting';
import { STACKED_BARS_SETTING } from '@/side-panel/pages/page-layout/constants/settings/StackedBarsSetting';
import { getBarChartSettings } from '@/side-panel/pages/page-layout/utils/getBarChartSettings';
-import { IconAxisX, IconAxisY } from 'twenty-ui/display';
+import { IconAxisX, IconAxisY } from 'twenty-ui/icon';
import { BarChartLayout } from '~/generated-metadata/graphql';
describe('getBarChartSettings', () => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getSortIconForFieldType.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getSortIconForFieldType.test.ts
index d812436d629..4fc7f7fdd68 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getSortIconForFieldType.test.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getSortIconForFieldType.test.ts
@@ -6,7 +6,7 @@ import {
IconSortDescending,
IconSortDescendingLetters,
IconSortDescendingNumbers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { getSortIconForFieldType } from '@/side-panel/pages/page-layout/utils/getSortIconForFieldType';
import { GraphOrderBy } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
index 9514882a716..f2df55da8df 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
@@ -5,7 +5,7 @@ import { shouldHideChartSetting } from '@/side-panel/pages/page-layout/utils/sho
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { msg } from '@lingui/core/macro';
import { FieldMetadataType } from 'twenty-shared/types';
-import { IconChartBar } from 'twenty-ui/display';
+import { IconChartBar } from 'twenty-ui/icon';
describe('shouldHideChartSetting', () => {
const mockItemWithoutDependencies: ChartSettingsItem = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType.ts
index b075e5a20a3..8f538ba7910 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/filterSortOptionsByFieldType.ts
@@ -3,7 +3,7 @@ import {
isFieldMetadataDateKind,
isFieldMetadataSelectKind,
} from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { GraphOrderBy } from '~/generated-metadata/graphql';
export type SortOption = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getBarChartSettings.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getBarChartSettings.ts
index 51a1a64bb1c..882be44440b 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getBarChartSettings.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getBarChartSettings.ts
@@ -20,7 +20,7 @@ import { SPLIT_MULTI_VALUE_FIELDS_X_SETTING } from '@/side-panel/pages/page-layo
import { SPLIT_MULTI_VALUE_FIELDS_Y_SETTING } from '@/side-panel/pages/page-layout/constants/settings/SplitMultiValueFieldsYSetting';
import { STACKED_BARS_SETTING } from '@/side-panel/pages/page-layout/constants/settings/StackedBarsSetting';
import { type ChartSettingsGroup } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';
-import { IconAxisX, IconAxisY } from 'twenty-ui/display';
+import { IconAxisX, IconAxisY } from 'twenty-ui/icon';
import { BarChartLayout } from '~/generated-metadata/graphql';
export const getBarChartSettings = (
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts
index 90fe4c93500..726115f67ed 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getPageLayoutIcon.ts
@@ -8,7 +8,7 @@ import {
IconList,
IconPlus,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const getPageLayoutIcon = (page: PageLayoutSidePanelPage) => {
switch (page) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getSortIconForFieldType.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getSortIconForFieldType.ts
index d1aec08039f..09f49b86825 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getSortIconForFieldType.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getSortIconForFieldType.ts
@@ -11,7 +11,7 @@ import {
IconSortDescending,
IconSortDescendingLetters,
IconSortDescendingNumbers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { GraphOrderBy } from '~/generated-metadata/graphql';
export const getSortIconForFieldType = ({
diff --git a/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
index a13cf2eccff..bbf90e87276 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
@@ -9,7 +9,7 @@ import { useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { CoreObjectNameSingular, AppPath } from 'twenty-shared/types';
import { getAppPath } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { useLingui } from '@lingui/react/macro';
export const SidePanelSearchRecordsPage = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
index 9f3595df837..bd2b7fa8629 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/action/components/WorkflowActionMenuItems.tsx
@@ -1,6 +1,6 @@
import { type WorkflowActionType } from '@/workflow/types/Workflow';
import { getActionIconColorOrThrow } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIconColorOrThrow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type Action = {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts b/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts
index ac19187b747..4af1ebf9d6f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts
@@ -14,7 +14,7 @@ import {
IconBolt,
type IconComponent,
IconSettingsAutomation,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { v4 } from 'uuid';
import { useStore } from 'jotai';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx
index c94fe80c2cd..c33d5b013a7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx
@@ -20,7 +20,7 @@ import { prepareIfElseStepWithNewBranch } from '@/workflow/workflow-steps/workfl
import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const SidePanelWorkflowCreateStepContent = () => {
const { getIcon } = useIcons();
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx
index 31902795f00..25e484a5b59 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx
@@ -17,7 +17,7 @@ import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';
import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const SidePanelWorkflowEditStepTypeContent = () => {
const { getIcon } = useIcons();
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/view-run/components/SidePanelWorkflowRunViewStepContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/view-run/components/SidePanelWorkflowRunViewStepContent.tsx
index d9963af2438..188b9a88704 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/view-run/components/SidePanelWorkflowRunViewStepContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/view-run/components/SidePanelWorkflowRunViewStepContent.tsx
@@ -32,7 +32,7 @@ import {
IconLogout,
IconStepInto,
IconTerminal,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
index 4b0155f9078..4b7e18bb905 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx
@@ -17,7 +17,7 @@ import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/g
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useContext } from 'react';
import { MenuItem } from 'twenty-ui/navigation';
import { ThemeContext } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts b/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
index 5d16be87f4b..beb416ba0fe 100644
--- a/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
+++ b/packages/twenty-front/src/modules/side-panel/states/sidePanelNavigationStackState.ts
@@ -1,6 +1,6 @@
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
import { type SidePanelPages } from 'twenty-shared/types';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SidePanelNavigationStackItem = {
page: SidePanelPages;
diff --git a/packages/twenty-front/src/modules/side-panel/states/sidePanelPageInfoState.ts b/packages/twenty-front/src/modules/side-panel/states/sidePanelPageInfoState.ts
index e1a6b701739..fb44209f9e7 100644
--- a/packages/twenty-front/src/modules/side-panel/states/sidePanelPageInfoState.ts
+++ b/packages/twenty-front/src/modules/side-panel/states/sidePanelPageInfoState.ts
@@ -1,5 +1,5 @@
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export const sidePanelPageInfoState = createAtomState<{
title?: string;
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx
index 7f5240dd9f2..ab21c5d97ab 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockNavigationDrawer.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconSearch, IconSettings } from 'twenty-ui/display';
+import { IconSearch, IconSettings } from 'twenty-ui/icon';
import { getOsControlSymbol, useIsMobile } from 'twenty-ui/utilities';
import { BACKGROUND_MOCK_WORKSPACE_ITEMS } from '@/sign-in-background-mock/constants/BackgroundMockNavigationItems';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
index 3f72053ac2d..6bde4e23457 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
@@ -1,12 +1,12 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { TintedIconTile } from 'twenty-ui/data-display';
import {
IconBuildingSkyscraper,
IconDotsVertical,
IconLayoutSidebarRight,
IconPlus,
- TintedIconTile,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button, LightIconButton } from 'twenty-ui/input';
import { BackgroundMockTable } from '@/sign-in-background-mock/components/BackgroundMockTable';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
index b5fcc13b10f..f3f12ea4c81 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTable.tsx
@@ -5,12 +5,8 @@ import { BackgroundMockTableRow } from '@/sign-in-background-mock/components/Bac
import { BACKGROUND_MOCK_COLUMNS } from '@/sign-in-background-mock/constants/BackgroundMockColumns';
import { BACKGROUND_MOCK_COMPANIES } from '@/sign-in-background-mock/constants/BackgroundMockCompanies';
import { BACKGROUND_MOCK_TABLE_DIMENSIONS } from '@/sign-in-background-mock/constants/BackgroundMockTableDimensions';
-import {
- IconChevronDown,
- IconPlus,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { IconChevronDown, IconPlus, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { Checkbox } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTableRow.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTableRow.tsx
index bf47fb1269b..a4f1f52e648 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTableRow.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockTableRow.tsx
@@ -4,9 +4,15 @@ import { useContext } from 'react';
import { type BackgroundMockCompany } from '@/sign-in-background-mock/constants/BackgroundMockCompanies';
import { BACKGROUND_MOCK_COLUMN_WIDTHS } from '@/sign-in-background-mock/constants/BackgroundMockColumnWidths';
import { BACKGROUND_MOCK_TABLE_DIMENSIONS } from '@/sign-in-background-mock/constants/BackgroundMockTableDimensions';
-import { Avatar, IconLink } from 'twenty-ui/display';
+import {
+ Avatar,
+ Chip,
+ ChipAccent,
+ ChipSize,
+ ChipVariant,
+} from 'twenty-ui/data-display';
+import { IconLink } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { Chip, ChipAccent, ChipSize, ChipVariant } from 'twenty-ui/components';
import { Checkbox } from 'twenty-ui/input';
import { getLogoUrlFromDomainName } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
index b8608af4103..18efdbbaa89 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockViewBar.tsx
@@ -2,11 +2,8 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { TopBar } from '@/ui/layout/top-bar/components/TopBar';
-import {
- IconBuildingSkyscraper,
- IconChevronDown,
- TintedIconTile,
-} from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconBuildingSkyscraper, IconChevronDown } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledViewPicker = styled.div`
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts
index 331361967cf..6ea7ba51c11 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockNavigationItems.ts
@@ -12,7 +12,7 @@ import {
IconTargetArrow,
IconUser,
IconUserCircle,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type ThemeColor } from 'twenty-ui/theme';
export type BackgroundMockNavigationItem = {
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts
index a62f4871693..b79c1ebb4d3 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/BackgroundMockOtherItems.ts
@@ -1,4 +1,4 @@
-import { IconFileText, IconSettings } from 'twenty-ui/display';
+import { IconFileText, IconSettings } from 'twenty-ui/icon';
import { type BackgroundMockNavigationItem } from '@/sign-in-background-mock/constants/BackgroundMockNavigationItems';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
index ea3ce68da95..11d0447c86a 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx
@@ -17,7 +17,7 @@ import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { IconForbid, IconX, useIcons } from 'twenty-ui/display';
+import { IconForbid, IconX, useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { type ReadonlyDeep } from 'type-fest';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
index d94cf6f0809..d95cb2385c6 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx
@@ -10,7 +10,8 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdow
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useState } from 'react';
-import { IconChevronLeft, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItem } from 'twenty-ui/navigation';
export const MatchColumnSelectSubFieldSelectDropdownContent = ({
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
index a50e0b20baf..033e5fa7615 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx
@@ -13,7 +13,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/SpreadSheetImportModalCloseButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/SpreadSheetImportModalCloseButton.tsx
index b48f0693c20..d7d0b3bd1f7 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/SpreadSheetImportModalCloseButton.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/SpreadSheetImportModalCloseButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
const StyledCloseButtonContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
index 24b77b6458f..10bcdab2f8d 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
@@ -4,7 +4,7 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
import { t } from '@lingui/core/macro';
import { CircularProgressBar } from 'twenty-ui/feedback';
import { MainButton } from 'twenty-ui/input';
-import { ModalFooter } from 'twenty-ui/layout';
+import { ModalFooter } from 'twenty-ui/surfaces';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
const StyledFooterContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ImportDataStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ImportDataStep.tsx
index 05cca8ce0c2..1a069d5e7d3 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ImportDataStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ImportDataStep.tsx
@@ -3,7 +3,7 @@ import { StepNavigationButton } from '@/spreadsheet-import/components/StepNaviga
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
import { spreadsheetImportCreatedRecordsProgressState } from '@/spreadsheet-import/states/spreadsheetImportCreatedRecordsProgressState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
index eccf420a6b8..68e849f5292 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
@@ -14,7 +14,7 @@ import { setIgnoreColumn } from '@/spreadsheet-import/utils/setIgnoreColumn';
import { setSubColumn } from '@/spreadsheet-import/utils/setSubColumn';
import { useDialogManager } from '@/ui/feedback/dialog-manager/hooks/useDialogManager';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { DO_NOT_IMPORT_OPTION_KEY } from '@/spreadsheet-import/constants/DoNotImportOptionKey';
import { ColumnGrid } from '@/spreadsheet-import/steps/components/MatchColumnsStep/components/ColumnGrid';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx
index bef6a835215..a0b740deb61 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx
@@ -10,8 +10,8 @@ import { getFieldOptions } from '@/spreadsheet-import/utils/getFieldOptions';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { Tag, type TagColor } from 'twenty-ui/components';
-import { IconChevronDown } from 'twenty-ui/display';
+import { Tag, type TagColor } from 'twenty-ui/data-display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
const StyledIconChevronDownContainer = styled.div`
color: ${themeCssVariables.font.color.tertiary};
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
index 82ff952671a..dd7509c8641 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx
@@ -3,7 +3,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { useMemo, useRef, useState } from 'react';
-import { type TagColor } from 'twenty-ui/components';
+import { type TagColor } from 'twenty-ui/data-display';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemSelectTag } from 'twenty-ui/navigation';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
index 30e7c3fcc89..f53a83c4535 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
@@ -10,7 +10,7 @@ import { type SpreadsheetColumns } from '@/spreadsheet-import/types/SpreadsheetC
import { spreadsheetImportBuildFieldOptions } from '@/spreadsheet-import/utils/spreadsheetImportBuildFieldOptions';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
-import { IconForbid } from 'twenty-ui/display';
+import { IconForbid } from 'twenty-ui/icon';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UnmatchColumnBanner.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UnmatchColumnBanner.tsx
index 9b5e4d9b5ed..e40ff658cec 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UnmatchColumnBanner.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UnmatchColumnBanner.tsx
@@ -1,6 +1,7 @@
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import { Banner, IconChevronDown, IconInfoCircle } from 'twenty-ui/display';
+import { Banner } from 'twenty-ui/feedback';
+import { IconChevronDown, IconInfoCircle } from 'twenty-ui/icon';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx
index 70212aa6d18..70f5d3be703 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx
@@ -6,7 +6,7 @@ import { Heading } from '@/spreadsheet-import/components/Heading';
import { StepNavigationButton } from '@/spreadsheet-import/components/StepNavigationButton';
import { type ImportedRow } from '@/spreadsheet-import/types';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useComputeColumnSuggestionsAndAutoMatch } from '@/spreadsheet-import/hooks/useComputeColumnSuggestionsAndAutoMatch';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
index 768eccbf40d..55f4f9408e9 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
@@ -9,7 +9,7 @@ import { SpreadsheetImportStepType } from '@/spreadsheet-import/steps/types/Spre
import { exceedsMaxRecords } from '@/spreadsheet-import/utils/exceedsMaxRecords';
import { mapWorkbook } from '@/spreadsheet-import/utils/mapWorkbook';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useLingui } from '@lingui/react/macro';
import { Radio } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
index d7d4e166c82..2ab946d85c2 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx
@@ -1,7 +1,7 @@
import { useCallback, useContext, useState } from 'react';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { ImportDataStep } from '@/spreadsheet-import/steps/components/ImportDataStep';
import { type SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepperContainer.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepperContainer.tsx
index 0386f0f749d..18e91c14bf9 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepperContainer.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepperContainer.tsx
@@ -8,7 +8,7 @@ import { spreadsheetImportDialogState } from '@/spreadsheet-import/states/spread
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { ModalHeader } from 'twenty-ui/layout';
+import { ModalHeader } from 'twenty-ui/surfaces';
import { SpreadsheetImportStepper } from './SpreadsheetImportStepper';
export const SpreadsheetImportStepperContainer = () => {
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx
index 18e47f28fe3..a9550b0d5b4 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/UploadStep.tsx
@@ -2,7 +2,7 @@ import { t } from '@lingui/core/macro';
import { useCallback, useState } from 'react';
import { type WorkBook } from 'xlsx-ugnis';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useComputeColumnSuggestionsAndAutoMatch } from '@/spreadsheet-import/hooks/useComputeColumnSuggestionsAndAutoMatch';
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
index 3c1728d137f..6ca041f539a 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
@@ -21,11 +21,11 @@ import {
useMemo,
useState,
} from 'react';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type RowsChangeData } from 'react-data-grid';
import { isDefined } from 'twenty-shared/utils';
-import { IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
import { Button, Toggle } from 'twenty-ui/input';
import { generateColumns } from './components/columns';
import { type ImportedStructuredRowMetadata } from './types';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
index d35475a85be..b36873472b8 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
@@ -12,7 +12,7 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import camelCase from 'lodash.camelcase';
import { isDefined } from 'twenty-shared/utils';
-import { AppTooltip, TooltipDelay } from 'twenty-ui/display';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
import { Checkbox, CheckboxVariant, Toggle } from 'twenty-ui/input';
import { type ImportedStructuredRowMetadata } from '@/spreadsheet-import/steps/components/ValidationStep/types';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportField.ts b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportField.ts
index 03e4b618931..96531c0023c 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportField.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportField.ts
@@ -2,7 +2,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte
import { type SpreadsheetImportFieldType } from '@/spreadsheet-import/types/SpreadsheetImportFieldType';
import { type SpreadsheetImportFieldValidationDefinition } from '@/spreadsheet-import/types/SpreadsheetImportFieldValidationDefinition';
import { type FieldMetadataType } from 'twenty-shared/types';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SpreadsheetImportField = {
// Icon
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportFieldOption.ts b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportFieldOption.ts
index 61f5e8430f7..bf8dcb7831d 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportFieldOption.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportFieldOption.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SpreadsheetImportFieldOption = {
Icon: IconComponent | null | undefined;
diff --git a/packages/twenty-front/src/modules/ui/display/components/LinkifiedTextBody.tsx b/packages/twenty-front/src/modules/ui/display/components/LinkifiedTextBody.tsx
index 5f6c92991e0..eed1ee79245 100644
--- a/packages/twenty-front/src/modules/ui/display/components/LinkifiedTextBody.tsx
+++ b/packages/twenty-front/src/modules/ui/display/components/LinkifiedTextBody.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import Linkify from 'linkify-react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseInOut } from 'twenty-ui/utilities';
+import { AnimatedEaseInOut } from 'twenty-ui/layout';
const StyledTextBody = styled(motion.div)`
color: ${themeCssVariables.font.color.primary};
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
index fae8bdd6c87..c66bf792576 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
@@ -11,12 +11,12 @@ import {
} from 'react';
import { isDefined } from 'twenty-shared/utils';
import {
- HorizontalSeparator,
IconAlertTriangle,
IconInfoCircle,
IconSquareRoundedCheck,
IconX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { ProgressBar, useProgressAnimation } from 'twenty-ui/feedback';
import { LightButton, LightIconButton } from 'twenty-ui/input';
import { UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
index ac59455847d..e2ade727fac 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
@@ -2,7 +2,7 @@ import { type FieldActorValue } from '@/object-record/record-field/ui/types/Fiel
import { t } from '@lingui/core/macro';
import { ConnectedAccountProvider } from 'twenty-shared/types';
-import { AvatarOrIcon, Chip, ChipVariant } from 'twenty-ui/components';
+import { AvatarOrIcon, Chip, ChipVariant } from 'twenty-ui/data-display';
import {
IconApi,
IconCalendar,
@@ -17,7 +17,7 @@ import {
IconUpload,
IconWebhook,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
type ActorDisplayProps = Partial<FieldActorValue> & {
avatarUrl?: string | null;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/ArrayDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/ArrayDisplay.tsx
index 44abaede940..faa6cac280f 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/ArrayDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/ArrayDisplay.tsx
@@ -1,7 +1,7 @@
import { type FieldArrayValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
import { t } from '@lingui/core/macro';
-import { Chip, ChipVariant } from 'twenty-ui/components';
+import { Chip, ChipVariant } from 'twenty-ui/data-display';
type ArrayDisplayProps = {
value: FieldArrayValue;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/BooleanDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/BooleanDisplay.tsx
index faa489647f7..25dd65a9142 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/BooleanDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/BooleanDisplay.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconCheck, IconX } from 'twenty-ui/display';
+import { IconCheck, IconX } from 'twenty-ui/icon';
const iconSizeSm = 14;
const StyledBooleanFieldValue = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index d374a8148b8..1c953c08851 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -1,7 +1,7 @@
import { useContext, useId, useState } from 'react';
import { createPortal } from 'react-dom';
import { styled } from '@linaria/react';
-import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/display';
+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { isDefined, formatToShortNumber } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/FileChip.tsx b/packages/twenty-front/src/modules/ui/field/display/components/FileChip.tsx
index 015a6f7533f..1a10d82f1da 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/FileChip.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/FileChip.tsx
@@ -5,7 +5,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { FileIcon } from '@/file/components/FileIcon';
import { type FieldFilesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { getFileCategoryFromExtension } from '@/object-record/record-field/ui/utils/getFileCategoryFromExtension';
-import { Chip, ChipVariant } from 'twenty-ui/components';
+import { Chip, ChipVariant } from 'twenty-ui/data-display';
const MAX_WIDTH = 120;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/GlobalFilePreviewModal.tsx b/packages/twenty-front/src/modules/ui/field/display/components/GlobalFilePreviewModal.tsx
index d1a240db134..b61cecd9fce 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/GlobalFilePreviewModal.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/GlobalFilePreviewModal.tsx
@@ -9,7 +9,7 @@ import { useLingui } from '@lingui/react/macro';
import { type JSX, lazy, Suspense, useEffect } from 'react';
import { createPortal } from 'react-dom';
import { isDefined } from 'twenty-shared/utils';
-import { IconDownload, IconX } from 'twenty-ui/display';
+import { IconDownload, IconX } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
index 9c290060a94..9cf083c74ff 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
@@ -1,7 +1,7 @@
import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { isDefined } from 'twenty-shared/utils';
import { styled } from '@linaria/react';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import { type SelectOption } from 'twenty-ui/input';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
index 90e4591c9b7..fff0a532a7d 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
@@ -1,5 +1,5 @@
-import { type IconComponent } from 'twenty-ui/display';
-import { Tag } from 'twenty-ui/components';
+import { type IconComponent } from 'twenty-ui/icon';
+import { Tag } from 'twenty-ui/data-display';
import { type ThemeColor } from 'twenty-ui/theme';
type SelectDisplayProps = {
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay.tsx
index 684b678dad6..108ca4dd104 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/TextDisplay.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { isUndefined } from '@sniptt/guards';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
type TextDisplayProps = {
text: string;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/UploadFileChip.tsx b/packages/twenty-front/src/modules/ui/field/display/components/UploadFileChip.tsx
index 0b74802779f..acf4560d1b2 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/UploadFileChip.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/UploadFileChip.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconArrowUp } from 'twenty-ui/display';
+import { IconArrowUp } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
index b9df3974a9d..4c2db1732c4 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
@@ -8,7 +8,7 @@ import { CURRENCIES } from '@/settings/data-model/constants/Currencies';
import { CurrencyPickerDropdownButton } from '@/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton';
import { type Currency } from '@/ui/input/components/internal/types/Currency';
import { IMaskInput } from 'react-imask';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { getSeparatorsForNumberFormat } from '~/utils/format/getSeparatorsForNumberFormat';
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/RatingInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/RatingInput.tsx
index 524a824069a..08523211928 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/RatingInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/RatingInput.tsx
@@ -5,7 +5,7 @@ import { useContext, useState } from 'react';
import { useClearField } from '@/object-record/record-field/ui/hooks/useClearField';
import { RATING_VALUES } from 'twenty-shared/constants';
import { type FieldRatingValue } from 'twenty-shared/types';
-import { IconTwentyStarFilled } from 'twenty-ui/display';
+import { IconTwentyStarFilled } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx b/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
index 461dc95bcc9..0b24a91e8cc 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
@@ -15,7 +15,7 @@ import {
IconRocket,
IconTag,
IconTarget,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index e2bac031827..97aacc23a3a 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -10,12 +10,8 @@ import React, {
useState,
} from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- ColorSample,
- IconApps,
- type IconComponent,
- useIcons,
-} from 'twenty-ui/display';
+import { ColorSample } from 'twenty-ui/data-display';
+import { IconApps, type IconComponent, useIcons } from 'twenty-ui/icon';
import {
IconButton,
type IconButtonSize,
diff --git a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
index de2e4556f12..6961155da55 100644
--- a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
@@ -4,7 +4,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import React, { useContext, useState } from 'react';
import { getImageAbsoluteURI, isDefined } from 'twenty-shared/utils';
-import { IconPhotoUp, IconTrash, IconUpload, IconX } from 'twenty-ui/display';
+import { IconPhotoUp, IconTrash, IconUpload, IconX } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
index 0bff9122e01..9bd276003ce 100644
--- a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
@@ -5,12 +5,9 @@ import {
import { styled } from '@linaria/react';
import React, { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconChevronDown,
- type IconComponent,
- OverflowingTextWithTooltip,
- TintedIconTile,
-} from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconChevronDown, type IconComponent } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { type ThemeColor } from 'twenty-ui/theme';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index a5a295051e3..ed07fbc4166 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -19,7 +19,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
index c8cceffb57c..c8cb8ae0397 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
@@ -2,11 +2,9 @@ import { type SelectSizeVariant } from '@/ui/input/components/Select';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconChevronDown,
- OverflowingTextWithTooltip,
- TintedIconTile,
-} from 'twenty-ui/display';
+import { TintedIconTile } from 'twenty-ui/data-display';
+import { IconChevronDown } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { type SelectOption } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
index 982bc3d8238..2cb3b4352e9 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectInput.tsx
@@ -12,7 +12,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useEffect, useMemo, useRef, useState } from 'react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { type TagColor } from 'twenty-ui/components';
+import { type TagColor } from 'twenty-ui/data-display';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemSelectTag } from 'twenty-ui/navigation';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
diff --git a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
index c0525fe7820..6c5a4324203 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
@@ -14,8 +14,8 @@ import React, {
useRef,
useState,
} from 'react';
-import { type IconComponent, IconEye, IconEyeOff } from 'twenty-ui/display';
-import { AutogrowWrapper } from 'twenty-ui/utilities';
+import { type IconComponent, IconEye, IconEyeOff } from 'twenty-ui/icon';
+import { AutogrowWrapper } from 'twenty-ui/layout';
import { useCombinedRefs } from '~/hooks/useCombinedRefs';
import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
index dcb5854ef96..502708db084 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx
@@ -8,7 +8,7 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePush
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { styled } from '@linaria/react';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type InputProps = {
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
index 346a95aa00f..c580f6986b1 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
@@ -3,7 +3,7 @@ import { useState } from 'react';
import { userEvent, within } from 'storybook/test';
import { Select, type SelectProps } from '@/ui/input/components/Select';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { ComponentDecorator } from 'twenty-ui/testing';
type RenderProps = SelectProps<string | number | boolean | null>;
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
index aba19112d6e..fabb20f1b8f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
import { SELECT_COUNTRY_DROPDOWN_ID } from '@/ui/input/components/internal/country/constants/SelectCountryDropdownId';
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
import { Select } from '@/ui/input/components/Select';
-import { IconCircleOff, type IconComponentProps } from 'twenty-ui/display';
+import { IconCircleOff, type IconComponentProps } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
export const CountrySelect = ({
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
index 323fc9ff670..c748ebf77d0 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
@@ -7,7 +7,7 @@ import { CURRENCIES } from '@/settings/data-model/constants/Currencies';
import { type Currency } from '@/ui/input/components/internal/types/Currency';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useContext } from 'react';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { CurrencyPickerDropdownSelect } from './CurrencyPickerDropdownSelect';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDropdownButtonContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
index 4198dae63ae..314f2fbc505 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePicker.tsx
@@ -24,7 +24,7 @@ import {
turnJSDateToPlainDate,
type RelativeDateFilter,
} from 'twenty-shared/utils';
-import { IconCalendarX } from 'twenty-ui/display';
+import { IconCalendarX } from 'twenty-ui/icon';
import { MenuItemLeftContent } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
index b10e7c5649b..9d4ed49f7cf 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerHeader.tsx
@@ -5,7 +5,7 @@ import { Select } from '@/ui/input/components/Select';
import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';
import { getMonthSelectOptions } from '@/ui/input/components/internal/date/utils/getMonthSelectOptions';
import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/display';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
index 9fee66f8479..00f7aeebe92 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx
@@ -20,7 +20,7 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import 'react-datepicker/dist/react-datepicker.css';
-import { IconCalendarX } from 'twenty-ui/display';
+import { IconCalendarX } from 'twenty-ui/icon';
import { MenuItemLeftContent } from 'twenty-ui/navigation';
import { useGetShiftedDateToSystemTimeZone } from '@/ui/input/components/internal/date/hooks/useGetShiftedDateToSystemTimeZone';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
index e669fcca1b1..574ed2c247e 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerHeader.tsx
@@ -23,7 +23,7 @@ import {
IconChevronLeft,
IconChevronRight,
IconClock,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
index 6d44fd5a3ef..cec691c1945 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
@@ -12,7 +12,7 @@ import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDrop
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import 'react-phone-number-input/style.css';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronDown, IconWorld } from 'twenty-ui/display';
+import { IconChevronDown, IconWorld } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type StyledDropdownButtonProps = {
diff --git a/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
index 613df695d66..6fc56fd7ee8 100644
--- a/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
+++ b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
@@ -2,7 +2,7 @@ import { renderHook } from '@testing-library/react';
import { act } from 'react';
import { useIconPicker } from '@/ui/input/hooks/useIconPicker';
-import { Icon123, IconApps } from 'twenty-ui/display';
+import { Icon123, IconApps } from 'twenty-ui/icon';
describe('useIconPicker', () => {
it('should return correct iconPickerState', async () => {
diff --git a/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts b/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
index bc8e587d233..9a1ce1e6c6a 100644
--- a/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
+++ b/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
@@ -1,5 +1,5 @@
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-import { IconApps, type IconComponent } from 'twenty-ui/display';
+import { IconApps, type IconComponent } from 'twenty-ui/icon';
type IconPickerState = {
Icon: IconComponent;
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
index 2ca567df536..f99efef78d6 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableItem.stories.tsx
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { fn } from 'storybook/test';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
-import { IconBell } from 'twenty-ui/display';
+import { IconBell } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
index 1264006fe24..3e3869f0ae0 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/components/__stories__/DraggableList.stories.tsx
@@ -2,7 +2,7 @@ import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableIt
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
-import { IconBell } from 'twenty-ui/display';
+import { IconBell } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
index 325fc76ceeb..776b6cfc4c8 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent.tsx
@@ -1,10 +1,7 @@
import { type MouseEvent, type ReactElement, useContext } from 'react';
import { styled } from '@linaria/react';
-import {
- type Avatar,
- type AvatarProps,
- type IconComponent,
-} from 'twenty-ui/display';
+import { type Avatar, type AvatarProps } from 'twenty-ui/data-display';
+import { type IconComponent } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
index 9fd728c0009..9fdb70dc0f7 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
@@ -5,7 +5,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
index 16aaf68c123..1ddba56d23e 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledDropdownMenuSubheader.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDropdownMenuSubheaderContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
index 66fe9bb39bf..c6bdf5a8e19 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
@@ -23,11 +23,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { StyledDropdownMenuSubheader } from '@/ui/layout/dropdown/components/StyledDropdownMenuSubheader';
-import {
- // TEMP_DISABLED_TEST: Commented out unused import
- // Avatar,
- IconChevronLeft,
-} from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
index d63828d557c..2b87e3174ae 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuHeader.stories.tsx
@@ -5,12 +5,8 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import {
- Avatar,
- IconChevronLeft,
- IconChevronRight,
- IconPlus,
-} from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
+import { IconChevronLeft, IconChevronRight, IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { AVATAR_URL_MOCK, ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
index dc4588d93ad..fa1586fc503 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandableList.tsx
@@ -10,9 +10,9 @@ import {
import { ExpandedListDropdown } from '@/ui/layout/expandable-list/components/ExpandedListDropdown';
import { isFirstOverflowingChildElement } from '@/ui/layout/expandable-list/utils/isFirstOverflowingChildElement';
import { isDefined } from 'twenty-shared/utils';
-import { ChipSize } from 'twenty-ui/components';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
-import { AnimatedContainer } from 'twenty-ui/utilities';
+import { ChipSize } from 'twenty-ui/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { AnimatedContainer } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
index ec6668a0f30..495656523bc 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/__stories__/ExpandableList.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, userEvent, within } from 'storybook/test';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
-import { Tag } from 'twenty-ui/components';
+import { Tag } from 'twenty-ui/data-display';
import { ComponentDecorator } from 'twenty-ui/testing';
import { MAIN_COLOR_NAMES } from 'twenty-ui/theme';
diff --git a/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx b/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
index 3820c56ffee..b4f4668eccc 100644
--- a/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
-import { IconPlayerPlay } from 'twenty-ui/display';
+import { IconPlayerPlay } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type HeroPlayButtonProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
index bc34c927a24..43814863eb5 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
@@ -8,14 +8,10 @@ import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStateful
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/display';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/typography';
import { Button, type ButtonAccent } from 'twenty-ui/input';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
- type ModalOverlay,
-} from 'twenty-ui/layout';
+import { Section, SectionAlignment, SectionFontColor } from 'twenty-ui/layout';
+import { type ModalOverlay } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export type ConfirmationModalProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx
index a439d5c6d90..0fa24aa4bb7 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx
@@ -12,7 +12,7 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useRef } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Modal } from 'twenty-ui/layout';
+import { Modal } from 'twenty-ui/surfaces';
export const ModalStatefulWrapper = ({
modalInstanceId,
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
index f8ce26a111e..b3cda5bfdfa 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
@@ -10,7 +10,7 @@ import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpe
import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { ModalContent, ModalFooter, ModalHeader } from 'twenty-ui/layout';
+import { ModalContent, ModalFooter, ModalHeader } from 'twenty-ui/surfaces';
import { ComponentDecorator } from 'twenty-ui/testing';
import { RootDecorator } from '~/testing/decorators/RootDecorator';
import { sleep } from '~/utils/sleep';
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/types/ModalStatefulWrapperProps.ts b/packages/twenty-front/src/modules/ui/layout/modal/types/ModalStatefulWrapperProps.ts
index ddbc98fc2df..1ee91c6a0e9 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/types/ModalStatefulWrapperProps.ts
+++ b/packages/twenty-front/src/modules/ui/layout/modal/types/ModalStatefulWrapperProps.ts
@@ -1,5 +1,5 @@
import type React from 'react';
-import { type ModalProps } from 'twenty-ui/layout';
+import { type ModalProps } from 'twenty-ui/surfaces';
export type ModalStatefulWrapperProps = Pick<
ModalProps,
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
index 5d2abda0fb8..20b07ac2cea 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
@@ -10,11 +10,8 @@ import { PAGE_BAR_MIN_HEIGHT } from '@/ui/layout/page/constants/PageBarMinHeight
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { AnimatePresence } from 'framer-motion';
import { isDefined } from 'twenty-shared/utils';
-import {
- type IconComponent,
- IconX,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { LightIconButton } from 'twenty-ui/input';
import {
MOBILE_VIEWPORT,
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
index 7cbf8f1fdc1..3be85ae3b8a 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
@@ -4,12 +4,9 @@ import { Trans } from '@lingui/react/macro';
import { type ChangeEvent, type ReactNode, useContext, useRef } from 'react';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- Avatar,
- type AvatarType,
- type IconComponent,
-} from 'twenty-ui/display';
+import { Avatar, type AvatarType } from 'twenty-ui/data-display';
+import { type IconComponent } from 'twenty-ui/icon';
+import { AppTooltip } from 'twenty-ui/surfaces';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 as uuidV4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/ui/layout/side-panel/types/SidePanelFooterCommandMenuItem.ts b/packages/twenty-front/src/modules/ui/layout/side-panel/types/SidePanelFooterCommandMenuItem.ts
index 31f3b4a496e..f4e0217d80d 100644
--- a/packages/twenty-front/src/modules/ui/layout/side-panel/types/SidePanelFooterCommandMenuItem.ts
+++ b/packages/twenty-front/src/modules/ui/layout/side-panel/types/SidePanelFooterCommandMenuItem.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SidePanelFooterCommandMenuItem = {
id: string;
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabAvatar.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabAvatar.tsx
index 2cc7ae4207b..adbba79d13d 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabAvatar.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabAvatar.tsx
@@ -1,7 +1,7 @@
import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const TabAvatar = ({ tab }: { tab: SingleTabProps }) => {
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListHiddenMeasurements.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListHiddenMeasurements.tsx
index f4ff6a3654d..2703bc423c7 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListHiddenMeasurements.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListHiddenMeasurements.tsx
@@ -4,7 +4,7 @@ import { TAB_LIST_GAP } from '@/ui/layout/tab-list/constants/TabListGap';
import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
import { NodeDimension } from '@/ui/utilities/dimensions/components/NodeDimension';
import { styled } from '@linaria/react';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { TabButton } from 'twenty-ui/input';
import { type TabListDimensions } from '@/ui/layout/tab-list/types/TabListDimension';
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx
index fb9cc459b78..df41923a1b8 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { TabButton } from 'twenty-ui/input';
import { TAB_LIST_HEIGHT } from '@/ui/layout/tab-list/constants/TabListHeight';
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
index a5141901bb3..727b1491f5e 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
@@ -9,7 +9,7 @@ import {
IconMail,
IconPhone,
IconUser,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import {
AVATAR_URL_MOCK,
ComponentWithRouterDecorator,
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/types/SingleTabProps.ts b/packages/twenty-front/src/modules/ui/layout/tab-list/types/SingleTabProps.ts
index 4e57937cf18..2119c12da5c 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/types/SingleTabProps.ts
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/types/SingleTabProps.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type SingleTabProps<T extends string = string> = {
title: string;
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx
index 0b6fdc31c9b..9dee91703de 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx
@@ -4,11 +4,7 @@ import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFi
import { type TableSortValue } from '@/ui/layout/table/types/TableSortValue';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
-import {
- IconArrowDown,
- IconArrowUp,
- type IconComponent,
-} from 'twenty-ui/display';
+import { IconArrowDown, IconArrowUp, type IconComponent } from 'twenty-ui/icon';
export const SortableTableHeader = ({
tableId,
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
index 1afa7c002e2..c15a8a24878 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
@@ -1,7 +1,8 @@
import { styled } from '@linaria/react';
import { type ReactNode, useContext, useState } from 'react';
import { TableBody } from './TableBody';
-import { IconChevronDown, IconChevronUp, Label } from 'twenty-ui/display';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
+import { Label } from 'twenty-ui/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type TableSectionProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/table/types/TableFieldMetadata.ts b/packages/twenty-front/src/modules/ui/layout/table/types/TableFieldMetadata.ts
index 9272f2febd7..3377cdf51ca 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/types/TableFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/ui/layout/table/types/TableFieldMetadata.ts
@@ -1,5 +1,5 @@
import { type MessageDescriptor } from '@lingui/core';
-import { type IconComponent } from 'twenty-ui/display';
+import { type IconComponent } from 'twenty-ui/icon';
export type TableFieldMetadata<ItemType> = {
fieldLabel: MessageDescriptor;
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx
index eb5de9ace57..382aca3fdd2 100644
--- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx
@@ -4,7 +4,7 @@ import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { type ReactNode, useContext } from 'react';
import { Link } from 'react-router-dom';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
export type MobileBreadcrumbProps = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
index c3607bbfa89..7a3d40cb2b9 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemWithOptionDropdown.tsx
@@ -11,7 +11,7 @@ import {
IconChevronRight,
type IconComponent,
IconDotsVertical,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton, type LightIconButtonProps } from 'twenty-ui/input';
import {
type MenuItemAccent,
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
index 4577857ae8b..61dad56f0ff 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
@@ -5,7 +5,7 @@ import {
IconList,
IconSearch,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { NavigationBar } from 'twenty-ui/navigation';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx
index e3771dda346..e629c49314f 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx
@@ -10,7 +10,7 @@ import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/consta
import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext } from 'react';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { ThemeContext } from 'twenty-ui/theme-constants';
type MultiWorkspaceDropdownClickableComponentProps = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
index 14456f59f34..ecfef131e2e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
@@ -28,8 +28,8 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isNonEmptyString } from '@sniptt/guards';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Avatar } from 'twenty-ui/data-display';
import {
- Avatar,
IconDotsVertical,
IconLogout,
IconMessage,
@@ -37,7 +37,7 @@ import {
IconSettings,
IconSwitchHorizontal,
IconUserPlus,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import {
MenuItem,
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
index 74a9d703100..4ced5eb7665 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx
@@ -6,7 +6,7 @@ import { multiWorkspaceDropdownState } from '@/ui/navigation/navigation-drawer/s
import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
-import { IconCheck, IconChevronLeft } from 'twenty-ui/display';
+import { IconCheck, IconChevronLeft } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const MultiWorkspaceDropdownThemesComponents = () => {
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
index 6b208dd0b93..ca11e52cacc 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx
@@ -8,7 +8,7 @@ import { useLingui } from '@lingui/react/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useState } from 'react';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
import { WorkspacesForSignIn } from './components/WorkspacesForSignIn';
import { WorkspacesForSignUp } from './components/WorkspacesForSignUp';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsx
index 90af162ed8f..91f2251e586 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { IconChevronDown } from 'twenty-ui/display';
+import { IconChevronDown } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export const StyledContainer = styled.div<{
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
index 679262e5c74..a25cb7d7f56 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx
@@ -1,4 +1,4 @@
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { MenuItemSelectAvatar, UndecoratedLink } from 'twenty-ui/navigation';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { type AvailableWorkspace } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
index 6eec631eec1..99adc9925b2 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
@@ -9,7 +9,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWorkspaceActivationStatusEqualsTo';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
import { useContext } from 'react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
index 94f2cb08d8b..287ad9b219c 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import {
IconLayoutSidebarLeftCollapse,
IconLayoutSidebarRightCollapse,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
index d194ca6942b..8e9d8d98597 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
index da37fbb6037..1989d0e2075 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
@@ -7,7 +7,7 @@ import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useLis
import { type JSX, type FocusEvent, useRef } from 'react';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { type IconComponent, type TablerIconsProps } from 'twenty-ui/display';
+import { type IconComponent, type TablerIconsProps } from 'twenty-ui/icon';
type NavigationDrawerInputProps = {
className?: string;
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
index d1513e0c268..705edf30047 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
@@ -13,17 +13,15 @@ import { isNonEmptyString } from '@sniptt/guards';
import { type JSX, type ReactNode, useContext } from 'react';
import { Link } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
-import { Pill } from 'twenty-ui/components';
+import { Pill, TintedIconTile } from 'twenty-ui/data-display';
+import { type IconComponent, type TablerIconsProps } from 'twenty-ui/icon';
import {
AppTooltip,
- type IconComponent,
- Label,
OverflowingTextWithTooltip,
- type TablerIconsProps,
- TintedIconTile,
TooltipDelay,
TooltipPosition,
-} from 'twenty-ui/display';
+} from 'twenty-ui/surfaces';
+import { Label } from 'twenty-ui/typography';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx
index 099ff31f938..2caac0574c0 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx
@@ -6,7 +6,8 @@ import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import React, { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronRight, Label } from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { Label } from 'twenty-ui/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTitle = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
index 4745e1718bc..c0432be621b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
@@ -33,8 +33,8 @@ import {
IconUser,
IconUserCircle,
IconUsers,
-} from 'twenty-ui/display';
-import { AdvancedSettingsToggle } from 'twenty-ui/navigation';
+} from 'twenty-ui/icon';
+import { AdvancedSettingsToggle } from 'twenty-ui/input';
import { getOsControlSymbol } from 'twenty-ui/utilities';
import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
index 9a2041f958c..caa3192e587 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
-import { IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';
import { getOsControlSymbol } from 'twenty-ui/utilities';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
diff --git a/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
index e73dcd3fde1..a977ff0c3b1 100644
--- a/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/components/Step.tsx
@@ -3,7 +3,7 @@ import { motion } from 'framer-motion';
import { useContext } from 'react';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { AnimatedCheckmark } from 'twenty-ui/display';
+import { AnimatedCheckmark } from 'twenty-ui/data-display';
import {
MOBILE_VIEWPORT,
ThemeContext,
diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts b/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
index 6151b588657..be4474a866c 100644
--- a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
+++ b/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts
@@ -10,7 +10,7 @@ import {
IconMoon,
IconSun,
IconSunMoon,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const useColorScheme = () => {
const [currentWorkspaceMember, setCurrentWorkspaceMember] = useAtomState(
diff --git a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx
index df30dc5f7eb..dd26d7e5569 100644
--- a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx
@@ -17,7 +17,7 @@ import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdow
import { plural } from '@lingui/core/macro';
import { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
export const AdvancedFilterChip = () => {
const { closeDropdown } = useCloseDropdown();
diff --git a/packages/twenty-front/src/modules/views/components/AnyFieldSearchChip.tsx b/packages/twenty-front/src/modules/views/components/AnyFieldSearchChip.tsx
index 2b021131a0f..35602db3027 100644
--- a/packages/twenty-front/src/modules/views/components/AnyFieldSearchChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/AnyFieldSearchChip.tsx
@@ -4,7 +4,7 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';
import { useLingui } from '@lingui/react/macro';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
export const AnyFieldSearchChip = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContentMenuHeader.tsx b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContentMenuHeader.tsx
index 7ba7d7b2a68..29a9304fbe7 100644
--- a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContentMenuHeader.tsx
+++ b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownContentMenuHeader.tsx
@@ -2,7 +2,7 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useLingui } from '@lingui/react/macro';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
export const AnyFieldSearchDropdownContentMenuHeader = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/views/components/SoftDeleteFilterChip.tsx b/packages/twenty-front/src/modules/views/components/SoftDeleteFilterChip.tsx
index d0e2cbba3c6..dac735f0fd8 100644
--- a/packages/twenty-front/src/modules/views/components/SoftDeleteFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/SoftDeleteFilterChip.tsx
@@ -3,7 +3,7 @@ import { type RecordFilter } from '@/object-record/record-filter/types/RecordFil
import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
type SoftDeleteFilterChipProps = {
recordFilter: RecordFilter;
diff --git a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
index b6dee36181b..a2d44e76970 100644
--- a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useContext, type ReactNode } from 'react';
-import { type IconComponent, IconX } from 'twenty-ui/display';
+import { type IconComponent, IconX } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
index b47f54614b6..2fd7512b182 100644
--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
@@ -21,7 +21,7 @@ import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPicke
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
import { t } from '@lingui/core/macro';
-import { IconChevronDown, IconPlus } from 'twenty-ui/display';
+import { IconChevronDown, IconPlus } from 'twenty-ui/icon';
import { Button, ButtonGroup, IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
index 2ca5849f4f7..67b69e36557 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
@@ -3,7 +3,7 @@ import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdow
import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
import { t } from '@lingui/core/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { LightButton } from 'twenty-ui/input';
export const ViewBarDetailsAddFilterButton = () => {
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
index 80196d25cc3..2b01b86623d 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx
@@ -23,8 +23,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Pill } from 'twenty-ui/components';
-import { IconFilter } from 'twenty-ui/display';
+import { Pill } from 'twenty-ui/data-display';
+import { IconFilter } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx
index 99694df6af7..dda1ef15c12 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx
@@ -4,7 +4,7 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hoo
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconSearch } from 'twenty-ui/display';
+import { IconSearch } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader.tsx
index d3301bc755e..746f9a7a68c 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader.tsx
@@ -2,7 +2,7 @@ import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/h
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { useLingui } from '@lingui/react/macro';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
export const ViewBarFilterDropdownAnyFieldSearchInputDropdownHeader = () => {
const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
index 3b618ac02f7..54352738a44 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
@@ -23,7 +23,7 @@ import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { VIEW_BAR_FILTER_BOTTOM_MENU_ITEM_IDS } from '@/views/constants/ViewBarFilterBottomMenuItemIds';
import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';
import { useLingui } from '@lingui/react/macro';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export const StyledInput = styled.input`
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx
index 537fbd2b4d6..bfc8bdf3081 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx
@@ -5,7 +5,7 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectab
import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown } from '@/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export type ViewBarFilterDropdownFieldSelectMenuItemProps = {
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInputMenuHeader.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInputMenuHeader.tsx
index 729171334cc..f3942d2c653 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInputMenuHeader.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInputMenuHeader.tsx
@@ -3,7 +3,7 @@ import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-recor
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
export const ViewBarFilterDropdownFilterInputMenuHeader = () => {
const fieldMetadataItemUsedInDropdown = useAtomComponentSelectorValue(
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
index 5cba36c633b..95c22ce7f51 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsHiddenDropdownSection.tsx
@@ -7,7 +7,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { ViewType } from '@/views/types/ViewType';
import { useContext } from 'react';
-import { IconEye, useIcons } from 'twenty-ui/display';
+import { IconEye, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
export const ViewFieldsHiddenDropdownSection = () => {
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
index 3a161cb0bce..7409b2221bb 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsSearchDropdownSection.tsx
@@ -9,7 +9,7 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { ViewType } from '@/views/types/ViewType';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/display';
+import { IconEye, IconEyeOff, useIcons } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type ViewFieldsSearchDropdownSectionProps = {
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
index cc2dd88a64a..793b5d63b23 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx
@@ -16,7 +16,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { ViewType } from '@/views/types/ViewType';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconEyeOff, useIcons } from 'twenty-ui/display';
+import { IconEyeOff, useIcons } from 'twenty-ui/icon';
import { MenuItemDraggable } from 'twenty-ui/navigation';
import { sortByProperty } from '~/utils/array/sortByProperty';
diff --git a/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChip.tsx b/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChip.tsx
index caa0ba56ac2..5a93e54b1b5 100644
--- a/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChip.tsx
@@ -7,7 +7,7 @@ import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
import { useGetRecordFilterChipLabelValue } from '@/views/hooks/useGetRecordFilterChipLabelValue';
import { isNonEmptyString } from '@sniptt/guards';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { FieldMetadataType } from '~/generated-metadata/graphql';
type EditableFilterChipProps = {
diff --git a/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChipDropdownMenuHeader.tsx b/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChipDropdownMenuHeader.tsx
index b644cbb47f9..cf0849c04e3 100644
--- a/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChipDropdownMenuHeader.tsx
+++ b/packages/twenty-front/src/modules/views/editable-chip/components/EditableFilterChipDropdownMenuHeader.tsx
@@ -3,7 +3,7 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
export const EditableFilterChipDropdownMenuHeader = () => {
const fieldMetadataItemUsedInDropdown = useAtomComponentSelectorValue(
diff --git a/packages/twenty-front/src/modules/views/editable-chip/components/EditableRelationFilterChip.tsx b/packages/twenty-front/src/modules/views/editable-chip/components/EditableRelationFilterChip.tsx
index f62dff4504d..b066ce8b9b4 100644
--- a/packages/twenty-front/src/modules/views/editable-chip/components/EditableRelationFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/editable-chip/components/EditableRelationFilterChip.tsx
@@ -2,7 +2,7 @@ import { useFieldMetadataItemByIdOrThrow } from '@/object-metadata/hooks/useFiel
import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
import { useComputeRecordRelationFilterLabelValue } from '@/views/hooks/useComputeRecordRelationFilterLabelValue';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
type EditableRelationFilterChipProps = {
recordFilter: RecordFilter;
diff --git a/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx b/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
index d1adf9f5c44..9d9709c6d04 100644
--- a/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
+++ b/packages/twenty-front/src/modules/views/editable-chip/components/EditableSortChip.tsx
@@ -11,7 +11,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconArrowDown, IconArrowUp } from 'twenty-ui/display';
+import { IconArrowDown, IconArrowUp } from 'twenty-ui/icon';
import { MenuItemSelect } from 'twenty-ui/navigation';
import { ViewSortDirection } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/views/types/ViewType.ts b/packages/twenty-front/src/modules/views/types/ViewType.ts
index 0ac0b6a49a1..9c8663e1c0f 100644
--- a/packages/twenty-front/src/modules/views/types/ViewType.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewType.ts
@@ -3,7 +3,7 @@ import {
type IconComponent,
IconLayoutKanban,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export { ViewType } from '~/generated-metadata/graphql';
import { ViewType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
index 22683f3fd9c..d78bb79bac9 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
@@ -38,7 +38,7 @@ import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states
import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';
import { Trans, useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
-import { IconX } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFieldAvailableContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
index 62c47d72b75..d807796a4ba 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx
@@ -22,7 +22,7 @@ import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/view
import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';
import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';
import { t } from '@lingui/core/macro';
-import { IconChevronLeft } from 'twenty-ui/display';
+import { IconChevronLeft } from 'twenty-ui/icon';
export const ViewPickerContentEditMode = () => {
const { setViewPickerMode } = useViewPickerMode();
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
index b12d2cc8162..26de461c067 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
@@ -14,12 +14,8 @@ import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPicke
import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconChevronDown,
- IconList,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { IconChevronDown, IconList, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { useContext } from 'react';
import {
MOBILE_VIEWPORT,
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index 41ee2a4fc4e..efd3df25a30 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -22,7 +22,7 @@ import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPicke
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
import { useLingui } from '@lingui/react/macro';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ViewVisibility } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index 7926c392cbe..a1392967e76 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -19,7 +19,7 @@ import {
IconPencil,
IconTrash,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import {
PermissionFlagType,
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect.tsx
index f8c41a42299..2fff59971b2 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect.tsx
@@ -5,7 +5,7 @@ import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/type
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { shouldDisplayFormField } from '@/workflow/workflow-steps/workflow-actions/utils/shouldDisplayFormField';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { RelationType } from '~/generated-metadata/graphql';
export const WorkflowFieldsMultiSelect = ({
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
index aaa7ac9e288..5b46d704346 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx
@@ -5,9 +5,9 @@ import {
IconLoader,
IconSquareRoundedCheck,
IconSquareRoundedX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { CodeEditor, CoreEditorHeader } from 'twenty-ui/input';
-import { AnimatedCircleLoading } from 'twenty-ui/utilities';
+import { AnimatedCircleLoading } from 'twenty-ui/layout';
import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
import { useContext } from 'react';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
index ea263df24e9..171c5ca7854 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
@@ -15,7 +15,7 @@ import { generateWorkflowRunDiagram } from '@/workflow/workflow-diagram/utils/ge
import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIconKey';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { useStore } from 'jotai';
export const useRunWorkflowRunOpeningInSidePanelEffects = () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
index 6f65b599f20..5f32ba7eb69 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
@@ -62,7 +62,7 @@ import React, {
useState,
} from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { Tag, type TagColor } from 'twenty-ui/components';
+import { Tag, type TagColor } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledResetReactflowStyles = styled.div`
--xy-node-background-color: none;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepElement.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepElement.tsx
index ba2b0be7b50..c158bbbde71 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepElement.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepElement.tsx
@@ -5,7 +5,7 @@ import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/ty
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramRightClickCommandMenu.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramRightClickCommandMenu.tsx
index d5ad814177e..61370247263 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramRightClickCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramRightClickCommandMenu.tsx
@@ -8,7 +8,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useRef } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus, IconReorder } from 'twenty-ui/display';
+import { IconPlus, IconReorder } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { WorkflowDiagramRightClickCommandMenuClickOutsideEffect } from './WorkflowDiagramRightClickCommandMenuClickOutsideEffect';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
index 789eeb3723a..2fa2bf0ade0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
@@ -21,7 +21,7 @@ import { useStore } from 'jotai';
import { useCallback, useContext, useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const WorkflowRunVisualizerEffect = ({
workflowRunId,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowRunStatusTagProps.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowRunStatusTagProps.ts
index fff3983b92e..db4db5adc55 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowRunStatusTagProps.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowRunStatusTagProps.ts
@@ -1,5 +1,5 @@
import { type WorkflowRunStatus } from '@/workflow/types/Workflow';
-import { type TagColor } from 'twenty-ui/components';
+import { type TagColor } from 'twenty-ui/data-display';
export const getWorkflowRunStatusTagProps = ({
workflowRunStatus,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionStatusTagProps.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionStatusTagProps.ts
index 692e2756c4f..fa18b8c2a8c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionStatusTagProps.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowVersionStatusTagProps.ts
@@ -1,5 +1,5 @@
import { type WorkflowVersionStatus } from '@/workflow/types/Workflow';
-import { type TagColor } from 'twenty-ui/components';
+import { type TagColor } from 'twenty-ui/data-display';
export const getWorkflowVersionStatusTagProps = ({
workflowVersionStatus,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramDefaultEdgeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramDefaultEdgeEditable.tsx
index 58990a59524..08e2a2d4101 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramDefaultEdgeEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramDefaultEdgeEditable.tsx
@@ -15,7 +15,7 @@ import { useLingui } from '@lingui/react/macro';
import { EdgeLabelRenderer } from '@xyflow/react';
import { type MouseEvent } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconPlus, IconTrash } from 'twenty-ui/display';
+import { IconPlus, IconTrash } from 'twenty-ui/icon';
type WorkflowDiagramDefaultEdgeEditableProps =
WorkflowDiagramEdgeComponentProps;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
index 051e951a46e..6da0513f262 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-edges/components/WorkflowDiagramEdgeLabel.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerReadonly.tsx
index 0aa9781810f..304a3ef244f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerReadonly.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerReadonly.tsx
@@ -18,7 +18,7 @@ import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const WorkflowDiagramEmptyTriggerReadonly = ({ id }: { id: string }) => {
const { getIcon } = useIcons();
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
index f6f7443eb73..51a3197223b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
@@ -12,7 +12,7 @@ import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWor
import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const WorkflowDiagramStepNodeEditable = ({
id,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon.tsx
index 5efcdacf455..a6e86b24e01 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon.tsx
@@ -2,7 +2,7 @@ import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/ty
import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIconKey';
import { WorkflowDiagramStepNodeLogicFunctionIcon } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeLogicFunctionIcon';
import { assertUnreachable } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeLogicFunctionIcon.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeLogicFunctionIcon.tsx
index 211c62e4e7f..dcd70308f7e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeLogicFunctionIcon.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeLogicFunctionIcon.tsx
@@ -4,7 +4,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const WorkflowDiagramStepNodeLogicFunctionIcon = ({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx
index 8b35ba46b0d..78c15f1b90f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx
@@ -25,7 +25,7 @@ import { isNodeTitleHighlighted } from '@/workflow/workflow-diagram/workflow-nod
import { Position } from '@xyflow/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
export const WorkflowDiagramStepNodeReadonly = ({
id,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
index c01fa755aff..e699963443d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel.tsx
@@ -1,7 +1,7 @@
import type { WorkflowRunStepStatus } from '@/workflow/types/Workflow';
import { getWorkflowDiagramColors } from '@/workflow/workflow-diagram/utils/getWorkflowDiagramColors';
import { styled } from '@linaria/react';
-import { Label } from 'twenty-ui/display';
+import { Label } from 'twenty-ui/typography';
type WorkflowNodeLabelProps = {
runStatus?: WorkflowRunStepStatus;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx
index c1c29752dd7..8a28fa936ef 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx
@@ -29,7 +29,7 @@ import { Position } from '@xyflow/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { StepStatus } from 'twenty-shared/workflow';
-import { IconCheck, IconX, useIcons } from 'twenty-ui/display';
+import { IconCheck, IconX, useIcons } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsAiAgentDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsAiAgentDetail.tsx
index 69dea6b0176..eadeb25322e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsAiAgentDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsAiAgentDetail.tsx
@@ -10,7 +10,7 @@ import {
IconCpu,
IconTool,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { formatDuration } from '@/workflow/workflow-run/observability/workflowRunStepLogsFormatters';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsCodeDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsCodeDetail.tsx
index 01795472391..c0c99f86cd8 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsCodeDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsCodeDetail.tsx
@@ -7,7 +7,7 @@ import {
IconCheck,
IconClock,
IconTerminal,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsDetail.tsx
index d3f820e8e23..c88eea20032 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsDetail.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
import { workflowRunStepLogSchema } from 'twenty-shared/workflow';
-import { IconInfoCircle } from 'twenty-ui/display';
+import { IconInfoCircle } from 'twenty-ui/icon';
import { isTwoFirstDepths, JsonTree } from 'twenty-ui/json-visualizer';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type JsonValue } from 'type-fest';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsEmailDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsEmailDetail.tsx
index 32e5f3f1c9d..4932cd940b1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsEmailDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsEmailDetail.tsx
@@ -8,7 +8,7 @@ import {
IconClock,
IconMail,
IconPaperclip,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsHttpRequestDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsHttpRequestDetail.tsx
index 8baaf1a0905..67be6e963ee 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsHttpRequestDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsHttpRequestDetail.tsx
@@ -9,7 +9,7 @@ import {
IconArrowUp,
IconClock,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsToolCallRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsToolCallRow.tsx
index 36b9d72231c..2a9183e408c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsToolCallRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-run/observability/WorkflowRunStepLogsToolCallRow.tsx
@@ -11,7 +11,7 @@ import {
IconChevronDown,
IconChevronUp,
IconCircleX,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { JsonTree } from 'twenty-ui/json-visualizer';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
index dc932cdea9d..8bb3aaa7c1e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx
@@ -31,11 +31,8 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { extractRawVariableNamePart } from 'twenty-shared/workflow';
-import {
- IconChevronLeft,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItemSelect } from 'twenty-ui/navigation';
type WorkflowDropdownStepOutputItemsProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
index a687b872982..d2d3acefae6 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepInputDetail.tsx
@@ -9,7 +9,7 @@ import { getWorkflowRunStepContext } from '@/workflow/workflow-steps/utils/getWo
import { getWorkflowVariablesUsedInStep } from '@/workflow/workflow-steps/utils/getWorkflowVariablesUsedInStep';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconBrackets } from 'twenty-ui/display';
+import { IconBrackets } from 'twenty-ui/icon';
import {
type GetJsonNodeHighlighting,
JsonNestedNode,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
index 41a3c414c7d..00b2f13e9a7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
@@ -21,7 +21,7 @@ import {
IconRobot,
IconTrash,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
index 6584a9b745c..170a6490f3a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddFilterRuleSelect.tsx
@@ -14,7 +14,7 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { t } from '@lingui/core/macro';
-import { IconLibraryPlus, IconPlus } from 'twenty-ui/display';
+import { IconLibraryPlus, IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { v4 } from 'uuid';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
index 9d348ba306c..795c1ed9632 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
@@ -3,7 +3,7 @@ import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/sta
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
-import { IconFilter } from 'twenty-ui/display';
+import { IconFilter } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
index 3d14eeb09c3..d98c04ba77f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx
@@ -15,7 +15,7 @@ import { useContext, useState } from 'react';
import { type StepFilter } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { extractRawVariableNamePart } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { FieldMetadataType } from '~/generated-metadata/graphql';
type WorkflowStepFilterFieldSelectProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
index 6daf32b5b57..ffc289589e2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx
@@ -6,7 +6,7 @@ import { useRemoveStepFilterGroup } from '@/workflow/workflow-steps/filters/hook
import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { useContext } from 'react';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
index 8695ab13cdf..8ffc3e5014f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx
@@ -6,7 +6,7 @@ import { useRemoveStepFilter } from '@/workflow/workflow-steps/filters/hooks/use
import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';
import { useContext } from 'react';
import { t } from '@lingui/core/macro';
-import { IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
index 015f2be6746..662c5308ba2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsFlagRow.tsx
@@ -1,5 +1,5 @@
import { type SettingsRolePermissionsSettingPermission } from '@/settings/roles/role-permissions/permission-flags/types/SettingsRolePermissionsSettingPermission';
-import { IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type WorkflowAiAgentPermissionsFlagRowProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
index 9102da9c95d..b058df54e77 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsPermissionRow.tsx
@@ -1,6 +1,6 @@
import { PermissionIcon } from '@/settings/roles/role-permissions/objects-permissions/components/PermissionIcon';
import { type SettingsRoleObjectPermissionKey } from '@/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig';
-import { IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type WorkflowAiAgentPermissionsPermissionRowProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
index 1e04fe1e41e..aa9bf6b358b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
@@ -19,7 +19,7 @@ import { useLingui } from '@lingui/react/macro';
import { useEffect, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconLock, IconSparkles } from 'twenty-ui/display';
+import { IconLock, IconSparkles } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
index 1c25f909769..b1655e028f7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowOutputSchemaBuilder.tsx
@@ -7,12 +7,7 @@ import { InputLabel } from '@/ui/input/components/InputLabel';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
-import {
- IconChevronDown,
- IconPlus,
- IconVariable,
- IconX,
-} from 'twenty-ui/display';
+import { IconChevronDown, IconPlus, IconVariable, IconX } from 'twenty-ui/icon';
import { AnimatedLightIconButton, LightIconButton } from 'twenty-ui/input';
import { AnimatedExpandableContainer } from 'twenty-ui/layout';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
index 60d8c5a1315..9aedaa1c24e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowCodeEditor.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type Monaco } from '@monaco-editor/react';
import { type editor } from 'monaco-editor';
-import { IconMaximize } from 'twenty-ui/display';
+import { IconMaximize } from 'twenty-ui/icon';
import { CodeEditor, LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
index a21e20082c9..ab4dbb60a9b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx
@@ -45,7 +45,7 @@ import {
} from 'twenty-shared/logic-function';
import { isDefined } from 'twenty-shared/utils';
import { getFunctionInputFromInputSchema } from 'twenty-shared/workflow';
-import { IconCode, IconPlayerPlay } from 'twenty-ui/display';
+import { IconCode, IconPlayerPlay } from 'twenty-ui/icon';
import { CodeEditor } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx
index bf32c437293..63f9e1dbc1a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx
@@ -16,7 +16,7 @@ import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { canObjectBeManagedByAutomation } from 'twenty-shared/workflow';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type SelectOption } from 'twenty-ui/input';
import { type JsonValue } from 'type-fest';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx
index cbccce90fa1..39baa1205dd 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx
@@ -12,7 +12,7 @@ import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/Workflo
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { isDefined } from 'twenty-shared/utils';
import { canObjectBeManagedByAutomation } from 'twenty-shared/workflow';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type SelectOption } from 'twenty-ui/input';
import { type JsonValue } from 'type-fest';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index 200641a1b27..6f1796318bf 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -29,7 +29,8 @@ import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Callout, IconPlus } from 'twenty-ui/display';
+import { Callout } from 'twenty-ui/feedback';
+import { IconPlus } from 'twenty-ui/icon';
import { Button, type SelectOption } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx
index 46e3519eb79..e3e3a125c64 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx
@@ -17,7 +17,7 @@ import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { canObjectBeManagedByAutomation } from 'twenty-shared/workflow';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type SelectOption } from 'twenty-ui/input';
import { type JsonValue } from 'type-fest';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx
index f98239a659a..56289706abe 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx
@@ -18,7 +18,7 @@ import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { canObjectBeManagedByAutomation } from 'twenty-shared/workflow';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type SelectOption } from 'twenty-ui/input';
import { type JsonValue } from 'type-fest';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/delay-actions/components/WorkflowEditActionDelay.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/delay-actions/components/WorkflowEditActionDelay.tsx
index 58dbf251036..867204e9fdc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/delay-actions/components/WorkflowEditActionDelay.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/delay-actions/components/WorkflowEditActionDelay.tsx
@@ -8,11 +8,8 @@ import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/Workflo
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { t } from '@lingui/core/macro';
import { useEffect, useState } from 'react';
-import {
- HorizontalSeparator,
- IconCalendar,
- IconHourglassHigh,
-} from 'twenty-ui/display';
+import { IconCalendar, IconHourglassHigh } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type SelectOption } from 'twenty-ui/input';
type WorkflowEditActionDelayProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
index 147154b6f7a..e8509a23179 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx
@@ -6,7 +6,7 @@ import { isNumber } from '@sniptt/guards';
import { useEffect, useState } from 'react';
import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { HorizontalSeparator } from 'twenty-ui/display';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { type JsonValue } from 'type-fest';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
index 9fc91efac64..e895befbc73 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
@@ -4,7 +4,7 @@ import { type RecordSort } from '@/object-record/record-sort/types/RecordSort';
import { Select } from '@/ui/input/components/Select';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { IconArrowsSort, IconTrash, useIcons } from 'twenty-ui/display';
+import { IconArrowsSort, IconTrash, useIcons } from 'twenty-ui/icon';
import { Button, type SelectOption } from 'twenty-ui/input';
import { v4 as uuidv4 } from 'uuid';
import { ViewSortDirection } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
index ce6c21bd478..c83d5d61ed5 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx
@@ -10,7 +10,7 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Gene
import { Trans } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { IconChevronLeft, IconSettings } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
type WorkflowObjectDropdownContentProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
index c5cb34ee679..1178a2758a6 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx
@@ -21,14 +21,14 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useEffect, useState } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Callout } from 'twenty-ui/feedback';
import {
- Callout,
IconAlertTriangle,
IconChevronDown,
IconGripVertical,
IconPlus,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
index eaf4d827b2e..1bb0e6b68ba 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings.tsx
@@ -8,7 +8,7 @@ import { type WorkflowFormFieldType } from '@/workflow/workflow-steps/workflow-a
import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { IconSettingsAutomation, IconX } from 'twenty-ui/display';
+import { IconSettingsAutomation, IconX } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/constants/FormSelectFieldTypeOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/constants/FormSelectFieldTypeOptions.ts
index 7330c1f68b1..bf31f0d18ef 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/constants/FormSelectFieldTypeOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/constants/FormSelectFieldTypeOptions.ts
@@ -8,7 +8,7 @@ import {
IllustrationIconTag,
IllustrationIconTags,
IllustrationIconText,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
export const FORM_SELECT_FIELD_TYPE_OPTIONS: SelectOption<WorkflowFormFieldType>[] =
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
index d2dcf78a66a..b2e15807719 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/BodyInput.tsx
@@ -21,7 +21,7 @@ import {
CONTENT_TYPE_VALUES_HTTP_REQUEST,
type BodyType,
} from 'twenty-shared/workflow';
-import { IconFileText, IconKey } from 'twenty-ui/display';
+import { IconFileText, IconKey } from 'twenty-ui/icon';
import { type JsonValue } from 'type-fest';
import { KeyValuePairInput } from './KeyValuePairInput';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
index b7f8ac01968..efa8c36d4fc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
@@ -7,7 +7,7 @@ import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components
import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
import { useState } from 'react';
-import { IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { v4 } from 'uuid';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
index 3ad34143db6..06706ec7414 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
@@ -16,7 +16,7 @@ import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useEffect } from 'react';
-import { IconPlayerPlay, IconSettings } from 'twenty-ui/display';
+import { IconPlayerPlay, IconSettings } from 'twenty-ui/icon';
import {
HTTP_METHODS,
JSON_RESPONSE_PLACEHOLDER,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
index 6402a0a8259..d5423b61015 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
@@ -27,7 +27,8 @@ import { t } from '@lingui/core/macro';
import { Fragment } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type StepIfElseBranch } from 'twenty-shared/workflow';
-import { HorizontalSeparator, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { HorizontalSeparator } from 'twenty-ui/layout';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/iterator-action/components/WorkflowIteratorSubStepSwitcher.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/iterator-action/components/WorkflowIteratorSubStepSwitcher.tsx
index e3fd7efebd0..de1ad575684 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/iterator-action/components/WorkflowIteratorSubStepSwitcher.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/iterator-action/components/WorkflowIteratorSubStepSwitcher.tsx
@@ -9,7 +9,7 @@ import { getWorkflowRunAllStepInfoHistory } from '@/workflow/workflow-steps/util
import { styled } from '@linaria/react';
import { plural } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronLeft, IconChevronRight } from 'twenty-ui/display';
+import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { IconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
index e10235f9137..d20587d0011 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx
@@ -25,11 +25,8 @@ import { useMemo } from 'react';
import { getOutputSchemaFromValue } from 'twenty-shared/logic-function';
import { isDefined } from 'twenty-shared/utils';
import { getFunctionInputFromInputSchema } from 'twenty-shared/workflow';
-import {
- Callout,
- IconPlayerPlay,
- IconSettingsAutomation,
-} from 'twenty-ui/display';
+import { Callout } from 'twenty-ui/feedback';
+import { IconPlayerPlay, IconSettingsAutomation } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
index 1f349c2436b..a0b46e883ab 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
@@ -21,7 +21,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useCallback, useMemo, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { IconChevronLeft, IconSettings } from 'twenty-ui/display';
+import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx
index 83a73ff185d..82accba82c8 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx
@@ -15,7 +15,7 @@ import { useLingui } from '@lingui/react/macro';
import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx
index 165c40ccbee..f831514b580 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx
@@ -19,7 +19,7 @@ import { isDefined } from 'twenty-shared/utils';
import { getOutputSchemaFromValue } from 'twenty-shared/logic-function';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
import { t } from '@lingui/core/macro';
-import { IconCopy } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
import { useDebouncedCallback } from 'use-debounce';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts
index 468b9e21b2d..efd1dd64038 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/CronTriggerIntervalOptions.ts
@@ -4,7 +4,7 @@ import {
IconHours24,
IconTimeDuration60,
IconBrandDaysCounter,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export type CronTriggerInterval = 'DAYS' | 'HOURS' | 'MINUTES' | 'CUSTOM';
export const CRON_TRIGGER_INTERVAL_OPTIONS: Array<{
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityOptions.ts
index 6ba6cb5628b..9db38da0b37 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityOptions.ts
@@ -1,9 +1,5 @@
import { type WorkflowManualTriggerAvailability } from '@/workflow/types/Workflow';
-import {
- IconCheckbox,
- type IconComponent,
- IconSquare,
-} from 'twenty-ui/display';
+import { IconCheckbox, type IconComponent, IconSquare } from 'twenty-ui/icon';
export const MANUAL_TRIGGER_AVAILABILITY_OPTIONS: Array<{
label: string;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityTypeOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityTypeOptions.ts
index ceebc209c8f..d3ff2b85db2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityTypeOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerAvailabilityTypeOptions.ts
@@ -3,7 +3,7 @@ import {
type IconComponent,
IconId,
IconListDetails,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
export const MANUAL_TRIGGER_AVAILABILITY_TYPE_OPTIONS: Array<{
label: string;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerIsPinnedOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerIsPinnedOptions.ts
index 50e6248fcfc..34e09887629 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerIsPinnedOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ManualTriggerIsPinnedOptions.ts
@@ -1,8 +1,4 @@
-import {
- type IconComponent,
- IconPinned,
- IconPinnedOff,
-} from 'twenty-ui/display';
+import { type IconComponent, IconPinned, IconPinnedOff } from 'twenty-ui/icon';
export const MANUAL_TRIGGER_IS_PINNED_OPTIONS: Array<{
label: string;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerAuthenticationOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerAuthenticationOptions.ts
index 72066d6682a..91a515bdd33 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerAuthenticationOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerAuthenticationOptions.ts
@@ -1,4 +1,4 @@
-import { type IconComponent, IconLockOpen, IconFlag } from 'twenty-ui/display';
+import { type IconComponent, IconLockOpen, IconFlag } from 'twenty-ui/icon';
export type AuthenticationMethods = 'API_KEY' | null;
export const WEBHOOK_TRIGGER_AUTHENTICATION_OPTIONS: Array<{
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerHttpMethodOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerHttpMethodOptions.ts
index 8070741d6d7..5893505bc2c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerHttpMethodOptions.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/WebhookTriggerHttpMethodOptions.ts
@@ -1,8 +1,4 @@
-import {
- type IconComponent,
- IconHttpGet,
- IconHttpPost,
-} from 'twenty-ui/display';
+import { type IconComponent, IconHttpGet, IconHttpPost } from 'twenty-ui/icon';
export type WebhookHttpMethods = 'GET' | 'POST';
export const WEBHOOK_TRIGGER_HTTP_METHOD_OPTIONS: Array<{
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
index e182d049a5f..3c4f218b581 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
@@ -10,7 +10,7 @@ import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/Ste
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconVariablePlus } from 'twenty-ui/display';
+import { IconVariablePlus } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledDropdownVariableButtonContainer = styled.div<{
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
index b2481bddf62..e42521750a7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
@@ -17,11 +17,8 @@ import { getStepItemIcon } from '@/workflow/workflow-variables/utils/getStepItem
import { getVariableTemplateFromPath } from '@/workflow/workflow-variables/utils/getVariableTemplateFromPath';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconChevronLeft,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { IconChevronLeft, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItemSelect } from 'twenty-ui/navigation';
type WorkflowVariablesDropdownStepItemsProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
index 0141af129e5..12a3bb95b77 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx
@@ -9,7 +9,8 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
-import { IconX, OverflowingTextWithTooltip, useIcons } from 'twenty-ui/display';
+import { IconX, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';
type WorkflowVariablesDropdownStepsProps = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
index 40037462d3a..d9b05a99a68 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
@@ -14,7 +14,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { isBaseOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isBaseOutputSchemaV2';
import { isLinkOutputSchema } from '@/workflow/workflow-variables/types/guards/isLinkOutputSchema';
import { isRecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isRecordOutputSchemaV2';
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
index 08bdc9d8385..fc76b7183e4 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { useLingui } from '@lingui/react/macro';
-import { IconLink } from 'twenty-ui/display';
+import { IconLink } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
index a4f5b34eaf9..98cefda5001 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
@@ -20,7 +20,7 @@ import {
IconUser,
useIcons,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/auth/Authorize.tsx b/packages/twenty-front/src/pages/auth/Authorize.tsx
index e5da2f289db..5e0f6c05e86 100644
--- a/packages/twenty-front/src/pages/auth/Authorize.tsx
+++ b/packages/twenty-front/src/pages/auth/Authorize.tsx
@@ -12,13 +12,12 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useMutation, useQuery } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
import {
- H1Title,
- H1TitleFontColor,
type IconComponent,
IconDatabase,
IconUserCircle,
-} from 'twenty-ui/display';
-import { ModalContent } from 'twenty-ui/layout';
+} from 'twenty-ui/icon';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/typography';
+import { ModalContent } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
AuthorizeAppDocument,
diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
index d3123a2c599..97f870223e8 100644
--- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx
+++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -13,7 +13,7 @@ import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCu
import { useRedirect } from '@/domain-manager/hooks/useRedirect';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { TextInput } from '@/ui/input/components/TextInput';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { styled } from '@linaria/react';
import { zodResolver } from '@hookform/resolvers/zod';
@@ -31,7 +31,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { AppPath } from 'twenty-shared/types';
import { MainButton } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/utilities';
+import { AnimatedEaseIn } from 'twenty-ui/layout';
import { z } from 'zod';
import { useMutation, useQuery } from '@apollo/client/react';
import {
diff --git a/packages/twenty-front/src/pages/auth/SignInUp.tsx b/packages/twenty-front/src/pages/auth/SignInUp.tsx
index 126f2ed1167..de4d88e5e28 100644
--- a/packages/twenty-front/src/pages/auth/SignInUp.tsx
+++ b/packages/twenty-front/src/pages/auth/SignInUp.tsx
@@ -30,13 +30,13 @@ import { SignInUpTwoFactorAuthenticationProvision } from '@/auth/sign-in-up/comp
import { SignInUpTOTPVerification } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification';
import { useWorkspaceFromInviteHash } from '@/auth/sign-in-up/hooks/useWorkspaceFromInviteHash';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useLingui } from '@lingui/react/macro';
import { useSearchParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
import { Loader } from 'twenty-ui/feedback';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AnimatedEaseIn } from 'twenty-ui/utilities';
+import { AnimatedEaseIn } from 'twenty-ui/layout';
import { type PublicWorkspaceData } from '~/generated-metadata/graphql';
const StyledLoaderContainer = styled.div`
diff --git a/packages/twenty-front/src/pages/not-found/NotFound.tsx b/packages/twenty-front/src/pages/not-found/NotFound.tsx
index 1eccfa5fc82..02f6cae2edf 100644
--- a/packages/twenty-front/src/pages/not-found/NotFound.tsx
+++ b/packages/twenty-front/src/pages/not-found/NotFound.tsx
@@ -19,7 +19,7 @@ import {
AnimatedPlaceholderErrorContainer,
AnimatedPlaceholderErrorSubTitle,
AnimatedPlaceholderErrorTitle,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { UndecoratedLink } from 'twenty-ui/navigation';
const StyledBackDrop = styled.div`
diff --git a/packages/twenty-front/src/pages/onboarding/BookCall.tsx b/packages/twenty-front/src/pages/onboarding/BookCall.tsx
index 526495b5946..ad75614ed3d 100644
--- a/packages/twenty-front/src/pages/onboarding/BookCall.tsx
+++ b/packages/twenty-front/src/pages/onboarding/BookCall.tsx
@@ -5,12 +5,12 @@ import { Link } from 'react-router-dom';
import { currentUserState } from '@/auth/states/currentUserState';
import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';
import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
-import { ModalContent, ModalFooter } from 'twenty-ui/layout';
+import { ModalContent, ModalFooter } from 'twenty-ui/surfaces';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useLingui } from '@lingui/react/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { AppPath } from 'twenty-shared/types';
-import { IconChevronLeft, IconChevronRightPipe } from 'twenty-ui/display';
+import { IconChevronLeft, IconChevronRightPipe } from 'twenty-ui/icon';
import { LightButton } from 'twenty-ui/input';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx b/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx
index 3410eb19352..a43338b56fe 100644
--- a/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx
+++ b/packages/twenty-front/src/pages/onboarding/BookCallDecision.tsx
@@ -1,7 +1,7 @@
import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { Link } from 'react-router-dom';
diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
index 0b92fed4f97..8b436155027 100644
--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
+++ b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
@@ -1,4 +1,4 @@
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { styled } from '@linaria/react';
import { isDefined } from 'twenty-shared/utils';
import { ChooseYourPlanContent } from '~/pages/onboarding/internal/ChooseYourPlanContent';
diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
index 5a1bc71e904..5bc3bcbd4ca 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
@@ -25,9 +25,9 @@ import { i18n } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { Trans, useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { MainButton } from 'twenty-ui/input';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContentContainer = styled.div`
diff --git a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
index c2e28470fa1..9a1e76c6a72 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
@@ -13,7 +13,7 @@ import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboard
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { TextInput } from '@/ui/input/components/TextInput';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';
import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { Trans, useLingui } from '@lingui/react/macro';
@@ -21,7 +21,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Loader } from 'twenty-ui/feedback';
import { MainButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index 75aaa9266f7..4657190e63d 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -6,7 +6,7 @@ import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboard
import { PageFocusId } from '@/types/PageFocusId';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { TextInput } from '@/ui/input/components/TextInput';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { styled } from '@linaria/react';
import { zodResolver } from '@hookform/resolvers/zod';
@@ -22,7 +22,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useQuery } from '@apollo/client/react';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
-import { IconCopy, SeparatorLineText } from 'twenty-ui/display';
+import { IconCopy } from 'twenty-ui/icon';
+import { SeparatorLineText } from 'twenty-ui/typography';
import { LightButton, MainButton } from 'twenty-ui/input';
import { ClickToActionLink } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
index cc570813ab3..365371795de 100644
--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -2,7 +2,7 @@ import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
import { currentUserState } from '@/auth/states/currentUserState';
import { OnboardingModalCircularIcon } from '@/onboarding/components/OnboardingModalCircularIcon';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -10,10 +10,10 @@ import { useState } from 'react';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconCheck } from 'twenty-ui/display';
+import { IconCheck } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/feedback';
import { MainButton } from 'twenty-ui/input';
-import { AnimatedEaseIn } from 'twenty-ui/utilities';
+import { AnimatedEaseIn } from 'twenty-ui/layout';
import { useLazyQuery } from '@apollo/client/react';
import { GetCurrentUserDocument } from '~/generated-metadata/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
index 6818040f6cb..3bd8631daaa 100644
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -15,11 +15,11 @@ import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicros
import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
import { PageFocusId } from '@/types/PageFocusId';
-import { ModalContent } from 'twenty-ui/layout';
+import { ModalContent } from 'twenty-ui/surfaces';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
import { t } from '@lingui/core/macro';
import { AppPath, ConnectedAccountProvider } from 'twenty-shared/types';
-import { IconGoogle, IconMicrosoft } from 'twenty-ui/display';
+import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';
import { MainButton } from 'twenty-ui/input';
import { ClickToActionLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/page-layout/StandalonePageHeader.tsx b/packages/twenty-front/src/pages/page-layout/StandalonePageHeader.tsx
index d8251205946..48108bc5915 100644
--- a/packages/twenty-front/src/pages/page-layout/StandalonePageHeader.tsx
+++ b/packages/twenty-front/src/pages/page-layout/StandalonePageHeader.tsx
@@ -6,7 +6,7 @@ import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
import { ThemeContext } from 'twenty-ui/theme-constants';
type StandalonePageHeaderProps = {
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
index 9967a18cabf..ca5117ac191 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
@@ -8,7 +8,7 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
export const SettingsAccounts = () => {
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
index 6b957b45483..e125ec9f128 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
@@ -7,7 +7,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconDeviceFloppy } from 'twenty-ui/display';
+import { IconDeviceFloppy } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
type SettingsAccountsConfigurationStepCalendarProps = {
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
index 6aa71e4ca05..a75a907c879 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
@@ -6,7 +6,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronRight, IconPlus } from 'twenty-ui/display';
+import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
type SettingsAccountsConfigurationStepEmailProps = {
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
index cef8a1c4bfb..d4b28b1b480 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
@@ -9,7 +9,6 @@ import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
import { AI_PROVIDER_SOURCE } from '@/settings/admin-panel/ai/constants/AiProviderSource';
import {
- H2Title,
type IconComponent,
IconFlag,
IconKey,
@@ -19,7 +18,8 @@ import {
IconTag,
IconTrash,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button, SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { RoundedLink, UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
index 17525b624f7..47f2b4388ae 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
@@ -8,15 +8,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
-import {
- AppTooltip,
- H1Title,
- H1TitleFontColor,
- H2Title,
- IconShare,
- IconTrash,
- TooltipDelay,
-} from 'twenty-ui/display';
+import { IconShare, IconTrash } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
+import { H1Title, H1TitleFontColor, H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section, SectionAlignment, SectionFontColor } from 'twenty-ui/layout';
import {
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx
index eb2fb0f01e8..a0fe85cfef4 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx
@@ -8,13 +8,13 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { APPLICATION_REGISTRATION_ADMIN_PATH } from '@/settings/admin-panel/apps/constants/ApplicationRegistrationAdminPath';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { Avatar } from 'twenty-ui/data-display';
import {
- Avatar,
IconInfoCircle,
IconKey,
IconSettings,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { SettingsApplicationRegistrationConfigTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab';
import { SettingsApplicationRegistrationOAuthTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab';
import { SettingsApplicationRegistrationDistributionTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralToggles.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralToggles.tsx
index 8fa635349e5..63fd8c77541 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralToggles.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralToggles.tsx
@@ -1,6 +1,7 @@
-import { Card, Section } from 'twenty-ui/layout';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';
-import { IconArrowBarToDown } from 'twenty-ui/display';
+import { IconArrowBarToDown } from 'twenty-ui/icon';
import {
type ApplicationRegistration,
UpdateApplicationRegistrationDocument,
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
index aefaaaba303..289b56cce0a 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
@@ -10,7 +10,7 @@ import { useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, H3Title } from 'twenty-ui/display';
+import { H2Title, H3Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useQuery } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
index a76178e477e..8c43075216a 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
@@ -8,7 +8,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconId } from 'twenty-ui/display';
+import { IconId } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
index 530328b950f..6d211f9fb88 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
@@ -13,14 +13,14 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { formatUpgradeCommandName, getSettingsPath } from 'twenty-shared/utils';
+import { Status } from 'twenty-ui/data-display';
import {
- H2Title,
IconAlertTriangle,
IconCalendar,
IconProgressCheck,
IconStatusChange,
- Status,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
index a34ac244f01..5e377df4ddc 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
@@ -8,7 +8,8 @@ import { Controller, useForm } from 'react-hook-form';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
index fb1203a9cbc..41740497931 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
@@ -7,7 +7,9 @@ import { useNavigate } from 'react-router-dom';
import { type AiSdkPackage, isDataResidency } from 'twenty-shared/ai';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconPlus, Info } from 'twenty-ui/display';
+import { Info } from 'twenty-ui/feedback';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
index f4a0c05ae5c..65ed699ac43 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
@@ -6,7 +6,7 @@ import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
export const SettingsAdminQueueDetail = () => {
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
index 3e930fead4e..c97adfe6117 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
@@ -27,14 +27,14 @@ import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/consta
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import {
- H2Title,
IconCalendar,
IconEyeShare,
IconId,
IconLock,
IconMail,
IconUser,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
index ba13817a90d..69b106d976a 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
@@ -12,7 +12,7 @@ import { GET_ADMIN_CHAT_THREAD_MESSAGES } from '@/settings/admin-panel/graphql/q
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { type GetAdminChatThreadMessagesQuery } from '~/generated-admin/graphql';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
index 9207a59dc01..396ed662b5b 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
@@ -31,19 +31,19 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { Avatar } from 'twenty-ui/data-display';
import {
- Avatar,
- H2Title,
IconCreditCard,
IconEyeShare,
IconFlag,
IconMessage,
- OverflowingTextWithTooltip,
IconSettings2,
IconUsers,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { Card, OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Button, Toggle } from 'twenty-ui/input';
-import { Card, Section } from 'twenty-ui/layout';
+import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
type FeatureFlagKey,
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
index e84719994f4..31ae845981e 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
@@ -9,7 +9,7 @@ import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
index 675997fb452..00efde3ceee 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
@@ -14,7 +14,7 @@ import {
IconPlus,
IconSparkles,
IconTool,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
index dae2f6d4d14..9cbbef0f2b2 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
@@ -22,7 +22,7 @@ import {
IconListCheck,
IconLock,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation, useQuery } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
index 90264f2f2e4..3ae231e3e0e 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
@@ -13,7 +13,8 @@ import Skeleton from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
index d7c6487358a..393ae8bcc95 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
@@ -9,7 +9,7 @@ import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title, H3Title } from 'twenty-ui/display';
+import { H2Title, H3Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
index b869b22900b..171e3d23d68 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
@@ -18,17 +18,16 @@ import { t } from '@lingui/core/macro';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import {
- AppTooltip,
- H2Title,
IconArchive,
IconArchiveOff,
IconInfoCircle,
IconRefresh,
IconTrash,
- TooltipDelay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip, Card, TooltipDelay } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
-import { Card, Section } from 'twenty-ui/layout';
+import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation, useQuery } from '@apollo/client/react';
import {
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
index 657dae36fc7..cecc20ae33f 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
@@ -18,7 +18,8 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined, isValidUuid } from 'twenty-shared/utils';
-import { H2Title, IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index f1fd854ec4e..8b5df87f5ea 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -23,7 +23,7 @@ import {
IconPlayerPlay,
IconPlus,
IconTrash,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button, LightIconButton } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
index 28682a7fc2f..c3d295d82f0 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
@@ -9,7 +9,8 @@ import { useEffect, useState } from 'react';
import Skeleton from 'react-loading-skeleton';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconChevronRight, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconChevronRight } from 'twenty-ui/icon';
import { Button, LightIconButton } from 'twenty-ui/input';
import {
AnimatedPlaceholder,
@@ -17,7 +18,7 @@ import {
AnimatedPlaceholderEmptySubTitle,
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/feedback';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation, useQuery } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
index b39dce2157a..ad45f8893ee 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
@@ -10,7 +10,8 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
index 71d99a73571..ae0c0f83a75 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
@@ -13,7 +13,8 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconTrash } from 'twenty-ui/display';
+import { IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
index fb3d683a785..c1d5e1ff4da 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
@@ -6,7 +6,8 @@ import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
-import { H2Title, IconArchive } from 'twenty-ui/display';
+import { IconArchive } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTable.tsx
index b65f9295e57..874cea2d936 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTable.tsx
@@ -9,7 +9,7 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronRight } from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type FindManySkillsQuery } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
index 6182874fd64..9b85dfd7874 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
@@ -6,7 +6,8 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title, IconLock, IconPuzzle, IconTool } from 'twenty-ui/display';
+import { IconLock, IconPuzzle, IconTool } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItemToggle } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTable.tsx
index ea155d70a5b..11be78213c9 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTable.tsx
@@ -8,7 +8,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronRight } from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsToolIcon } from '~/pages/settings/ai/components/SettingsToolIcon';
import {
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentTableRow.tsx
index 8e0f592084c..4adb6de726e 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentTableRow.tsx
@@ -4,7 +4,8 @@ import { type ReactNode, useContext } from 'react';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { OverflowingTextWithTooltip, useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Agent } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentsTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentsTable.tsx
index 53a9eef6ccc..4f7719721ef 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiAgentsTable.tsx
@@ -11,7 +11,7 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconChevronRight, IconSettingsAutomation } from 'twenty-ui/display';
+import { IconChevronRight, IconSettingsAutomation } from 'twenty-ui/icon';
import { SearchInput } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
index cb587c32816..6fe7b9763fd 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
@@ -21,15 +21,11 @@ import {
} from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import {
- H2Title,
- IconBolt,
- IconBrain,
- IconPrompt,
- IconStar,
-} from 'twenty-ui/display';
+import { IconBolt, IconBrain, IconPrompt, IconStar } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
-import { Card, Section } from 'twenty-ui/layout';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
index 9402a65cc7e..f9c828dd6ca 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
@@ -9,13 +9,8 @@ import { useMutation, useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Fragment, useContext, useState } from 'react';
-import {
- H2Title,
- IconMessage,
- IconRobot,
- IconSparkles,
- IconTool,
-} from 'twenty-ui/display';
+import { IconMessage, IconRobot, IconSparkles, IconTool } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { SettingsPath } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
index 23b9d3b2d59..4cbc1bea0b7 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
@@ -14,7 +14,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
index 777e74ce8bd..a8b8a2b600e 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillInactiveMenuDropDown.tsx
@@ -4,7 +4,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { t } from '@lingui/core/macro';
-import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/display';
+import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
index 8c855f70369..ea557f9ac0b 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillTableRow.tsx
@@ -4,7 +4,8 @@ import { type ReactNode, useContext } from 'react';
import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { OverflowingTextWithTooltip, useIcons } from 'twenty-ui/display';
+import { useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type Skill } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
index eed90405a5c..a272c47e926 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
@@ -4,9 +4,8 @@ import { useContext } from 'react';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { isDefined } from 'twenty-shared/utils';
+import { Avatar, getIconTileColorShades } from 'twenty-ui/data-display';
import {
- Avatar,
- getIconTileColorShades,
IconCode,
IconEdit,
IconPlus,
@@ -14,7 +13,7 @@ import {
IconTrash,
useIcons,
type IconComponent,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type ApplicationInfo = {
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
index c606dd3e4e8..868988a3aa8 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
@@ -9,7 +9,6 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import {
- AppTooltip,
IconArrowUpRight,
IconInfoCircle,
IllustrationIconArray,
@@ -17,9 +16,12 @@ import {
IllustrationIconNumbers,
IllustrationIconText,
IllustrationIconToggle,
+} from 'twenty-ui/icon';
+import {
+ AppTooltip,
OverflowingTextWithTooltip,
TooltipDelay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/surfaces';
import { Button } from 'twenty-ui/input';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
index 21dd9467c1e..3a71be8ee74 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolTableRow.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { AppChip } from '@/applications/components/AppChip';
diff --git a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
index a79c5786254..8db5e44fb09 100644
--- a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
+++ b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
@@ -15,13 +15,13 @@ import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import {
- H2Title,
IconBrandGraphql,
IconCode,
IconPlus,
IconRobot,
IconWebhook,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
index fa0ca66a651..ee7a32b02c7 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
@@ -5,15 +5,9 @@ import { type ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Tag } from 'twenty-ui/components';
-import {
- H2Title,
- IconRefresh,
- IconTrash,
- IconUser,
- IconUsers,
- Status,
-} from 'twenty-ui/display';
+import { Status, Tag } from 'twenty-ui/data-display';
+import { IconRefresh, IconTrash, IconUser, IconUsers } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
index 8e78e2353cc..351abeddd7e 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
@@ -31,7 +31,7 @@ import {
IconListDetails,
IconLock,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import {
ApplicationRegistrationSourceType,
FindMarketplaceAppDetailDocument,
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx
index c64e49a9fc0..d95275d1d6e 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx
@@ -9,7 +9,7 @@ import { t } from '@lingui/core/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconEye, IconSettings } from 'twenty-ui/display';
+import { IconEye, IconSettings } from 'twenty-ui/icon';
import { FindOneApplicationDocument } from '~/generated-metadata/graphql';
import { SettingsApplicationFrontComponentPreviewTab } from '~/pages/settings/applications/tabs/SettingsApplicationFrontComponentPreviewTab';
import { SettingsApplicationFrontComponentSettingsTab } from '~/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx
index 22904aff3ae..955e2fea47c 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx
@@ -5,16 +5,15 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { FindOneApplicationRegistrationDocument } from '~/generated-metadata/graphql';
import { useLingui } from '@lingui/react/macro';
-import { Tag } from 'twenty-ui/components';
+import { Avatar, Tag } from 'twenty-ui/data-display';
import { TabList } from '@/ui/layout/tab-list/components/TabList';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import {
- Avatar,
IconInfoCircle,
IconKey,
IconSettings,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { SettingsApplicationRegistrationConfigTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab';
import { SettingsApplicationRegistrationOAuthTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab';
import { SettingsApplicationRegistrationDistributionTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
index 8eb4b2067f3..fe6947aa5c5 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
@@ -8,7 +8,7 @@ import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconApps, IconCode, IconDownload, IconPlug } from 'twenty-ui/display';
+import { IconApps, IconCode, IconDownload, IconPlug } from 'twenty-ui/icon';
import { Section } from 'twenty-ui/layout';
import coverDark from '~/pages/settings/applications/assets/cover-dark.png';
import coverLight from '~/pages/settings/applications/assets/cover-light.png';
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
index 9915ba27eaa..266a47b79ed 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
@@ -15,6 +15,7 @@ import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { InlineBanner } from 'twenty-ui/feedback';
import {
IconBook,
IconBox,
@@ -26,8 +27,7 @@ import {
IconListDetails,
IconLock,
IconShield,
- InlineBanner,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import {
ApplicationRegistrationSourceType,
FindMarketplaceAppDetailDocument,
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
index f9baa56d0b6..dbac7795729 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
@@ -3,12 +3,12 @@ import React from 'react';
import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStatefulWrapper';
import { Button } from 'twenty-ui/input';
+import { Section } from 'twenty-ui/layout';
import {
type ModalOverlay,
type ModalPadding,
type ModalSize,
- Section,
-} from 'twenty-ui/layout';
+} from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type StyledAppModalBaseProps = React.PropsWithChildren<{
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationConnectScopePickerModal.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationConnectScopePickerModal.tsx
index dd0699950b0..5203b12dd3e 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationConnectScopePickerModal.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationConnectScopePickerModal.tsx
@@ -3,7 +3,7 @@ import { useState } from 'react';
import { SettingsRadioCardContainer } from '@/settings/components/SettingsRadioCardContainer';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/display';
+import { H1Title, H1TitleFontColor } from 'twenty-ui/typography';
import { SectionAlignment, SectionFontColor } from 'twenty-ui/layout';
import {
StyledAppModal,
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
index f55477480a6..b9cfa163b36 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx
@@ -7,11 +7,8 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { TableSection } from '@/ui/layout/table/components/TableSection';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconChevronRight,
- OverflowingTextWithTooltip,
- useIcons,
-} from 'twenty-ui/display';
+import { IconChevronRight, useIcons } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { AppChip } from '@/applications/components/AppChip';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTable.tsx
index 8f73270a32d..10e40ff068f 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTable.tsx
@@ -7,7 +7,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTableRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTableRow.tsx
index efdb6c9157e..76a439ede35 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationDataTableRow.tsx
@@ -8,7 +8,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { IconChevronRight, useIcons } from 'twenty-ui/display';
+import { IconChevronRight, useIcons } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type ApplicationDataTableRow } from '~/pages/settings/applications/types/applicationDataTableRow';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
index d2454894fd9..7ad7318d944 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
@@ -1,11 +1,11 @@
import {
- H2Title,
IconBox,
IconDownload,
IconGitBranch,
IconTag,
IconWorld,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Trans, useLingui } from '@lingui/react/macro';
import {
SettingsTableCard,
@@ -28,7 +28,7 @@ import {
ChipSize,
ChipVariant,
Tag,
-} from 'twenty-ui/components';
+} from 'twenty-ui/data-display';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/layout';
import { SettingsPath } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
index 49f18aa2682..2c7161282a8 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
@@ -1,9 +1,9 @@
import {
- H2Title,
IconBrandDocker,
IconChartBar,
IconStatusChange,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { useLingui } from '@lingui/react/macro';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import {
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
index 36f3858343d..d22eb7f477c 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsTable.tsx
@@ -6,7 +6,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { TableCell } from '@/ui/layout/table/components/TableCell';
-import { IconX, OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { IconX } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { IconButton } from 'twenty-ui/input';
type SettingsApplicationRegistrationRedirectURIsTableProps = {
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
index 14a2d856a00..801e17b1b93 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
@@ -10,7 +10,7 @@ import {
IconCopy,
IconDownload,
IconInfoCircle,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FindMarketplaceAppDetailDocument } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
index 3da8f460208..529f5b3468f 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationTableRow.tsx
@@ -5,8 +5,8 @@ import { useResolvedApplicationDescription } from '@/applications/hooks/useResol
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { t } from '@lingui/core/macro';
-import { Tag } from 'twenty-ui/components';
-import { OverflowingTextWithTooltip } from 'twenty-ui/display';
+import { Tag } from 'twenty-ui/data-display';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
import { type ApplicationDisplayData } from '@/applications/types/applicationDisplayData.type';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
index 0839dc9cd10..223a08cba99 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVersionContainer.tsx
@@ -5,7 +5,7 @@ import { SettingsAdminVersionDisplay } from '@/settings/admin-panel/components/S
import { useUpgradeApplication } from '@/marketplace/hooks/useUpgradeApplication';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { IconCircleDot, IconStatusChange, IconUpload } from 'twenty-ui/display';
+import { IconCircleDot, IconStatusChange, IconUpload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import {
ApplicationRegistrationSourceType,
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index b8209cc5ab5..8d332830542 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -1,4 +1,5 @@
-import { H2Title, IconChevronRight } from 'twenty-ui/display';
+import { IconChevronRight } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsAvailableApplicationCard.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsAvailableApplicationCard.tsx
index 53cf44bcaa8..447e16266e4 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsAvailableApplicationCard.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsAvailableApplicationCard.tsx
@@ -8,8 +8,8 @@ import { t } from '@lingui/core/macro';
import { Link } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
-import { Card } from 'twenty-ui/layout';
+import { Avatar } from 'twenty-ui/data-display';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type MarketplaceApp } from '~/generated-metadata/graphql';
import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
index a1ee76b745f..7269f3e9fe7 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
@@ -6,7 +6,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
index 704e41a57ce..12c2d9f7c8c 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
@@ -12,15 +12,15 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { Status } from 'twenty-ui/data-display';
+import { Info } from 'twenty-ui/feedback';
import {
- H2Title,
IconChevronRight,
IconPlus,
IconUser,
IconUsers,
- Info,
- Status,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
index 9e757de24b7..4979ebcd6df 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab.tsx
@@ -5,12 +5,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Trans } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
-import {
- IconCheck,
- IconDownload,
- IconTrash,
- IconUpload,
-} from 'twenty-ui/display';
+import { IconCheck, IconDownload, IconTrash, IconUpload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
index 28bf8ebdbf9..ddd30f1eba1 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
@@ -7,7 +7,7 @@ import { useState } from 'react';
import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { type ApplicationDisplayData } from '@/applications/types/applicationDisplayData.type';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
index 4a39abe0692..174425e2ebd 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
@@ -3,12 +3,9 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useContext, useState } from 'react';
-import {
- AppTooltip,
- H2Title,
- IconInfoCircle,
- TooltipDelay,
-} from 'twenty-ui/display';
+import { IconInfoCircle } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
index eef48a0a850..c2179ae6f5b 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
@@ -6,7 +6,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
index 4850e019250..0e79e56a666 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
@@ -3,7 +3,8 @@ import { useQuery } from '@apollo/client/react';
import { FindApplicationRegistrationVariablesDocument } from '~/generated-metadata/graphql';
import { FindAdminApplicationRegistrationVariablesDocument } from '~/generated-admin/graphql';
import { Section } from 'twenty-ui/layout';
-import { H2Title, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { H2Title } from 'twenty-ui/typography';
import { useLingui } from '@lingui/react/macro';
import { getSettingsPath } from 'twenty-shared/utils';
import { SettingsPath } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
index d309b534755..3d0d4624231 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
@@ -1,5 +1,7 @@
import { useLingui } from '@lingui/react/macro';
-import { CommandBlock, H2Title, IconCopy } from 'twenty-ui/display';
+import { CommandBlock } from 'twenty-ui/data-display';
+import { IconCopy } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { SettingsPath } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
index b8929eb63f8..6f7e9540a6f 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx
@@ -2,7 +2,7 @@ import { type ApplicationRegistration } from '~/generated-metadata/graphql';
import { useLingui } from '@lingui/react/macro';
import { useNavigate } from 'react-router-dom';
-import { InlineBanner } from 'twenty-ui/display';
+import { InlineBanner } from 'twenty-ui/feedback';
import { SettingsApplicationRegistrationGeneralInfo } from '~/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo';
import { SettingsAdminApplicationRegistrationDangerZone } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
index 5fa431bfbe0..35bdf8549a6 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
@@ -9,7 +9,8 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import { H2Title, IconKey, IconRefresh, IconShield } from 'twenty-ui/display';
+import { IconKey, IconRefresh, IconShield } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
index d2b3187aceb..ba3caf2057b 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
@@ -5,7 +5,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useState } from 'react';
-import { IconSparkles } from 'twenty-ui/display';
+import { IconSparkles } from 'twenty-ui/icon';
import { SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItemToggle } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
index 3a8f2faa8f5..717581197ec 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
@@ -18,15 +18,11 @@ import { useContext, useMemo, useState } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import {
- CommandBlock,
- H2Title,
- IconArrowUpRight,
- IconChevronRight,
- IconCopy,
- InlineBanner,
- OverflowingTextWithTooltip,
-} from 'twenty-ui/display';
+import { CommandBlock } from 'twenty-ui/data-display';
+import { InlineBanner } from 'twenty-ui/feedback';
+import { IconArrowUpRight, IconChevronRight, IconCopy } from 'twenty-ui/icon';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Button, SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import {
diff --git a/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx b/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
index b3fc1bba69e..9288f26ed9a 100644
--- a/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
@@ -15,7 +15,7 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Avatar } from 'twenty-ui/display';
+import { Avatar } from 'twenty-ui/data-display';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx b/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
index b27d8be2dee..e8985ea16ba 100644
--- a/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
+++ b/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
@@ -7,13 +7,13 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import {
- H2Title,
IconBrandX,
IconBriefcase,
IconTransform,
type IconComponent,
useIcons,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
index 2d26f5f6d73..45add8498fc 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
@@ -18,7 +18,7 @@ import { useState } from 'react';
import { FormProvider, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
index e5da9bee7a3..50a53266576 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
@@ -30,7 +30,7 @@ import {
IconListDetails,
IconPlus,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index e3a365ea2b6..dfb1a12ac74 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -34,12 +34,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import {
- H2Title,
- IconArchive,
- IconArchiveOff,
- IconTrash,
-} from 'twenty-ui/display';
+import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
index 1f321ab50c1..d76ea42459d 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
@@ -25,7 +25,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { useEffect, useMemo, useState } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
-import { IconArchive, IconSettings } from 'twenty-ui/display';
+import { IconArchive, IconSettings } from 'twenty-ui/icon';
import { SearchInput } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
index 83a80a9c1c4..16a68e8cab4 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
@@ -9,7 +9,7 @@ import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';
import { styled } from '@linaria/react';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { IconSquareKey, IconTrash } from 'twenty-ui/display';
+import { IconSquareKey, IconTrash } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
index bd11902ca09..697a17ccd7b 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx
@@ -29,7 +29,7 @@ import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useContext, useMemo, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconArchive, IconChevronRight, IconSettings } from 'twenty-ui/display';
+import { IconArchive, IconChevronRight, IconSettings } from 'twenty-ui/icon';
import { SearchInput } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import {
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index 5fc2e104ced..4858ed238d4 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -8,13 +8,13 @@ import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import {
- H2Title,
IconEye,
IconHierarchy2,
IconLink,
IconList,
IconPlus,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
index 826aea1da24..679e69cbe15 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
@@ -22,7 +22,7 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
index 06d57ef1d6b..242c0a4c0a2 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
@@ -17,7 +17,9 @@ import { FormProvider, useForm } from 'react-hook-form';
import { useParams } from 'react-router-dom';
import { AppPath, RelationType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Callout, H2Title, IconAlertTriangle } from 'twenty-ui/display';
+import { Callout } from 'twenty-ui/feedback';
+import { IconAlertTriangle } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { IndexType } from '~/generated-metadata/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index e776b4580e4..83103b60061 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -21,7 +21,8 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title, IconRepeat, IconTrash } from 'twenty-ui/display';
+import { IconRepeat, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
index b43080dcaac..ed074f6aefd 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
@@ -16,7 +16,7 @@ import { useStore } from 'jotai';
import { Key } from 'ts-key-enum';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import {
CreateApiKeyDocument,
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsWebhooks.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsWebhooks.tsx
index 3e2ae0b0bab..6c7288a0e4d 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsWebhooks.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsWebhooks.tsx
@@ -6,7 +6,8 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconPlus } from 'twenty-ui/display';
+import { IconPlus } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmail.tsx b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmail.tsx
index 957220c416d..ad20d89a837 100644
--- a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmail.tsx
+++ b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmail.tsx
@@ -11,9 +11,9 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconArrowUp, IconLock } from 'twenty-ui/display';
+import { IconArrowUp, IconLock } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
-import { Card } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmailGroupChannelDetail.tsx b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmailGroupChannelDetail.tsx
index 9623dd25c13..f42de0761dc 100644
--- a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmailGroupChannelDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceEmailGroupChannelDetail.tsx
@@ -19,7 +19,9 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { MessageChannelType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';
-import { H2Title, IconCopy, IconTrash, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconCopy, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceNewUnsubscribeTopic.tsx b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceNewUnsubscribeTopic.tsx
index 556c37fb048..7f7055265b2 100644
--- a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceNewUnsubscribeTopic.tsx
+++ b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceNewUnsubscribeTopic.tsx
@@ -12,8 +12,10 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
-import { H2Title, IconEye } from 'twenty-ui/display';
-import { Card, Section } from 'twenty-ui/layout';
+import { IconEye } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { NotFound } from '~/pages/not-found/NotFound';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceUnsubscribeTopicDetail.tsx
index b7614d43ab1..a31361a6f12 100644
--- a/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceUnsubscribeTopicDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/email/SettingsWorkspaceUnsubscribeTopicDetail.tsx
@@ -17,9 +17,11 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
-import { H2Title, IconEye, IconTrash } from 'twenty-ui/display';
+import { IconEye, IconTrash } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
-import { Card, Section } from 'twenty-ui/layout';
+import { Section } from 'twenty-ui/layout';
+import { Card } from 'twenty-ui/surfaces';
import { NotFound } from '~/pages/not-found/NotFound';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
diff --git a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
index 73249d61e9c..5bfb56c7957 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
@@ -24,14 +24,14 @@ import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import {
- H2Title,
IconCalendarRepeat,
IconCheck,
IconCircleX,
IconCreditCard,
IconKey,
IconUser,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx b/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
index 0149dde4f8f..0dad693f196 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
@@ -1,4 +1,4 @@
-import { IconLock } from 'twenty-ui/display';
+import { IconLock } from 'twenty-ui/icon';
import { t } from '@lingui/core/macro';
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
index d24dfc0f6a3..17d98ad71e2 100644
--- a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
+++ b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
@@ -13,7 +13,8 @@ import { SettingsSecuritySettings } from '@/settings/security/components/Setting
import { NameField } from '@/settings/workspace/components/NameField';
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { H2Title, IconHistory, IconKey, IconSettings } from 'twenty-ui/display';
+import { IconHistory, IconKey, IconSettings } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { PermissionFlagType } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
index 5cf5e87c2ac..d0b917d0dd6 100644
--- a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
@@ -9,14 +9,14 @@ import { useNavigate } from 'react-router-dom';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import {
- H2Title,
IconAppWindow,
IconCommand,
IconLayoutDashboard,
IconLayoutSidebarLeftExpand,
IconPencil,
IconTable,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import coverDark from '~/pages/settings/layout/assets/cover-dark.png';
diff --git a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
index 82445476c8d..d0c547a3c6c 100644
--- a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
@@ -11,7 +11,7 @@ import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
index ec355c504de..0015d761279 100644
--- a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
@@ -4,7 +4,7 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx b/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx
index e3d5e73adb4..7bfb1f54da7 100644
--- a/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx
@@ -18,7 +18,7 @@ import {
IconCode,
IconPlayerPlay,
IconSettings,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
import { useQuery } from '@apollo/client/react';
import { FindOneApplicationDocument } from '~/generated-metadata/graphql';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
index e662d32422b..a7de08269a5 100644
--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx
@@ -17,7 +17,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { CoreObjectNameSingular, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { IconInfoCircle, IconLockOpen } from 'twenty-ui/display';
+import { IconInfoCircle, IconLockOpen } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { currentUserState } from '@/auth/states/currentUserState';
diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
index 00758153bc4..abba181a751 100644
--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
@@ -1,7 +1,7 @@
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { IconLock, IconUserPlus, IconUsers } from 'twenty-ui/display';
+import { IconLock, IconUserPlus, IconUsers } from 'twenty-ui/icon';
import { SettingsDiscoveryHeroCard } from '@/settings/components/SettingsDiscoveryHeroCard';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
index df122d38524..a3b8349e8b8 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
@@ -20,15 +20,10 @@ import { useResendWorkspaceInvitation } from '@/workspace-invitation/hooks/useRe
import { WorkspaceInviteLink } from '@/workspace/components/WorkspaceInviteLink';
import { WorkspaceInviteTeam } from '@/workspace/components/WorkspaceInviteTeam';
import { isDefined } from 'twenty-shared/utils';
-import {
- AppTooltip,
- H2Title,
- IconMail,
- IconReload,
- IconTrash,
- Status,
- TooltipDelay,
-} from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconMail, IconReload, IconTrash } from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { IconButton } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index 698cfa22d6c..62574d08148 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -20,16 +20,15 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { generateILikeFiltersForCompositeFields } from 'twenty-shared/utils';
+import { Avatar } from 'twenty-ui/data-display';
import {
- AppTooltip,
- Avatar,
- H2Title,
IconArrowUpRight,
IconChevronRight,
IconHierarchy2,
IconListDetails,
- TooltipDelay,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
+import { H2Title } from 'twenty-ui/typography';
import { Button, SearchInput } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { MenuItem } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
index b301f4b7111..0f97adda081 100644
--- a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
@@ -13,7 +13,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, IconShield, Status } from 'twenty-ui/display';
+import { Status } from 'twenty-ui/data-display';
+import { IconShield } from 'twenty-ui/icon';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
diff --git a/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
index 742ce9f2dd6..1171f6b492a 100644
--- a/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
@@ -15,7 +15,7 @@ import { extractSecretFromOtpUri } from '@/settings/two-factor-authentication/ut
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Loader } from 'twenty-ui/feedback';
import { Section } from 'twenty-ui/layout';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
index 12e55b301b4..3cbfce169c6 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
@@ -5,7 +5,7 @@ import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { ColorSchemePicker } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { LocalePicker } from '~/pages/settings/profile/appearance/components/LocalePicker';
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
index 29d8b41cab1..00c86209aed 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
@@ -9,7 +9,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { Controller, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/display';
+import { H2Title } from 'twenty-ui/typography';
import { Section } from 'twenty-ui/layout';
import { z } from 'zod';
import { useMutation } from '@apollo/client/react';
diff --git a/packages/twenty-front/src/testing/decorators/IconsProviderDecorator.tsx b/packages/twenty-front/src/testing/decorators/IconsProviderDecorator.tsx
index 84a12d8387a..f6f8b437fb6 100644
--- a/packages/twenty-front/src/testing/decorators/IconsProviderDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/IconsProviderDecorator.tsx
@@ -1,5 +1,5 @@
import { type Decorator } from '@storybook/react-vite';
-import { IconsProvider } from 'twenty-ui/display';
+import { IconsProvider } from 'twenty-ui/icon';
export const IconsProviderDecorator: Decorator = (Story) => {
return (
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index 8ee76e30a28..82a8e7232a9 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -30,7 +30,7 @@ import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProvide
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
-import { IconsProvider } from 'twenty-ui/display';
+import { IconsProvider } from 'twenty-ui/icon';
import { FullHeightStorybookLayout } from '~/testing/FullHeightStorybookLayout';
import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
diff --git a/packages/twenty-sdk/src/ui/index.ts b/packages/twenty-sdk/src/ui/index.ts
index 29327384d55..76972f12b3d 100644
--- a/packages/twenty-sdk/src/ui/index.ts
+++ b/packages/twenty-sdk/src/ui/index.ts
@@ -1,26 +1,16 @@
-export * from 'twenty-ui';
export * from 'twenty-ui/accessibility';
-export * from 'twenty-ui/components';
+export * from 'twenty-ui/data-display';
-// Selective re-export from twenty-ui/display:
+// Selective re-export from twenty-ui's component domains:
// IconsProvider, useIcons, and iconsState are excluded to avoid bundling
// the AllIcons module (~5000 Tabler icons) which adds ~4MB to the SDK dist.
export {
- AnimatedCheckmark,
- AppTooltip,
- Avatar,
- AVATAR_PROPERTIES_BY_SIZE,
- AvatarGroup,
Banner,
Callout,
- Checkmark,
- ColorSample,
- CommandBlock,
- H1Title,
- H1TitleFontColor,
- H2Title,
- H3Title,
- HorizontalSeparator,
+ Info,
+ SidePanelInformationBanner,
+} from 'twenty-ui/feedback';
+export {
Icon,
Icon123,
IconAddressBook,
@@ -31,8 +21,8 @@ export {
IconAlignLeft,
IconAlignRight,
IconApi,
- IconApps,
IconAppWindow,
+ IconApps,
IconArchive,
IconArchiveOff,
IconArrowBackUp,
@@ -40,12 +30,12 @@ export {
IconArrowLeft,
IconArrowMerge,
IconArrowRight,
+ IconArrowUp,
+ IconArrowUpRight,
IconArrowsDiagonal,
IconArrowsSort,
IconArrowsSplit2,
IconArrowsVertical,
- IconArrowUp,
- IconArrowUpRight,
IconAt,
IconAxisX,
IconAxisY,
@@ -104,8 +94,8 @@ export {
IconChevronLeft,
IconChevronRight,
IconChevronRightPipe,
- IconChevronsRight,
IconChevronUp,
+ IconChevronsRight,
IconCircle,
IconCircleDashed,
IconCircleDot,
@@ -210,8 +200,8 @@ export {
IconFilterCog,
IconFilterOff,
IconFilterPlus,
- IconFilters,
IconFilterX,
+ IconFilters,
IconFlag,
IconFlask,
IconFocusCentered,
@@ -378,10 +368,10 @@ export {
IconShield,
IconSitemap,
IconSlash,
+ IconSortAZ,
IconSortAscending,
IconSortAscendingLetters,
IconSortAscendingNumbers,
- IconSortAZ,
IconSortDescending,
IconSortDescendingLetters,
IconSortDescendingNumbers,
@@ -476,43 +466,43 @@ export {
IllustrationIconUid,
IllustrationIconUser,
IllustrationIconWrapper,
- Info,
- invalidAvatarUrlsAtomV2,
- Label,
+ ThinkingOrbitLoaderIcon,
+} from 'twenty-ui/icon';
+export { HorizontalSeparator } from 'twenty-ui/layout';
+export {
+ AppTooltip,
OverflowingTextWithTooltip,
+ TooltipDelay,
+ TooltipPosition,
+} from 'twenty-ui/surfaces';
+export {
+ H1Title,
+ H1TitleFontColor,
+ H2Title,
+ H3Title,
+ Label,
SeparatorLineText,
- SidePanelInformationBanner,
- Status,
StyledText,
StyledTextContent,
StyledTextWrapper,
- ThinkingOrbitLoaderIcon,
- TooltipDelay,
- TooltipPosition,
-} from 'twenty-ui/display';
+} from 'twenty-ui/typography';
export type {
- AnimatedCheckmarkProps,
- AppTooltipProps,
- AvatarGroupProps,
- AvatarProps,
- AvatarSize,
- AvatarType,
BannerColor,
BannerVariant,
CalloutProps,
CalloutVariant,
- CheckmarkProps,
- ColorSampleProps,
- ColorSampleVariant,
- IconComponent,
- IconComponentProps,
- IconProps,
InfoAccent,
InfoProps,
- LabelVariant,
SidePanelInformationBannerProps,
+} from 'twenty-ui/feedback';
+export type {
+ IconComponent,
+ IconComponentProps,
+ IconProps,
TablerIconsProps,
-} from 'twenty-ui/display';
+} from 'twenty-ui/icon';
+export type { AppTooltipProps } from 'twenty-ui/surfaces';
+export type { LabelVariant } from 'twenty-ui/typography';
export * from 'twenty-ui/feedback';
export * from 'twenty-ui/input';
diff --git a/packages/twenty-ui/.size-limit.json b/packages/twenty-ui/.size-limit.json
index 7c52e5c70b2..e5be2efeef5 100644
--- a/packages/twenty-ui/.size-limit.json
+++ b/packages/twenty-ui/.size-limit.json
@@ -1,9 +1,9 @@
[
{
- "name": ". (root barrel)",
+ "name": ". (root barrel, tree-shaken single import)",
"path": "dist/index.mjs",
- "limit": "60 kB",
- "import": "*"
+ "limit": "130 kB",
+ "import": "{ Button }"
},
{
"name": "accessibility",
@@ -21,34 +21,44 @@
"limit": "188 kB"
},
{
- "name": "components",
- "path": "dist/components.mjs",
- "limit": "209 kB"
+ "name": "data-display",
+ "path": "dist/data-display.mjs",
+ "limit": "170 kB"
},
{
- "name": "display",
- "path": "dist/display.mjs",
- "limit": "509 kB"
+ "name": "typography",
+ "path": "dist/typography.mjs",
+ "limit": "50 kB"
+ },
+ {
+ "name": "icon",
+ "path": "dist/icon.mjs",
+ "limit": "290 kB"
+ },
+ {
+ "name": "surfaces",
+ "path": "dist/surfaces.mjs",
+ "limit": "100 kB"
},
{
"name": "feedback",
"path": "dist/feedback.mjs",
- "limit": "164 kB"
+ "limit": "210 kB"
},
{
"name": "input",
"path": "dist/input.mjs",
- "limit": "278 kB"
+ "limit": "230 kB"
},
{
"name": "layout",
"path": "dist/layout.mjs",
- "limit": "230 kB"
+ "limit": "60 kB"
},
{
"name": "navigation",
"path": "dist/navigation.mjs",
- "limit": "219 kB"
+ "limit": "180 kB"
},
{
"name": "json-visualizer",
@@ -68,7 +78,7 @@
{
"name": "utilities",
"path": "dist/utilities.mjs",
- "limit": "217 kB"
+ "limit": "90 kB"
},
{
"name": "style.css",
diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json
index a2c8313250e..175007843c0 100644
--- a/packages/twenty-ui/package.json
+++ b/packages/twenty-ui/package.json
@@ -93,17 +93,19 @@
"dist",
"accessibility",
"assets",
- "components",
- "display",
+ "data-display",
"feedback",
+ "icon",
"input",
"json-visualizer",
"layout",
"navigation",
"styles",
+ "surfaces",
"testing",
"theme",
"theme-constants",
+ "typography",
"utilities"
],
"exports": {
@@ -125,21 +127,21 @@
"import": "./dist/assets.mjs",
"require": "./dist/assets.cjs"
},
- "./components": {
- "types": "./dist/components/index.d.ts",
- "import": "./dist/components.mjs",
- "require": "./dist/components.cjs"
- },
- "./display": {
- "types": "./dist/display/index.d.ts",
- "import": "./dist/display.mjs",
- "require": "./dist/display.cjs"
+ "./data-display": {
+ "types": "./dist/data-display/index.d.ts",
+ "import": "./dist/data-display.mjs",
+ "require": "./dist/data-display.cjs"
},
"./feedback": {
"types": "./dist/feedback/index.d.ts",
"import": "./dist/feedback.mjs",
"require": "./dist/feedback.cjs"
},
+ "./icon": {
+ "types": "./dist/icon/index.d.ts",
+ "import": "./dist/icon.mjs",
+ "require": "./dist/icon.cjs"
+ },
"./input": {
"types": "./dist/input/index.d.ts",
"import": "./dist/input.mjs",
@@ -165,6 +167,11 @@
"import": "./dist/styles.mjs",
"require": "./dist/styles.cjs"
},
+ "./surfaces": {
+ "types": "./dist/surfaces/index.d.ts",
+ "import": "./dist/surfaces.mjs",
+ "require": "./dist/surfaces.cjs"
+ },
"./testing": {
"types": "./dist/testing/index.d.ts",
"import": "./dist/testing.mjs",
@@ -180,6 +187,11 @@
"import": "./dist/theme-constants.mjs",
"require": "./dist/theme-constants.cjs"
},
+ "./typography": {
+ "types": "./dist/typography/index.d.ts",
+ "import": "./dist/typography.mjs",
+ "require": "./dist/typography.cjs"
+ },
"./utilities": {
"types": "./dist/utilities/index.d.ts",
"import": "./dist/utilities.mjs",
@@ -194,15 +206,15 @@
"assets": [
"dist/assets/index.d.ts"
],
- "components": [
- "dist/components/index.d.ts"
- ],
- "display": [
- "dist/display/index.d.ts"
+ "data-display": [
+ "dist/data-display/index.d.ts"
],
"feedback": [
"dist/feedback/index.d.ts"
],
+ "icon": [
+ "dist/icon/index.d.ts"
+ ],
"input": [
"dist/input/index.d.ts"
],
@@ -218,6 +230,9 @@
"styles": [
"dist/styles/index.d.ts"
],
+ "surfaces": [
+ "dist/surfaces/index.d.ts"
+ ],
"testing": [
"dist/testing/index.d.ts"
],
@@ -227,6 +242,9 @@
"theme-constants": [
"dist/theme-constants/index.d.ts"
],
+ "typography": [
+ "dist/typography/index.d.ts"
+ ],
"utilities": [
"dist/utilities/index.d.ts"
]
diff --git a/packages/twenty-ui/project.json b/packages/twenty-ui/project.json
index 409cfcb5fc3..6ed5f3a7c91 100644
--- a/packages/twenty-ui/project.json
+++ b/packages/twenty-ui/project.json
@@ -13,12 +13,12 @@
"{projectRoot}/accessibility/dist",
"{projectRoot}/assets/package.json",
"{projectRoot}/assets/dist",
- "{projectRoot}/components/package.json",
- "{projectRoot}/components/dist",
- "{projectRoot}/display/package.json",
- "{projectRoot}/display/dist",
+ "{projectRoot}/data-display/package.json",
+ "{projectRoot}/data-display/dist",
"{projectRoot}/feedback/package.json",
"{projectRoot}/feedback/dist",
+ "{projectRoot}/icon/package.json",
+ "{projectRoot}/icon/dist",
"{projectRoot}/input/package.json",
"{projectRoot}/input/dist",
"{projectRoot}/json-visualizer/package.json",
@@ -29,12 +29,16 @@
"{projectRoot}/navigation/dist",
"{projectRoot}/styles/package.json",
"{projectRoot}/styles/dist",
+ "{projectRoot}/surfaces/package.json",
+ "{projectRoot}/surfaces/dist",
"{projectRoot}/testing/package.json",
"{projectRoot}/testing/dist",
"{projectRoot}/theme/package.json",
"{projectRoot}/theme/dist",
"{projectRoot}/theme-constants/package.json",
"{projectRoot}/theme-constants/dist",
+ "{projectRoot}/typography/package.json",
+ "{projectRoot}/typography/dist",
"{projectRoot}/utilities/package.json",
"{projectRoot}/utilities/dist"
]
@@ -44,6 +48,8 @@
"cache": true,
"inputs": ["production", "{projectRoot}/scripts/generateBarrels.ts"],
"outputs": [
+ "{projectRoot}/src/index.ts",
+ "{projectRoot}/src/individual-entry.ts",
"{projectRoot}/src/**/*/index.ts",
"{projectRoot}/package.json"
],
diff --git a/packages/twenty-ui/scripts/generateBarrels.ts b/packages/twenty-ui/scripts/generateBarrels.ts
index 935195c7e75..814f94fc4c6 100644
--- a/packages/twenty-ui/scripts/generateBarrels.ts
+++ b/packages/twenty-ui/scripts/generateBarrels.ts
@@ -279,6 +279,8 @@ const EXCLUDED_DIRECTORIES = [
'**/__mocks__/**',
'**/__stories__/**',
'**/internal/**',
+ '**/internals/**',
+ '**/parts/**',
] as const;
function getTypeScriptFiles(
directoryPath: string,
@@ -491,6 +493,38 @@ const retrieveExportsByBarrel = (barrelDirectories: string[]) => {
});
};
+const ROOT_BARREL_EXCLUDED_MODULES = ['assets', 'styles', 'testing'];
+const INDIVIDUAL_ENTRY_FILENAME = 'individual-entry';
+
+const getRootBarrelModuleNames = (moduleDirectories: string[]) =>
+ moduleDirectories
+ .map(getLastPathFolder)
+ .filter((moduleName) => !ROOT_BARREL_EXCLUDED_MODULES.includes(moduleName));
+
+const generateRootBarrel = (
+ moduleDirectories: string[],
+): createTypeScriptFileArgs => {
+ const content = [
+ "import './styles/base/reset.scss';",
+ '',
+ ...getRootBarrelModuleNames(moduleDirectories).map(
+ (moduleName) => `export * from './${moduleName}';`,
+ ),
+ ].join('\n');
+
+ return { path: SRC_PATH, content, filename: INDEX_FILENAME };
+};
+
+const generateIndividualEntry = (
+ moduleDirectories: string[],
+): createTypeScriptFileArgs => {
+ const content = getRootBarrelModuleNames(moduleDirectories)
+ .map((moduleName) => `export * from './${moduleName}';`)
+ .join('\n');
+
+ return { path: SRC_PATH, content, filename: INDIVIDUAL_ENTRY_FILENAME };
+};
+
const main = () => {
const moduleDirectories = getSubDirectoryPaths(SRC_PATH);
const exportsByBarrel = retrieveExportsByBarrel(moduleDirectories);
@@ -503,5 +537,7 @@ const main = () => {
updateNxProjectConfigurationBuildOutputs(nxBuildOutputsPath);
writeInPackageJson(packageJsonConfig);
moduleIndexFiles.forEach(createTypeScriptFile);
+ createTypeScriptFile(generateRootBarrel(moduleDirectories));
+ createTypeScriptFile(generateIndividualEntry(moduleDirectories));
};
main();
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
deleted file mode 100644
index cecc41633de..00000000000
--- a/packages/twenty-ui/src/components/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * _____ _
- *|_ _|_ _____ _ __ | |_ _ _
- * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
- * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
- * |_| \_/\_/ \___|_| |_|\__|\__, |
- * |___/
- */
-
-export type { AvatarOrIconProps } from './avatar-or-icon/AvatarOrIcon';
-export { AvatarOrIcon } from './avatar-or-icon/AvatarOrIcon';
-export type { ChipProps } from './chip/Chip';
-export { ChipSize, ChipAccent, ChipVariant, Chip } from './chip/Chip';
-export { LINK_CHIP_CLICK_OUTSIDE_ID } from './chip/constants/LinkChipClickOutsideId';
-export type { LinkChipProps } from './chip/LinkChip';
-export { LinkChip } from './chip/LinkChip';
-export { Pill } from './Pill/Pill';
-export type { TagColor } from './tag/Tag';
-export { Tag } from './tag/Tag';
diff --git a/packages/twenty-ui/src/display/checkmark/components/AnimatedCheckmark.tsx b/packages/twenty-ui/src/data-display/AnimatedCheckmark/AnimatedCheckmark.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/checkmark/components/AnimatedCheckmark.tsx
rename to packages/twenty-ui/src/data-display/AnimatedCheckmark/AnimatedCheckmark.tsx
diff --git a/packages/twenty-ui/src/display/avatar/components/Avatar.module.scss b/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/Avatar.module.scss
rename to packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss
diff --git a/packages/twenty-ui/src/display/avatar/components/Avatar.module.scss.d.ts b/packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/Avatar.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Avatar/Avatar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/avatar/components/Avatar.tsx b/packages/twenty-ui/src/data-display/Avatar/Avatar.tsx
similarity index 92%
rename from packages/twenty-ui/src/display/avatar/components/Avatar.tsx
rename to packages/twenty-ui/src/data-display/Avatar/Avatar.tsx
index 56c35204783..8163ba60a57 100644
--- a/packages/twenty-ui/src/display/avatar/components/Avatar.tsx
+++ b/packages/twenty-ui/src/data-display/Avatar/Avatar.tsx
@@ -3,10 +3,10 @@ import { clsx } from 'clsx';
import { useAtom } from 'jotai';
import { useContext } from 'react';
-import { invalidAvatarUrlsAtomV2 } from '@ui/display/avatar/components/states/invalidAvatarUrlsAtomV2';
-import { type AvatarSize } from '@ui/display/avatar/types/AvatarSize';
-import { type AvatarType } from '@ui/display/avatar/types/AvatarType';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { invalidAvatarUrlsAtomV2 } from '@ui/data-display/Avatar/states/invalidAvatarUrlsAtomV2';
+import { type AvatarSize } from '@ui/data-display/Avatar/types/AvatarSize';
+import { type AvatarType } from '@ui/data-display/Avatar/types/AvatarType';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
import { stringToThemeColorP3String } from '@ui/utilities';
import { REACT_APP_SERVER_BASE_URL } from '@ui/utilities/config';
diff --git a/packages/twenty-ui/src/display/avatar/components/__stories__/Avatar.stories.tsx b/packages/twenty-ui/src/data-display/Avatar/__stories__/Avatar.stories.tsx
similarity index 90%
rename from packages/twenty-ui/src/display/avatar/components/__stories__/Avatar.stories.tsx
rename to packages/twenty-ui/src/data-display/Avatar/__stories__/Avatar.stories.tsx
index 2d3146926e5..38fb5c2c879 100644
--- a/packages/twenty-ui/src/display/avatar/components/__stories__/Avatar.stories.tsx
+++ b/packages/twenty-ui/src/data-display/Avatar/__stories__/Avatar.stories.tsx
@@ -6,10 +6,10 @@ import {
JotaiRootDecorator,
} from '@ui/testing';
-import { Avatar } from '../Avatar';
+import { Avatar } from '@ui/data-display/Avatar/Avatar';
const meta: Meta<typeof Avatar> = {
- title: 'Modules/Users/Avatar',
+ title: 'UI/Data Display/Avatar',
component: Avatar,
decorators: [ComponentDecorator, JotaiRootDecorator],
args: {
diff --git a/packages/twenty-ui/src/display/avatar/constants/AvatarPropertiesBySize.ts b/packages/twenty-ui/src/data-display/Avatar/constants/AvatarPropertiesBySize.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/constants/AvatarPropertiesBySize.ts
rename to packages/twenty-ui/src/data-display/Avatar/constants/AvatarPropertiesBySize.ts
diff --git a/packages/twenty-ui/src/display/avatar/components/states/invalidAvatarUrlsAtomV2.ts b/packages/twenty-ui/src/data-display/Avatar/states/invalidAvatarUrlsAtomV2.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/states/invalidAvatarUrlsAtomV2.ts
rename to packages/twenty-ui/src/data-display/Avatar/states/invalidAvatarUrlsAtomV2.ts
diff --git a/packages/twenty-ui/src/display/avatar/types/AvatarSize.ts b/packages/twenty-ui/src/data-display/Avatar/types/AvatarSize.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/types/AvatarSize.ts
rename to packages/twenty-ui/src/data-display/Avatar/types/AvatarSize.ts
diff --git a/packages/twenty-ui/src/display/avatar/types/AvatarType.ts b/packages/twenty-ui/src/data-display/Avatar/types/AvatarType.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/types/AvatarType.ts
rename to packages/twenty-ui/src/data-display/Avatar/types/AvatarType.ts
diff --git a/packages/twenty-ui/src/display/avatar/components/AvatarGroup.module.scss b/packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/AvatarGroup.module.scss
rename to packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.module.scss
diff --git a/packages/twenty-ui/src/display/avatar/components/AvatarGroup.module.scss.d.ts b/packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/AvatarGroup.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/avatar/components/AvatarGroup.tsx b/packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/avatar/components/AvatarGroup.tsx
rename to packages/twenty-ui/src/data-display/AvatarGroup/AvatarGroup.tsx
diff --git a/packages/twenty-ui/src/display/avatar/components/__stories__/AvatarGroup.stories.tsx b/packages/twenty-ui/src/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
similarity index 83%
rename from packages/twenty-ui/src/display/avatar/components/__stories__/AvatarGroup.stories.tsx
rename to packages/twenty-ui/src/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
index 6d8833f83bc..cd1ce6ec84f 100644
--- a/packages/twenty-ui/src/display/avatar/components/__stories__/AvatarGroup.stories.tsx
+++ b/packages/twenty-ui/src/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Avatar, type AvatarProps } from '@ui/display/avatar/components/Avatar';
-import { type AvatarSize } from '@ui/display/avatar/types/AvatarSize';
-import { type AvatarType } from '@ui/display/avatar/types/AvatarType';
+import { Avatar, type AvatarProps } from '@ui/data-display/Avatar/Avatar';
+import { type AvatarSize } from '@ui/data-display/Avatar/types/AvatarSize';
+import { type AvatarType } from '@ui/data-display/Avatar/types/AvatarType';
import {
AVATAR_URL_MOCK,
CatalogDecorator,
@@ -10,7 +10,10 @@ import {
JotaiRootDecorator,
} from '@ui/testing';
-import { AvatarGroup, type AvatarGroupProps } from '../AvatarGroup';
+import {
+ AvatarGroup,
+ type AvatarGroupProps,
+} from '@ui/data-display/AvatarGroup/AvatarGroup';
const makeAvatar = (userName: string, props: Partial<AvatarProps> = {}) => (
// oxlint-disable-next-line react/jsx-props-no-spreading
@@ -28,7 +31,7 @@ const getAvatars = (commonProps: Partial<AvatarProps> = {}) => [
const meta: Meta<
AvatarGroupProps & AvatarProps & { numberOfAvatars?: number }
> = {
- title: 'Modules/Users/AvatarGroup',
+ title: 'UI/Data Display/AvatarGroup',
component: AvatarGroup,
render: ({ numberOfAvatars = 5, ...args }) => (
<AvatarGroup avatars={getAvatars(args).slice(0, numberOfAvatars)} />
diff --git a/packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.module.scss b/packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.module.scss
rename to packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.module.scss
diff --git a/packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.module.scss.d.ts b/packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.tsx b/packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.tsx
similarity index 90%
rename from packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.tsx
rename to packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.tsx
index 7efd3ef3624..1c597edda26 100644
--- a/packages/twenty-ui/src/components/avatar-or-icon/AvatarOrIcon.tsx
+++ b/packages/twenty-ui/src/data-display/AvatarOrIcon/AvatarOrIcon.tsx
@@ -1,6 +1,6 @@
-import { Avatar } from '@ui/display/avatar/components/Avatar';
-import { type AvatarType } from '@ui/display/avatar/types/AvatarType';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { Avatar } from '@ui/data-display/Avatar/Avatar';
+import { type AvatarType } from '@ui/data-display/Avatar/types/AvatarType';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
import { type Nullable } from '@ui/utilities';
import { useContext } from 'react';
diff --git a/packages/twenty-ui/src/components/avatar-or-icon/__stories__/AvatarOrIcon.stories.tsx b/packages/twenty-ui/src/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
similarity index 87%
rename from packages/twenty-ui/src/components/avatar-or-icon/__stories__/AvatarOrIcon.stories.tsx
rename to packages/twenty-ui/src/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
index 8a270d35fb7..82ae5d92dea 100644
--- a/packages/twenty-ui/src/components/avatar-or-icon/__stories__/AvatarOrIcon.stories.tsx
+++ b/packages/twenty-ui/src/data-display/AvatarOrIcon/__stories__/AvatarOrIcon.stories.tsx
@@ -1,14 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBuildingSkyscraper, IconUser } from '@ui/display';
+import { IconBuildingSkyscraper, IconUser } from '@ui/icon';
import {
AVATAR_URL_MOCK,
ComponentDecorator,
JotaiRootDecorator,
} from '@ui/testing';
-import { AvatarOrIcon } from '../AvatarOrIcon';
+import { AvatarOrIcon } from '@ui/data-display/AvatarOrIcon/AvatarOrIcon';
const meta: Meta<typeof AvatarOrIcon> = {
- title: 'UI/Components/AvatarOrIcon',
+ title: 'UI/Data Display/AvatarOrIcon',
component: AvatarOrIcon,
decorators: [ComponentDecorator, JotaiRootDecorator],
};
diff --git a/packages/twenty-ui/src/display/checkmark/components/Checkmark.module.scss b/packages/twenty-ui/src/data-display/Checkmark/Checkmark.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/checkmark/components/Checkmark.module.scss
rename to packages/twenty-ui/src/data-display/Checkmark/Checkmark.module.scss
diff --git a/packages/twenty-ui/src/display/checkmark/components/Checkmark.module.scss.d.ts b/packages/twenty-ui/src/data-display/Checkmark/Checkmark.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/checkmark/components/Checkmark.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Checkmark/Checkmark.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/checkmark/components/Checkmark.tsx b/packages/twenty-ui/src/data-display/Checkmark/Checkmark.tsx
similarity index 88%
rename from packages/twenty-ui/src/display/checkmark/components/Checkmark.tsx
rename to packages/twenty-ui/src/data-display/Checkmark/Checkmark.tsx
index abd3d75a73c..9e2582c45c0 100644
--- a/packages/twenty-ui/src/display/checkmark/components/Checkmark.tsx
+++ b/packages/twenty-ui/src/data-display/Checkmark/Checkmark.tsx
@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
import { clsx } from 'clsx';
-import { IconCheck } from '@ui/display/icon/components/TablerIcons';
+import { IconCheck } from '@ui/icon/components/TablerIcons';
import { ThemeContext } from '@ui/theme-constants';
import styles from './Checkmark.module.scss';
diff --git a/packages/twenty-ui/src/display/checkmark/components/__stories__/Checkmark.stories.tsx b/packages/twenty-ui/src/data-display/Checkmark/__stories__/Checkmark.stories.tsx
similarity index 82%
rename from packages/twenty-ui/src/display/checkmark/components/__stories__/Checkmark.stories.tsx
rename to packages/twenty-ui/src/data-display/Checkmark/__stories__/Checkmark.stories.tsx
index 5ca43502410..712c294d3c7 100644
--- a/packages/twenty-ui/src/display/checkmark/components/__stories__/Checkmark.stories.tsx
+++ b/packages/twenty-ui/src/data-display/Checkmark/__stories__/Checkmark.stories.tsx
@@ -2,10 +2,10 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { Checkmark } from '../Checkmark';
+import { Checkmark } from '@ui/data-display/Checkmark/Checkmark';
const meta: Meta<typeof Checkmark> = {
- title: 'UI/Display/Checkmark',
+ title: 'UI/Data Display/Checkmark',
component: Checkmark,
decorators: [ComponentDecorator],
};
diff --git a/packages/twenty-ui/src/components/chip/Chip.module.scss b/packages/twenty-ui/src/data-display/Chip/Chip.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/chip/Chip.module.scss
rename to packages/twenty-ui/src/data-display/Chip/Chip.module.scss
diff --git a/packages/twenty-ui/src/components/chip/Chip.module.scss.d.ts b/packages/twenty-ui/src/data-display/Chip/Chip.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/chip/Chip.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Chip/Chip.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/chip/Chip.tsx b/packages/twenty-ui/src/data-display/Chip/Chip.tsx
similarity index 97%
rename from packages/twenty-ui/src/components/chip/Chip.tsx
rename to packages/twenty-ui/src/data-display/Chip/Chip.tsx
index ac91fc78509..58b3fe8f030 100644
--- a/packages/twenty-ui/src/components/chip/Chip.tsx
+++ b/packages/twenty-ui/src/data-display/Chip/Chip.tsx
@@ -1,7 +1,7 @@
import { type ReactNode } from 'react';
import { isNonEmptyString } from '@sniptt/guards';
-import { OverflowingTextWithTooltip } from '@ui/display/tooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from '@ui/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { clsx } from 'clsx';
import { isDefined } from '@ui/utilities/utils/isDefined';
diff --git a/packages/twenty-ui/src/components/chip/__stories__/Chip.stories.tsx b/packages/twenty-ui/src/data-display/Chip/__stories__/Chip.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/components/chip/__stories__/Chip.stories.tsx
rename to packages/twenty-ui/src/data-display/Chip/__stories__/Chip.stories.tsx
index 1a4870ed7b8..6f683edca04 100644
--- a/packages/twenty-ui/src/components/chip/__stories__/Chip.stories.tsx
+++ b/packages/twenty-ui/src/data-display/Chip/__stories__/Chip.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconUser, IconX } from '@ui/display';
-import { Avatar } from '@ui/display/avatar/components/Avatar';
+import { IconUser, IconX } from '@ui/icon';
+import { Avatar } from '@ui/data-display/Avatar/Avatar';
import {
CatalogDecorator,
@@ -8,10 +8,15 @@ import {
ComponentDecorator,
} from '@ui/testing';
-import { Chip, ChipAccent, ChipSize, ChipVariant } from '../Chip';
+import {
+ Chip,
+ ChipAccent,
+ ChipSize,
+ ChipVariant,
+} from '@ui/data-display/Chip/Chip';
const meta: Meta<typeof Chip> = {
- title: 'UI/Components/Chip/Chip',
+ title: 'UI/Data Display/Chip',
component: Chip,
};
diff --git a/packages/twenty-ui/src/components/chip/constants/LinkChipClickOutsideId.ts b/packages/twenty-ui/src/data-display/Chip/constants/LinkChipClickOutsideId.ts
similarity index 100%
rename from packages/twenty-ui/src/components/chip/constants/LinkChipClickOutsideId.ts
rename to packages/twenty-ui/src/data-display/Chip/constants/LinkChipClickOutsideId.ts
diff --git a/packages/twenty-ui/src/display/color/components/ColorSample.module.scss b/packages/twenty-ui/src/data-display/ColorSample/ColorSample.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/color/components/ColorSample.module.scss
rename to packages/twenty-ui/src/data-display/ColorSample/ColorSample.module.scss
diff --git a/packages/twenty-ui/src/display/color/components/ColorSample.module.scss.d.ts b/packages/twenty-ui/src/data-display/ColorSample/ColorSample.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/color/components/ColorSample.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/ColorSample/ColorSample.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/color/components/ColorSample.tsx b/packages/twenty-ui/src/data-display/ColorSample/ColorSample.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/color/components/ColorSample.tsx
rename to packages/twenty-ui/src/data-display/ColorSample/ColorSample.tsx
diff --git a/packages/twenty-ui/src/display/color/components/__stories__/ColorSample.stories.tsx b/packages/twenty-ui/src/data-display/ColorSample/__stories__/ColorSample.stories.tsx
similarity index 81%
rename from packages/twenty-ui/src/display/color/components/__stories__/ColorSample.stories.tsx
rename to packages/twenty-ui/src/data-display/ColorSample/__stories__/ColorSample.stories.tsx
index 22f966796b5..8b0df8a1eee 100644
--- a/packages/twenty-ui/src/display/color/components/__stories__/ColorSample.stories.tsx
+++ b/packages/twenty-ui/src/data-display/ColorSample/__stories__/ColorSample.stories.tsx
@@ -2,10 +2,10 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { ColorSample } from '../ColorSample';
+import { ColorSample } from '@ui/data-display/ColorSample/ColorSample';
const meta: Meta<typeof ColorSample> = {
- title: 'UI/Display/Color/ColorSample',
+ title: 'UI/Data Display/ColorSample',
component: ColorSample,
decorators: [ComponentDecorator],
args: { colorName: 'green' },
diff --git a/packages/twenty-ui/src/display/command-block/components/CommandBlock.module.scss b/packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/command-block/components/CommandBlock.module.scss
rename to packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.module.scss
diff --git a/packages/twenty-ui/src/display/command-block/components/CommandBlock.module.scss.d.ts b/packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/command-block/components/CommandBlock.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/command-block/components/CommandBlock.tsx b/packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/command-block/components/CommandBlock.tsx
rename to packages/twenty-ui/src/data-display/CommandBlock/CommandBlock.tsx
diff --git a/packages/twenty-ui/src/components/chip/LinkChip.module.scss b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/chip/LinkChip.module.scss
rename to packages/twenty-ui/src/data-display/LinkChip/LinkChip.module.scss
diff --git a/packages/twenty-ui/src/components/chip/LinkChip.module.scss.d.ts b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/chip/LinkChip.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/LinkChip/LinkChip.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/chip/LinkChip.tsx b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx
similarity index 93%
rename from packages/twenty-ui/src/components/chip/LinkChip.tsx
rename to packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx
index d0559575237..24d830cd05e 100644
--- a/packages/twenty-ui/src/components/chip/LinkChip.tsx
+++ b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx
@@ -4,8 +4,8 @@ import {
type ChipProps,
ChipSize,
ChipVariant,
-} from '@ui/components/chip/Chip';
-import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@ui/components/chip/constants/LinkChipClickOutsideId';
+} from '@ui/data-display/Chip/Chip';
+import { LINK_CHIP_CLICK_OUTSIDE_ID } from '@ui/data-display/Chip/constants/LinkChipClickOutsideId';
import { type TriggerEventType, useMouseDownNavigation } from '@ui/utilities';
import { type MouseEvent } from 'react';
import { Link } from 'react-router-dom';
diff --git a/packages/twenty-ui/src/components/chip/__stories__/LinkChip.stories.tsx b/packages/twenty-ui/src/data-display/LinkChip/__stories__/LinkChip.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/components/chip/__stories__/LinkChip.stories.tsx
rename to packages/twenty-ui/src/data-display/LinkChip/__stories__/LinkChip.stories.tsx
index e6956cf1f71..652748f20c5 100644
--- a/packages/twenty-ui/src/components/chip/__stories__/LinkChip.stories.tsx
+++ b/packages/twenty-ui/src/data-display/LinkChip/__stories__/LinkChip.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconUser, IconX } from '@ui/display';
-import { Avatar } from '@ui/display/avatar/components/Avatar';
+import { IconUser, IconX } from '@ui/icon';
+import { Avatar } from '@ui/data-display/Avatar/Avatar';
import {
CatalogDecorator,
type CatalogStory,
@@ -8,11 +8,11 @@ import {
} from '@ui/testing';
import { MemoryRouter } from 'react-router-dom';
-import { ChipAccent, ChipSize, ChipVariant } from '../Chip';
-import { LinkChip } from '../LinkChip';
+import { ChipAccent, ChipSize, ChipVariant } from '@ui/data-display/Chip/Chip';
+import { LinkChip } from '@ui/data-display/LinkChip/LinkChip';
const meta: Meta<typeof LinkChip> = {
- title: 'UI/Components/Chip/LinkChip',
+ title: 'UI/Data Display/LinkChip',
component: LinkChip,
decorators: [
(Story) => (
diff --git a/packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.module.scss b/packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.module.scss
rename to packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.module.scss
diff --git a/packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.module.scss.d.ts b/packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.tsx b/packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/notification-counter/components/NotificationCounter.tsx
rename to packages/twenty-ui/src/data-display/NotificationCounter/NotificationCounter.tsx
diff --git a/packages/twenty-ui/src/components/Pill/Pill.module.scss b/packages/twenty-ui/src/data-display/Pill/Pill.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/Pill/Pill.module.scss
rename to packages/twenty-ui/src/data-display/Pill/Pill.module.scss
diff --git a/packages/twenty-ui/src/components/Pill/Pill.module.scss.d.ts b/packages/twenty-ui/src/data-display/Pill/Pill.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/Pill/Pill.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Pill/Pill.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/Pill/Pill.tsx b/packages/twenty-ui/src/data-display/Pill/Pill.tsx
similarity index 87%
rename from packages/twenty-ui/src/components/Pill/Pill.tsx
rename to packages/twenty-ui/src/data-display/Pill/Pill.tsx
index 894639dc127..dc856d6431e 100644
--- a/packages/twenty-ui/src/components/Pill/Pill.tsx
+++ b/packages/twenty-ui/src/data-display/Pill/Pill.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { clsx } from 'clsx';
import styles from './Pill.module.scss';
diff --git a/packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts b/packages/twenty-ui/src/data-display/Pill/__stories__/Pill.stories.ts
similarity index 85%
rename from packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts
rename to packages/twenty-ui/src/data-display/Pill/__stories__/Pill.stories.ts
index 4dbd4738422..a7e518dca7b 100644
--- a/packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts
+++ b/packages/twenty-ui/src/data-display/Pill/__stories__/Pill.stories.ts
@@ -1,10 +1,10 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Pill } from '@ui/components/Pill/Pill';
+import { Pill } from '@ui/data-display/Pill/Pill';
import { ComponentDecorator } from '../../../testing/decorators/ComponentDecorator';
const meta: Meta<typeof Pill> = {
- title: 'UI/Display/Pill',
+ title: 'UI/Data Display/Pill',
component: Pill,
decorators: [ComponentDecorator],
args: {
diff --git a/packages/twenty-ui/src/display/status/components/Status.module.scss b/packages/twenty-ui/src/data-display/Status/Status.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/status/components/Status.module.scss
rename to packages/twenty-ui/src/data-display/Status/Status.module.scss
diff --git a/packages/twenty-ui/src/display/status/components/Status.module.scss.d.ts b/packages/twenty-ui/src/data-display/Status/Status.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/status/components/Status.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Status/Status.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/status/components/Status.tsx b/packages/twenty-ui/src/data-display/Status/Status.tsx
similarity index 94%
rename from packages/twenty-ui/src/display/status/components/Status.tsx
rename to packages/twenty-ui/src/data-display/Status/Status.tsx
index b667477de6b..7790cd04e8b 100644
--- a/packages/twenty-ui/src/display/status/components/Status.tsx
+++ b/packages/twenty-ui/src/data-display/Status/Status.tsx
@@ -1,6 +1,6 @@
import { clsx } from 'clsx';
-import { Loader } from '@ui/feedback/loader/components/Loader';
+import { Loader } from '@ui/feedback/Loader/Loader';
import { type ThemeColor } from '@ui/theme';
import { themeCssVariables } from '@ui/theme-constants';
import { parseThemeColor } from '@ui/utilities';
diff --git a/packages/twenty-ui/src/display/status/components/__stories__/Status.stories.tsx b/packages/twenty-ui/src/data-display/Status/__stories__/Status.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/display/status/components/__stories__/Status.stories.tsx
rename to packages/twenty-ui/src/data-display/Status/__stories__/Status.stories.tsx
index fa785b3e762..ee96c0edbc9 100644
--- a/packages/twenty-ui/src/display/status/components/__stories__/Status.stories.tsx
+++ b/packages/twenty-ui/src/data-display/Status/__stories__/Status.stories.tsx
@@ -7,10 +7,10 @@ import {
import { type ThemeColor, MAIN_COLOR_NAMES } from '@ui/theme';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { Status } from '../Status';
+import { Status } from '@ui/data-display/Status/Status';
const meta: Meta<typeof Status> = {
- title: 'UI/Display/Status/Status',
+ title: 'UI/Data Display/Status',
component: Status,
args: {
text: 'Urgent',
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.module.scss b/packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.module.scss
rename to packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.module.scss.d.ts b/packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.tsx b/packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.tsx
rename to packages/twenty-ui/src/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer.tsx
diff --git a/packages/twenty-ui/src/components/tag/Tag.module.scss b/packages/twenty-ui/src/data-display/Tag/Tag.module.scss
similarity index 100%
rename from packages/twenty-ui/src/components/tag/Tag.module.scss
rename to packages/twenty-ui/src/data-display/Tag/Tag.module.scss
diff --git a/packages/twenty-ui/src/components/tag/Tag.module.scss.d.ts b/packages/twenty-ui/src/data-display/Tag/Tag.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/components/tag/Tag.module.scss.d.ts
rename to packages/twenty-ui/src/data-display/Tag/Tag.module.scss.d.ts
diff --git a/packages/twenty-ui/src/components/tag/Tag.tsx b/packages/twenty-ui/src/data-display/Tag/Tag.tsx
similarity index 92%
rename from packages/twenty-ui/src/components/tag/Tag.tsx
rename to packages/twenty-ui/src/data-display/Tag/Tag.tsx
index 7b2439c0c6f..cdca55b3471 100644
--- a/packages/twenty-ui/src/components/tag/Tag.tsx
+++ b/packages/twenty-ui/src/data-display/Tag/Tag.tsx
@@ -1,5 +1,5 @@
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
-import { OverflowingTextWithTooltip } from '@ui/display/tooltip/OverflowingTextWithTooltip';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+import { OverflowingTextWithTooltip } from '@ui/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext, themeCssVariables } from '@ui/theme-constants';
import { clsx } from 'clsx';
diff --git a/packages/twenty-ui/src/components/tag/__stories__/Tag.stories.tsx b/packages/twenty-ui/src/data-display/Tag/__stories__/Tag.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/components/tag/__stories__/Tag.stories.tsx
rename to packages/twenty-ui/src/data-display/Tag/__stories__/Tag.stories.tsx
index ce27486d448..611a547addd 100644
--- a/packages/twenty-ui/src/components/tag/__stories__/Tag.stories.tsx
+++ b/packages/twenty-ui/src/data-display/Tag/__stories__/Tag.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { IconUser } from '@ui/display/icon/components/TablerIcons';
+import { IconUser } from '@ui/icon/components/TablerIcons';
import {
CatalogDecorator,
type CatalogStory,
@@ -9,10 +9,10 @@ import {
} from '@ui/testing';
import { type ThemeColor, MAIN_COLOR_NAMES } from '@ui/theme';
-import { Tag } from '../Tag';
+import { Tag } from '@ui/data-display/Tag/Tag';
const meta: Meta<typeof Tag> = {
- title: 'UI/Display/Tag/Tag',
+ title: 'UI/Data Display/Tag',
component: Tag,
args: {
text: 'Urgent',
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsx b/packages/twenty-ui/src/data-display/TintedIconTile/TintedIconTile.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsx
rename to packages/twenty-ui/src/data-display/TintedIconTile/TintedIconTile.tsx
index d0f4a45161e..3f1c9eae5c5 100644
--- a/packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsx
+++ b/packages/twenty-ui/src/data-display/TintedIconTile/TintedIconTile.tsx
@@ -1,6 +1,6 @@
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
-import { StyledTintedIconTileContainer } from '@ui/display/tinted-icon-tile/components/StyledTintedIconTileContainer';
-import { getIconTileColorShades } from '@ui/display/tinted-icon-tile/utils/getIconTileColorShades';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+import { StyledTintedIconTileContainer } from '@ui/data-display/StyledTintedIconTileContainer/StyledTintedIconTileContainer';
+import { getIconTileColorShades } from '@ui/data-display/TintedIconTile/utils/getIconTileColorShades';
import { DEFAULT_THEME_COLOR_FALLBACK } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant.ts b/packages/twenty-ui/src/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts
similarity index 100%
rename from packages/twenty-ui/src/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant.ts
rename to packages/twenty-ui/src/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant.ts
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/internal/utils/getColorFromTheme.ts b/packages/twenty-ui/src/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts
similarity index 100%
rename from packages/twenty-ui/src/display/tinted-icon-tile/internal/utils/getColorFromTheme.ts
rename to packages/twenty-ui/src/data-display/TintedIconTile/internal/utils/getColorFromTheme.ts
diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.ts b/packages/twenty-ui/src/data-display/TintedIconTile/utils/getIconTileColorShades.ts
similarity index 73%
rename from packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.ts
rename to packages/twenty-ui/src/data-display/TintedIconTile/utils/getIconTileColorShades.ts
index 0c225e87a6d..a3ceb149cea 100644
--- a/packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.ts
+++ b/packages/twenty-ui/src/data-display/TintedIconTile/utils/getIconTileColorShades.ts
@@ -1,5 +1,5 @@
-import { TINTED_ICON_TILE_COLOR_SHADES } from '@ui/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant';
-import { getColorFromTheme } from '@ui/display/tinted-icon-tile/internal/utils/getColorFromTheme';
+import { TINTED_ICON_TILE_COLOR_SHADES } from '@ui/data-display/TintedIconTile/internal/constants/tintedIconTileColorShades.constant';
+import { getColorFromTheme } from '@ui/data-display/TintedIconTile/internal/utils/getColorFromTheme';
import { parseThemeColor } from '@ui/utilities';
export type IconTileColorShades = {
diff --git a/packages/twenty-ui/src/data-display/index.ts b/packages/twenty-ui/src/data-display/index.ts
new file mode 100644
index 00000000000..0f217f1482e
--- /dev/null
+++ b/packages/twenty-ui/src/data-display/index.ts
@@ -0,0 +1,44 @@
+/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
+ * |_| \_/\_/ \___|_| |_|\__|\__, |
+ * |___/
+ */
+
+export type { AnimatedCheckmarkProps } from './AnimatedCheckmark/AnimatedCheckmark';
+export { AnimatedCheckmark } from './AnimatedCheckmark/AnimatedCheckmark';
+export type { AvatarProps } from './Avatar/Avatar';
+export { Avatar } from './Avatar/Avatar';
+export { AVATAR_PROPERTIES_BY_SIZE } from './Avatar/constants/AvatarPropertiesBySize';
+export { invalidAvatarUrlsAtomV2 } from './Avatar/states/invalidAvatarUrlsAtomV2';
+export type { AvatarSize } from './Avatar/types/AvatarSize';
+export type { AvatarType } from './Avatar/types/AvatarType';
+export type { AvatarGroupProps } from './AvatarGroup/AvatarGroup';
+export { AvatarGroup } from './AvatarGroup/AvatarGroup';
+export type { AvatarOrIconProps } from './AvatarOrIcon/AvatarOrIcon';
+export { AvatarOrIcon } from './AvatarOrIcon/AvatarOrIcon';
+export type { CheckmarkProps } from './Checkmark/Checkmark';
+export { Checkmark } from './Checkmark/Checkmark';
+export type { ChipProps } from './Chip/Chip';
+export { ChipSize, ChipAccent, ChipVariant, Chip } from './Chip/Chip';
+export { LINK_CHIP_CLICK_OUTSIDE_ID } from './Chip/constants/LinkChipClickOutsideId';
+export type {
+ ColorSampleVariant,
+ ColorSampleProps,
+} from './ColorSample/ColorSample';
+export { ColorSample } from './ColorSample/ColorSample';
+export { CommandBlock } from './CommandBlock/CommandBlock';
+export type { LinkChipProps } from './LinkChip/LinkChip';
+export { LinkChip } from './LinkChip/LinkChip';
+export { NotificationCounter } from './NotificationCounter/NotificationCounter';
+export { Pill } from './Pill/Pill';
+export { Status } from './Status/Status';
+export { StyledTintedIconTileContainer } from './StyledTintedIconTileContainer/StyledTintedIconTileContainer';
+export type { TagColor } from './Tag/Tag';
+export { Tag } from './Tag/Tag';
+export type { TintedIconTileProps } from './TintedIconTile/TintedIconTile';
+export { TintedIconTile } from './TintedIconTile/TintedIconTile';
+export type { IconTileColorShades } from './TintedIconTile/utils/getIconTileColorShades';
+export { getIconTileColorShades } from './TintedIconTile/utils/getIconTileColorShades';
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.module.scss b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.module.scss
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.module.scss.d.ts b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.tsx b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx
similarity index 88%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.tsx
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx
index e2b2b275ea5..7857f943ca2 100644
--- a/packages/twenty-ui/src/layout/animated-placeholder/components/AnimatedPlaceholder.tsx
+++ b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/AnimatedPlaceholder.tsx
@@ -2,10 +2,10 @@ import { clsx } from 'clsx';
import { animate, motion, useMotionValue, useTransform } from 'framer-motion';
import { useContext, useEffect } from 'react';
-import { BACKGROUND } from '@ui/layout/animated-placeholder/constants/Background';
-import { DARK_BACKGROUND } from '@ui/layout/animated-placeholder/constants/DarkBackground';
-import { DARK_MOVING_IMAGE } from '@ui/layout/animated-placeholder/constants/DarkMovingImage';
-import { MOVING_IMAGE } from '@ui/layout/animated-placeholder/constants/MovingImage';
+import { BACKGROUND } from '@ui/feedback/AnimatedPlaceholder/constants/Background';
+import { DARK_BACKGROUND } from '@ui/feedback/AnimatedPlaceholder/constants/DarkBackground';
+import { DARK_MOVING_IMAGE } from '@ui/feedback/AnimatedPlaceholder/constants/DarkMovingImage';
+import { MOVING_IMAGE } from '@ui/feedback/AnimatedPlaceholder/constants/MovingImage';
import { ThemeContext } from '@ui/theme-constants';
import styles from './AnimatedPlaceholder.module.scss';
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/constants/Background.ts b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/Background.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/constants/Background.ts
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/Background.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/constants/DarkBackground.ts b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/DarkBackground.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/constants/DarkBackground.ts
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/DarkBackground.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/constants/DarkMovingImage.ts b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/DarkMovingImage.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/constants/DarkMovingImage.ts
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/DarkMovingImage.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/constants/MovingImage.ts b/packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/MovingImage.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/constants/MovingImage.ts
rename to packages/twenty-ui/src/feedback/AnimatedPlaceholder/constants/MovingImage.ts
diff --git a/packages/twenty-ui/src/display/banner/components/Banner.module.scss b/packages/twenty-ui/src/feedback/Banner/Banner.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/Banner.module.scss
rename to packages/twenty-ui/src/feedback/Banner/Banner.module.scss
diff --git a/packages/twenty-ui/src/display/banner/components/Banner.module.scss.d.ts b/packages/twenty-ui/src/feedback/Banner/Banner.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/Banner.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/Banner/Banner.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/banner/components/Banner.tsx b/packages/twenty-ui/src/feedback/Banner/Banner.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/Banner.tsx
rename to packages/twenty-ui/src/feedback/Banner/Banner.tsx
diff --git a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.module.scss b/packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.module.scss
rename to packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.module.scss
diff --git a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.module.scss.d.ts b/packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx b/packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.tsx
similarity index 91%
rename from packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx
rename to packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.tsx
index b6804e02e02..b768d48583b 100644
--- a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx
+++ b/packages/twenty-ui/src/feedback/Banner/__stories__/Banner.stories.tsx
@@ -1,14 +1,18 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconX } from '@ui/display';
+import { IconX } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { Button } from '../../../../input/button/components/Button/Button';
-import { IconButton } from '../../../../input/button/components/IconButton';
-import { Banner, type BannerColor, type BannerVariant } from '../Banner';
+import { Button } from '@ui/input/Button/Button';
+import { IconButton } from '@ui/input/IconButton/IconButton';
+import {
+ Banner,
+ type BannerColor,
+ type BannerVariant,
+} from '@ui/feedback/Banner/Banner';
import styles from './Banner.stories.module.scss';
@@ -41,7 +45,7 @@ const BannerCloseButton = ({
);
const meta: Meta<typeof Banner> = {
- title: 'UI/Layout/Banner/Banner',
+ title: 'UI/Feedback/Banner',
component: Banner,
argTypes: {
color: {
diff --git a/packages/twenty-ui/src/display/callout/Callout.module.scss b/packages/twenty-ui/src/feedback/Callout/Callout.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/callout/Callout.module.scss
rename to packages/twenty-ui/src/feedback/Callout/Callout.module.scss
diff --git a/packages/twenty-ui/src/display/callout/Callout.module.scss.d.ts b/packages/twenty-ui/src/feedback/Callout/Callout.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/callout/Callout.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/Callout/Callout.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/callout/Callout.tsx b/packages/twenty-ui/src/feedback/Callout/Callout.tsx
similarity index 94%
rename from packages/twenty-ui/src/display/callout/Callout.tsx
rename to packages/twenty-ui/src/feedback/Callout/Callout.tsx
index 18736159048..dd66c39d296 100644
--- a/packages/twenty-ui/src/display/callout/Callout.tsx
+++ b/packages/twenty-ui/src/feedback/Callout/Callout.tsx
@@ -2,8 +2,8 @@ import { clsx } from 'clsx';
import { useState } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { IconHelp, IconX } from '@ui/display/icon/components/TablerIcons';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { IconHelp, IconX } from '@ui/icon/components/TablerIcons';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { LightButton, LightIconButton } from '@ui/input';
import styles from './Callout.module.scss';
diff --git a/packages/twenty-ui/src/display/callout/__stories__/Callout.stories.tsx b/packages/twenty-ui/src/feedback/Callout/__stories__/Callout.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/display/callout/__stories__/Callout.stories.tsx
rename to packages/twenty-ui/src/feedback/Callout/__stories__/Callout.stories.tsx
index 48a232907c4..7366659d375 100644
--- a/packages/twenty-ui/src/display/callout/__stories__/Callout.stories.tsx
+++ b/packages/twenty-ui/src/feedback/Callout/__stories__/Callout.stories.tsx
@@ -5,11 +5,11 @@ import {
ComponentDecorator,
} from '@ui/testing';
-import { Callout } from '@ui/display';
-import { type CalloutVariant } from '@ui/display/callout/Callout';
+import { Callout } from '@ui/feedback';
+import { type CalloutVariant } from '@ui/feedback/Callout/Callout';
const meta: Meta<typeof Callout> = {
- title: 'UI/Display/Callout',
+ title: 'UI/Feedback/Callout',
component: Callout,
};
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/CircularProgressBar.tsx b/packages/twenty-ui/src/feedback/CircularProgressBar/CircularProgressBar.tsx
similarity index 100%
rename from packages/twenty-ui/src/feedback/progress-bar/components/CircularProgressBar.tsx
rename to packages/twenty-ui/src/feedback/CircularProgressBar/CircularProgressBar.tsx
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx b/packages/twenty-ui/src/feedback/CircularProgressBar/__stories__/CircularProgressBar.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx
rename to packages/twenty-ui/src/feedback/CircularProgressBar/__stories__/CircularProgressBar.stories.tsx
index 36dc05b944b..31618545df8 100644
--- a/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx
+++ b/packages/twenty-ui/src/feedback/CircularProgressBar/__stories__/CircularProgressBar.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { CatalogDecorator, type CatalogStory } from '@ui/testing';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { CircularProgressBar } from '../CircularProgressBar';
+import { CircularProgressBar } from '@ui/feedback/CircularProgressBar/CircularProgressBar';
const meta: Meta<typeof CircularProgressBar> = {
title: 'UI/Feedback/CircularProgressBar/CircularProgressBar',
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.module.scss b/packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.module.scss
rename to packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.module.scss.d.ts b/packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.tsx b/packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/EmptyPlaceholderStyled.tsx
rename to packages/twenty-ui/src/feedback/EmptyPlaceholderStyled/EmptyPlaceholderStyled.tsx
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.module.scss b/packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.module.scss
rename to packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.module.scss.d.ts b/packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.tsx b/packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-placeholder/components/ErrorPlaceholderStyled.tsx
rename to packages/twenty-ui/src/feedback/ErrorPlaceholderStyled/ErrorPlaceholderStyled.tsx
diff --git a/packages/twenty-ui/src/display/info/components/Info.module.scss b/packages/twenty-ui/src/feedback/Info/Info.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/info/components/Info.module.scss
rename to packages/twenty-ui/src/feedback/Info/Info.module.scss
diff --git a/packages/twenty-ui/src/display/info/components/Info.module.scss.d.ts b/packages/twenty-ui/src/feedback/Info/Info.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/info/components/Info.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/Info/Info.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/info/components/Info.tsx b/packages/twenty-ui/src/feedback/Info/Info.tsx
similarity index 91%
rename from packages/twenty-ui/src/display/info/components/Info.tsx
rename to packages/twenty-ui/src/feedback/Info/Info.tsx
index f3b04c69673..70c67ed6a28 100644
--- a/packages/twenty-ui/src/display/info/components/Info.tsx
+++ b/packages/twenty-ui/src/feedback/Info/Info.tsx
@@ -1,8 +1,8 @@
import { clsx } from 'clsx';
-import { IconInfoCircle } from '@ui/display/icon/components/TablerIcons';
+import { IconInfoCircle } from '@ui/icon/components/TablerIcons';
import { ThemeContext } from '@ui/theme-constants';
-import { Button } from '@ui/input/button/components/Button/Button';
+import { Button } from '@ui/input/Button/Button';
import React, { useContext } from 'react';
import { Link } from 'react-router-dom';
diff --git a/packages/twenty-ui/src/display/info/components/__stories__/Info.stories.tsx b/packages/twenty-ui/src/feedback/Info/__stories__/Info.stories.tsx
similarity index 92%
rename from packages/twenty-ui/src/display/info/components/__stories__/Info.stories.tsx
rename to packages/twenty-ui/src/feedback/Info/__stories__/Info.stories.tsx
index 3b4a8c39c0e..aad143a6302 100644
--- a/packages/twenty-ui/src/display/info/components/__stories__/Info.stories.tsx
+++ b/packages/twenty-ui/src/feedback/Info/__stories__/Info.stories.tsx
@@ -5,10 +5,10 @@ import {
ComponentDecorator,
} from '@ui/testing';
-import { Info, type InfoAccent } from '../Info';
+import { Info, type InfoAccent } from '@ui/feedback/Info/Info';
const meta: Meta<typeof Info> = {
- title: 'UI/Display/Info',
+ title: 'UI/Feedback/Info',
component: Info,
};
diff --git a/packages/twenty-ui/src/display/banner/components/InlineBanner.module.scss b/packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/InlineBanner.module.scss
rename to packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.module.scss
diff --git a/packages/twenty-ui/src/display/banner/components/InlineBanner.module.scss.d.ts b/packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/InlineBanner.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/banner/components/InlineBanner.tsx b/packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.tsx
similarity index 80%
rename from packages/twenty-ui/src/display/banner/components/InlineBanner.tsx
rename to packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.tsx
index 9044dee3a11..eece4d1f40b 100644
--- a/packages/twenty-ui/src/display/banner/components/InlineBanner.tsx
+++ b/packages/twenty-ui/src/feedback/InlineBanner/InlineBanner.tsx
@@ -1,10 +1,10 @@
import { clsx } from 'clsx';
import { useContext } from 'react';
import { ThemeContext } from '@ui/theme-constants';
-import { Button } from '@ui/input/button/components/Button/Button';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
-import { IconInfoCircle } from '@ui/display/icon/components/TablerIcons';
-import { Banner, type BannerColor } from './Banner';
+import { Button } from '@ui/input/Button/Button';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+import { IconInfoCircle } from '@ui/icon/components/TablerIcons';
+import { Banner, type BannerColor } from '@ui/feedback/Banner/Banner';
import styles from './InlineBanner.module.scss';
diff --git a/packages/twenty-ui/src/feedback/loader/components/Loader.module.scss b/packages/twenty-ui/src/feedback/Loader/Loader.module.scss
similarity index 100%
rename from packages/twenty-ui/src/feedback/loader/components/Loader.module.scss
rename to packages/twenty-ui/src/feedback/Loader/Loader.module.scss
diff --git a/packages/twenty-ui/src/feedback/loader/components/Loader.module.scss.d.ts b/packages/twenty-ui/src/feedback/Loader/Loader.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/feedback/loader/components/Loader.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/Loader/Loader.module.scss.d.ts
diff --git a/packages/twenty-ui/src/feedback/loader/components/Loader.tsx b/packages/twenty-ui/src/feedback/Loader/Loader.tsx
similarity index 100%
rename from packages/twenty-ui/src/feedback/loader/components/Loader.tsx
rename to packages/twenty-ui/src/feedback/Loader/Loader.tsx
diff --git a/packages/twenty-ui/src/feedback/loader/__stories__/Loader.stories.tsx b/packages/twenty-ui/src/feedback/Loader/__stories__/Loader.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/feedback/loader/__stories__/Loader.stories.tsx
rename to packages/twenty-ui/src/feedback/Loader/__stories__/Loader.stories.tsx
index 2314ee5ea17..9275ea165ea 100644
--- a/packages/twenty-ui/src/feedback/loader/__stories__/Loader.stories.tsx
+++ b/packages/twenty-ui/src/feedback/Loader/__stories__/Loader.stories.tsx
@@ -3,7 +3,7 @@ import { expect, waitFor } from 'storybook/test';
import { ComponentDecorator } from '@ui/testing';
-import { Loader } from '../components/Loader';
+import { Loader } from '@ui/feedback/Loader/Loader';
const meta: Meta<typeof Loader> = {
title: 'UI/Feedback/Loader',
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.module.scss b/packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.module.scss
rename to packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.module.scss
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.module.scss.d.ts b/packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.tsx b/packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.tsx
similarity index 100%
rename from packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.tsx
rename to packages/twenty-ui/src/feedback/ProgressBar/ProgressBar.tsx
diff --git a/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx b/packages/twenty-ui/src/feedback/ProgressBar/__stories__/ProgressBar.stories.tsx
similarity index 87%
rename from packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx
rename to packages/twenty-ui/src/feedback/ProgressBar/__stories__/ProgressBar.stories.tsx
index 04d1cabd42b..f704a10a585 100644
--- a/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx
+++ b/packages/twenty-ui/src/feedback/ProgressBar/__stories__/ProgressBar.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { useProgressAnimation } from '@ui/feedback/progress-bar/hooks/useProgressAnimation';
+import { useProgressAnimation } from '@ui/feedback/ProgressBar/hooks/useProgressAnimation';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { ProgressBar } from '../ProgressBar';
+import { ProgressBar } from '@ui/feedback/ProgressBar/ProgressBar';
const meta: Meta<typeof ProgressBar> = {
title: 'UI/Feedback/ProgressBar/ProgressBar',
diff --git a/packages/twenty-ui/src/feedback/progress-bar/hooks/useProgressAnimation.ts b/packages/twenty-ui/src/feedback/ProgressBar/hooks/useProgressAnimation.ts
similarity index 100%
rename from packages/twenty-ui/src/feedback/progress-bar/hooks/useProgressAnimation.ts
rename to packages/twenty-ui/src/feedback/ProgressBar/hooks/useProgressAnimation.ts
diff --git a/packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.module.scss b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.module.scss
rename to packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss
diff --git a/packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.module.scss.d.ts b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.module.scss.d.ts
rename to packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.tsx b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
similarity index 88%
rename from packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.tsx
rename to packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
index d129eb2cdb8..0ea86147f42 100644
--- a/packages/twenty-ui/src/display/banner/components/SidePanelInformationBanner.tsx
+++ b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
@@ -2,11 +2,8 @@ import { clsx } from 'clsx';
import { useId } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import {
- IconAlertTriangle,
- IconInfoCircle,
-} from '../../icon/components/TablerIcons';
-import { AppTooltip } from '../../tooltip/AppTooltip';
+import { IconAlertTriangle, IconInfoCircle } from '@ui/icon';
+import { AppTooltip } from '@ui/surfaces';
import styles from './SidePanelInformationBanner.module.scss';
diff --git a/packages/twenty-ui/src/display/banner/components/__stories__/SidePanelInformationBanner.stories.tsx b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
similarity index 87%
rename from packages/twenty-ui/src/display/banner/components/__stories__/SidePanelInformationBanner.stories.tsx
rename to packages/twenty-ui/src/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
index c67b6be985e..0af66be4dd3 100644
--- a/packages/twenty-ui/src/display/banner/components/__stories__/SidePanelInformationBanner.stories.tsx
+++ b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/__stories__/SidePanelInformationBanner.stories.tsx
@@ -1,9 +1,9 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { SidePanelInformationBanner } from '../SidePanelInformationBanner';
+import { SidePanelInformationBanner } from '@ui/feedback/SidePanelInformationBanner/SidePanelInformationBanner';
const meta: Meta<typeof SidePanelInformationBanner> = {
- title: 'UI/Display/Banner/SidePanelInformationBanner',
+ title: 'UI/Feedback/SidePanelInformationBanner',
component: SidePanelInformationBanner,
decorators: [ComponentDecorator],
};
diff --git a/packages/twenty-ui/src/feedback/index.ts b/packages/twenty-ui/src/feedback/index.ts
index dc1e6593314..50f7aa70dea 100644
--- a/packages/twenty-ui/src/feedback/index.ts
+++ b/packages/twenty-ui/src/feedback/index.ts
@@ -7,11 +7,39 @@
* |___/
*/
-export { Loader } from './loader/components/Loader';
-export { CircularProgressBar } from './progress-bar/components/CircularProgressBar';
+export type { AnimatedPlaceholderType } from './AnimatedPlaceholder/AnimatedPlaceholder';
+export { AnimatedPlaceholder } from './AnimatedPlaceholder/AnimatedPlaceholder';
+export { BACKGROUND } from './AnimatedPlaceholder/constants/Background';
+export { DARK_BACKGROUND } from './AnimatedPlaceholder/constants/DarkBackground';
+export { DARK_MOVING_IMAGE } from './AnimatedPlaceholder/constants/DarkMovingImage';
+export { MOVING_IMAGE } from './AnimatedPlaceholder/constants/MovingImage';
+export type { BannerColor, BannerVariant } from './Banner/Banner';
+export { Banner } from './Banner/Banner';
+export type { CalloutVariant, CalloutProps } from './Callout/Callout';
+export { Callout } from './Callout/Callout';
+export { CircularProgressBar } from './CircularProgressBar/CircularProgressBar';
+export {
+ AnimatedPlaceholderEmptyContainer,
+ EMPTY_PLACEHOLDER_TRANSITION_PROPS,
+ AnimatedPlaceholderEmptyTextContainer,
+ AnimatedPlaceholderEmptyTitle,
+ AnimatedPlaceholderEmptySubTitle,
+} from './EmptyPlaceholderStyled/EmptyPlaceholderStyled';
+export {
+ AnimatedPlaceholderErrorContainer,
+ AnimatedPlaceholderErrorTextContainer,
+ AnimatedPlaceholderErrorTitle,
+ AnimatedPlaceholderErrorSubTitle,
+} from './ErrorPlaceholderStyled/ErrorPlaceholderStyled';
+export type { InfoAccent, InfoProps } from './Info/Info';
+export { Info } from './Info/Info';
+export { InlineBanner } from './InlineBanner/InlineBanner';
+export { Loader } from './Loader/Loader';
+export { useProgressAnimation } from './ProgressBar/hooks/useProgressAnimation';
export type {
ProgressBarProps,
StyledBarProps,
-} from './progress-bar/components/ProgressBar';
-export { ProgressBar } from './progress-bar/components/ProgressBar';
-export { useProgressAnimation } from './progress-bar/hooks/useProgressAnimation';
+} from './ProgressBar/ProgressBar';
+export { ProgressBar } from './ProgressBar/ProgressBar';
+export type { SidePanelInformationBannerProps } from './SidePanelInformationBanner/SidePanelInformationBanner';
+export { SidePanelInformationBanner } from './SidePanelInformationBanner/SidePanelInformationBanner';
diff --git a/packages/twenty-ui/src/display/icon/components/Icon.tsx b/packages/twenty-ui/src/icon/components/Icon.tsx
similarity index 73%
rename from packages/twenty-ui/src/display/icon/components/Icon.tsx
rename to packages/twenty-ui/src/icon/components/Icon.tsx
index a692a9dacf7..a4869faca72 100644
--- a/packages/twenty-ui/src/display/icon/components/Icon.tsx
+++ b/packages/twenty-ui/src/icon/components/Icon.tsx
@@ -1,5 +1,5 @@
-import { useIcons } from '@ui/display/icon/hooks/useIcons';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { useIcons } from '@ui/icon/hooks/useIcons';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
export type IconProps = IconComponentProps & {
name: string;
diff --git a/packages/twenty-ui/src/display/icon/components/IconAddressBook.tsx b/packages/twenty-ui/src/icon/components/IconAddressBook.tsx
similarity index 88%
rename from packages/twenty-ui/src/display/icon/components/IconAddressBook.tsx
rename to packages/twenty-ui/src/icon/components/IconAddressBook.tsx
index 78759ab0a5a..e2ca2fc2ae7 100644
--- a/packages/twenty-ui/src/display/icon/components/IconAddressBook.tsx
+++ b/packages/twenty-ui/src/icon/components/IconAddressBook.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconAddressBookRaw from '@assets/icons/address-book.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconAddressBookProps = Pick<
diff --git a/packages/twenty-ui/src/display/icon/components/IconBrandAnthropic.tsx b/packages/twenty-ui/src/icon/components/IconBrandAnthropic.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconBrandAnthropic.tsx
rename to packages/twenty-ui/src/icon/components/IconBrandAnthropic.tsx
index 3e77d985024..aae6cdf4edf 100644
--- a/packages/twenty-ui/src/display/icon/components/IconBrandAnthropic.tsx
+++ b/packages/twenty-ui/src/icon/components/IconBrandAnthropic.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconAnthropicRaw from '@assets/icons/anthropic.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconBrandAnthropicProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconBrandGemini.tsx b/packages/twenty-ui/src/icon/components/IconBrandGemini.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconBrandGemini.tsx
rename to packages/twenty-ui/src/icon/components/IconBrandGemini.tsx
index 80a7923c359..950fc9c83e2 100644
--- a/packages/twenty-ui/src/display/icon/components/IconBrandGemini.tsx
+++ b/packages/twenty-ui/src/icon/components/IconBrandGemini.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconBrandGeminiRaw from '@assets/icons/gemini.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconBrandGeminiProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconBrandGroq.tsx b/packages/twenty-ui/src/icon/components/IconBrandGroq.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconBrandGroq.tsx
rename to packages/twenty-ui/src/icon/components/IconBrandGroq.tsx
index abc50bd58d4..a6c420da20d 100644
--- a/packages/twenty-ui/src/display/icon/components/IconBrandGroq.tsx
+++ b/packages/twenty-ui/src/icon/components/IconBrandGroq.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconBrandGroqRaw from '@assets/icons/groq.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconBrandGroqProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconBrandMistral.tsx b/packages/twenty-ui/src/icon/components/IconBrandMistral.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconBrandMistral.tsx
rename to packages/twenty-ui/src/icon/components/IconBrandMistral.tsx
index 542c9eec1df..dfe4dbe44a4 100644
--- a/packages/twenty-ui/src/display/icon/components/IconBrandMistral.tsx
+++ b/packages/twenty-ui/src/icon/components/IconBrandMistral.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconBrandMistralRaw from '@assets/icons/mistral.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconBrandMistralProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconBrandXai.tsx b/packages/twenty-ui/src/icon/components/IconBrandXai.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/icon/components/IconBrandXai.tsx
rename to packages/twenty-ui/src/icon/components/IconBrandXai.tsx
index d0d1a7ab29a..9570edcd57f 100644
--- a/packages/twenty-ui/src/display/icon/components/IconBrandXai.tsx
+++ b/packages/twenty-ui/src/icon/components/IconBrandXai.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconBrandXaiRaw from '@assets/icons/xai.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconBrandXaiProps = Pick<IconComponentProps, 'size' | 'color'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.module.scss b/packages/twenty-ui/src/icon/components/IconChartBarHorizontal.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.module.scss
rename to packages/twenty-ui/src/icon/components/IconChartBarHorizontal.module.scss
diff --git a/packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.module.scss.d.ts b/packages/twenty-ui/src/icon/components/IconChartBarHorizontal.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.module.scss.d.ts
rename to packages/twenty-ui/src/icon/components/IconChartBarHorizontal.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.tsx b/packages/twenty-ui/src/icon/components/IconChartBarHorizontal.tsx
similarity index 80%
rename from packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.tsx
rename to packages/twenty-ui/src/icon/components/IconChartBarHorizontal.tsx
index bab4d674bb4..268b4d839a5 100644
--- a/packages/twenty-ui/src/display/icon/components/IconChartBarHorizontal.tsx
+++ b/packages/twenty-ui/src/icon/components/IconChartBarHorizontal.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
-import { IconChartBar } from '@ui/display/icon/components/TablerIcons';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IconChartBar } from '@ui/icon/components/TablerIcons';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
import styles from './IconChartBarHorizontal.module.scss';
diff --git a/packages/twenty-ui/src/display/icon/components/IconGmail.tsx b/packages/twenty-ui/src/icon/components/IconGmail.tsx
similarity index 83%
rename from packages/twenty-ui/src/display/icon/components/IconGmail.tsx
rename to packages/twenty-ui/src/icon/components/IconGmail.tsx
index 961fc5d6887..c270f9efc0b 100644
--- a/packages/twenty-ui/src/display/icon/components/IconGmail.tsx
+++ b/packages/twenty-ui/src/icon/components/IconGmail.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconGmailRaw from '@assets/icons/gmail.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconGmailProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconGoogle.tsx b/packages/twenty-ui/src/icon/components/IconGoogle.tsx
similarity index 83%
rename from packages/twenty-ui/src/display/icon/components/IconGoogle.tsx
rename to packages/twenty-ui/src/icon/components/IconGoogle.tsx
index 4ae7dac95e6..3547b2dece1 100644
--- a/packages/twenty-ui/src/display/icon/components/IconGoogle.tsx
+++ b/packages/twenty-ui/src/icon/components/IconGoogle.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconGoogleRaw from '@assets/icons/google.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconGoogleProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconGoogleCalendar.tsx b/packages/twenty-ui/src/icon/components/IconGoogleCalendar.tsx
similarity index 85%
rename from packages/twenty-ui/src/display/icon/components/IconGoogleCalendar.tsx
rename to packages/twenty-ui/src/icon/components/IconGoogleCalendar.tsx
index 1db26ddec96..d9d3599de97 100644
--- a/packages/twenty-ui/src/display/icon/components/IconGoogleCalendar.tsx
+++ b/packages/twenty-ui/src/icon/components/IconGoogleCalendar.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconGoogleCalendarRaw from '@assets/icons/google-calendar.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconGoogleCalendarProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconLock.tsx b/packages/twenty-ui/src/icon/components/IconLock.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconLock.tsx
rename to packages/twenty-ui/src/icon/components/IconLock.tsx
index 31652800660..7afe848b604 100644
--- a/packages/twenty-ui/src/display/icon/components/IconLock.tsx
+++ b/packages/twenty-ui/src/icon/components/IconLock.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconLockRaw from '@assets/icons/lock.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconLockCustomProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconMicrosoft.tsx b/packages/twenty-ui/src/icon/components/IconMicrosoft.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IconMicrosoft.tsx
rename to packages/twenty-ui/src/icon/components/IconMicrosoft.tsx
diff --git a/packages/twenty-ui/src/display/icon/components/IconMicrosoftCalendar.tsx b/packages/twenty-ui/src/icon/components/IconMicrosoftCalendar.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IconMicrosoftCalendar.tsx
rename to packages/twenty-ui/src/icon/components/IconMicrosoftCalendar.tsx
diff --git a/packages/twenty-ui/src/display/icon/components/IconMicrosoftOutlook.tsx b/packages/twenty-ui/src/icon/components/IconMicrosoftOutlook.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IconMicrosoftOutlook.tsx
rename to packages/twenty-ui/src/icon/components/IconMicrosoftOutlook.tsx
diff --git a/packages/twenty-ui/src/display/icon/components/IconModelClaude.tsx b/packages/twenty-ui/src/icon/components/IconModelClaude.tsx
similarity index 84%
rename from packages/twenty-ui/src/display/icon/components/IconModelClaude.tsx
rename to packages/twenty-ui/src/icon/components/IconModelClaude.tsx
index fb2f64eb772..ebdc8d08a14 100644
--- a/packages/twenty-ui/src/display/icon/components/IconModelClaude.tsx
+++ b/packages/twenty-ui/src/icon/components/IconModelClaude.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconModelClaudeRaw from '@assets/icons/claude.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconModelClaudeProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconProviderOpenai.tsx b/packages/twenty-ui/src/icon/components/IconProviderOpenai.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/icon/components/IconProviderOpenai.tsx
rename to packages/twenty-ui/src/icon/components/IconProviderOpenai.tsx
index ec64dc03eed..b2cfd06877d 100644
--- a/packages/twenty-ui/src/display/icon/components/IconProviderOpenai.tsx
+++ b/packages/twenty-ui/src/icon/components/IconProviderOpenai.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconOpenaiRaw from '@assets/icons/openai.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconProviderOpenaiProps = Pick<IconComponentProps, 'size' | 'color'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconRelationManyToOne.tsx b/packages/twenty-ui/src/icon/components/IconRelationManyToOne.tsx
similarity index 87%
rename from packages/twenty-ui/src/display/icon/components/IconRelationManyToOne.tsx
rename to packages/twenty-ui/src/icon/components/IconRelationManyToOne.tsx
index 0f207941812..c29ad2ef8e2 100644
--- a/packages/twenty-ui/src/display/icon/components/IconRelationManyToOne.tsx
+++ b/packages/twenty-ui/src/icon/components/IconRelationManyToOne.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconRelationManyToOneRaw from '@assets/icons/many-to-one.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconRelationManyToOneProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconTrashXOff.tsx b/packages/twenty-ui/src/icon/components/IconTrashXOff.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/icon/components/IconTrashXOff.tsx
rename to packages/twenty-ui/src/icon/components/IconTrashXOff.tsx
index 2d5aedfb5e2..576ca872cda 100644
--- a/packages/twenty-ui/src/display/icon/components/IconTrashXOff.tsx
+++ b/packages/twenty-ui/src/icon/components/IconTrashXOff.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconTrashXOffRaw from '@assets/icons/trash-x-off.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconTrashXOffProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconTwentyStar.tsx b/packages/twenty-ui/src/icon/components/IconTwentyStar.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/icon/components/IconTwentyStar.tsx
rename to packages/twenty-ui/src/icon/components/IconTwentyStar.tsx
index 7309bb0c2ca..04ee48ec5e9 100644
--- a/packages/twenty-ui/src/display/icon/components/IconTwentyStar.tsx
+++ b/packages/twenty-ui/src/icon/components/IconTwentyStar.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconTwentyStarRaw from '@assets/icons/twenty-star.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconTwentyStarProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IconTwentyStarFilled.tsx b/packages/twenty-ui/src/icon/components/IconTwentyStarFilled.tsx
similarity index 87%
rename from packages/twenty-ui/src/display/icon/components/IconTwentyStarFilled.tsx
rename to packages/twenty-ui/src/icon/components/IconTwentyStarFilled.tsx
index 051c98fffb1..10564ab4d64 100644
--- a/packages/twenty-ui/src/display/icon/components/IconTwentyStarFilled.tsx
+++ b/packages/twenty-ui/src/icon/components/IconTwentyStarFilled.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import IconTwentyStarFilledRaw from '@assets/icons/twenty-star-filled.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IconTwentyStarFilledProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconArray.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconArray.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconArray.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconArray.tsx
index 17cf7c48a44..ecc730a0654 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconArray.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconArray.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconArrayRaw from '@assets/icons/illustration-array.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconArrayProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarEvent.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconCalendarEvent.tsx
similarity index 80%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarEvent.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconCalendarEvent.tsx
index f6220899257..aa3fb1904b7 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarEvent.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconCalendarEvent.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconCalendarEventRaw from '@assets/icons/illustration-calendar-event.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconCalendarEventProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarTime.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconCalendarTime.tsx
similarity index 80%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarTime.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconCalendarTime.tsx
index 8027cb5048b..ec963a74be2 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconCalendarTime.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconCalendarTime.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconCalendarTimeRaw from '@assets/icons/illustration-calendar-time.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconCalendarTimeProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconCurrency.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconCurrency.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconCurrency.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconCurrency.tsx
index 0a0ef60343f..52e06af18f0 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconCurrency.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconCurrency.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconCurrencyRaw from '@assets/icons/illustration-currency.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconCurrencyProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconFile.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconFile.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconFile.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconFile.tsx
index 94be18214b6..9b846e7e411 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconFile.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconFile.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconFileRaw from '@assets/icons/illustration-file.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconFileProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconJson.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconJson.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconJson.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconJson.tsx
index c521ba4c8c4..66a4377b85c 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconJson.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconJson.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconJsonRaw from '@assets/icons/illustration-json.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconJsonProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconLink.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconLink.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconLink.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconLink.tsx
index afaa9b1983a..caee86596d4 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconLink.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconLink.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconLinkRaw from '@assets/icons/illustration-link.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconLinkProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconMail.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconMail.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconMail.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconMail.tsx
index 95f9ee133e8..4cf10ad02b6 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconMail.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconMail.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconMailRaw from '@assets/icons/illustration-mail.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconMailProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconManyToMany.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconManyToMany.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconManyToMany.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconManyToMany.tsx
index 0fd8370f859..d7ee64bb3db 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconManyToMany.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconManyToMany.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconManyToManyRaw from '@assets/icons/illustration-many-to-many.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconManyToManyProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconMap.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconMap.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconMap.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconMap.tsx
index 484ce4cd47b..0474b6370c5 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconMap.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconMap.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconMapRaw from '@assets/icons/illustration-map.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconMapProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconNumbers.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconNumbers.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconNumbers.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconNumbers.tsx
index 0ac70a09fe9..5d5a820c6e7 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconNumbers.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconNumbers.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconNumbersRaw from '@assets/icons/illustration-numbers.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconNumbersProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconOneToMany.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconOneToMany.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconOneToMany.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconOneToMany.tsx
index 7c8e50474fe..8c2503b6eb5 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconOneToMany.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconOneToMany.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconOneToManyRaw from '@assets/icons/illustration-one-to-many.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconOneToManyProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconOneToOne.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconOneToOne.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconOneToOne.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconOneToOne.tsx
index 54da40e2b23..4307d64b820 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconOneToOne.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconOneToOne.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconOneToOneRaw from '@assets/icons/illustration-one-to-one.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconOneToOneProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconPhone.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconPhone.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconPhone.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconPhone.tsx
index e06371bb9a8..414ae0820e7 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconPhone.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconPhone.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconPhoneRaw from '@assets/icons/illustration-phone.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconPhoneProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconSetting.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconSetting.tsx
similarity index 79%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconSetting.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconSetting.tsx
index 10c96b0e6dd..795fbafbcf3 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconSetting.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconSetting.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconSettingRaw from '@assets/icons/illustration-setting.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconSettingProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconStar.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconStar.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconStar.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconStar.tsx
index e8c662c27fe..5e69da23b40 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconStar.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconStar.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconStarRaw from '@assets/icons/illustration-star.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconStarProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconTag.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconTag.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconTag.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconTag.tsx
index a45034ed09e..f663914eba4 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconTag.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconTag.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconTagRaw from '@assets/icons/illustration-tag.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconTagProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconTags.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconTags.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconTags.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconTags.tsx
index 667a8127408..bcd9d9c326c 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconTags.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconTags.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconTagsRaw from '@assets/icons/illustration-tags.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconTagsProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconText.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconText.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconText.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconText.tsx
index 9544e42ab65..0af7fc87f83 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconText.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconText.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconTextRaw from '@assets/icons/illustration-text.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconTextProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconToggle.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconToggle.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconToggle.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconToggle.tsx
index 8dec6ec915d..28ed2eb818e 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconToggle.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconToggle.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconToggleRaw from '@assets/icons/illustration-toggle.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconToggleProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconUid.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconUid.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconUid.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconUid.tsx
index 6c890663025..c2dfbbe0424 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconUid.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconUid.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconUidRaw from '@assets/icons/illustration-uid.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconUidProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconUser.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconUser.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconUser.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconUser.tsx
index e76856f2a09..42aea42c905 100644
--- a/packages/twenty-ui/src/display/icon/components/IllustrationIconUser.tsx
+++ b/packages/twenty-ui/src/icon/components/IllustrationIconUser.tsx
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import IllustrationIconUserRaw from '@assets/icons/illustration-user.svg?react';
-import { IllustrationIconWrapper } from '@ui/display/icon/components/IllustrationIconWrapper';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { IllustrationIconWrapper } from '@ui/icon/components/IllustrationIconWrapper';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
type IllustrationIconUserProps = Pick<IconComponentProps, 'size'>;
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.module.scss b/packages/twenty-ui/src/icon/components/IllustrationIconWrapper.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.module.scss
rename to packages/twenty-ui/src/icon/components/IllustrationIconWrapper.module.scss
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.module.scss.d.ts b/packages/twenty-ui/src/icon/components/IllustrationIconWrapper.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.module.scss.d.ts
rename to packages/twenty-ui/src/icon/components/IllustrationIconWrapper.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.tsx b/packages/twenty-ui/src/icon/components/IllustrationIconWrapper.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/IllustrationIconWrapper.tsx
rename to packages/twenty-ui/src/icon/components/IllustrationIconWrapper.tsx
diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/icon/components/TablerIcons.ts
similarity index 100%
rename from packages/twenty-ui/src/display/icon/components/TablerIcons.ts
rename to packages/twenty-ui/src/icon/components/TablerIcons.ts
diff --git a/packages/twenty-ui/src/display/icon/components/ThinkingOrbitLoaderIcon.tsx b/packages/twenty-ui/src/icon/components/ThinkingOrbitLoaderIcon.tsx
similarity index 93%
rename from packages/twenty-ui/src/display/icon/components/ThinkingOrbitLoaderIcon.tsx
rename to packages/twenty-ui/src/icon/components/ThinkingOrbitLoaderIcon.tsx
index af791e4b0b4..a8f55319748 100644
--- a/packages/twenty-ui/src/display/icon/components/ThinkingOrbitLoaderIcon.tsx
+++ b/packages/twenty-ui/src/icon/components/ThinkingOrbitLoaderIcon.tsx
@@ -1,4 +1,4 @@
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
type ThinkingOrbitLoaderIconProps = Pick<
IconComponentProps,
diff --git a/packages/twenty-ui/src/display/icon/components/__stories__/Icon.stories.tsx b/packages/twenty-ui/src/icon/components/__stories__/Icon.stories.tsx
similarity index 90%
rename from packages/twenty-ui/src/display/icon/components/__stories__/Icon.stories.tsx
rename to packages/twenty-ui/src/icon/components/__stories__/Icon.stories.tsx
index 91c92831b5a..03ad27c0ce3 100644
--- a/packages/twenty-ui/src/display/icon/components/__stories__/Icon.stories.tsx
+++ b/packages/twenty-ui/src/icon/components/__stories__/Icon.stories.tsx
@@ -1,13 +1,13 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconsProvider } from '@ui/display/icon/providers/IconsProvider';
+import { IconsProvider } from '@ui/icon/providers/IconsProvider';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
import { JotaiRootDecorator } from '@ui/testing/decorators/JotaiRootDecorator';
import { Icon } from '../Icon';
const meta: Meta<typeof Icon> = {
- title: 'UI/Display/Icon/Icon',
+ title: 'UI/Icon/Icon',
component: Icon,
decorators: [
ComponentDecorator,
diff --git a/packages/twenty-ui/src/display/icon/hooks/__tests__/useIcons.test.ts b/packages/twenty-ui/src/icon/hooks/__tests__/useIcons.test.ts
similarity index 92%
rename from packages/twenty-ui/src/display/icon/hooks/__tests__/useIcons.test.ts
rename to packages/twenty-ui/src/icon/hooks/__tests__/useIcons.test.ts
index f12ce151fa4..677878811c7 100644
--- a/packages/twenty-ui/src/display/icon/hooks/__tests__/useIcons.test.ts
+++ b/packages/twenty-ui/src/icon/hooks/__tests__/useIcons.test.ts
@@ -5,8 +5,8 @@ import {
Icon123,
IconBuildingSkyscraper,
IconUser,
-} from '@ui/display/icon/components/TablerIcons';
-import { useIcons } from '@ui/display/icon/hooks/useIcons';
+} from '@ui/icon/components/TablerIcons';
+import { useIcons } from '@ui/icon/hooks/useIcons';
const mockedStateIcons = {
IconUser,
diff --git a/packages/twenty-ui/src/display/icon/hooks/useIcons.ts b/packages/twenty-ui/src/icon/hooks/useIcons.ts
similarity index 75%
rename from packages/twenty-ui/src/display/icon/hooks/useIcons.ts
rename to packages/twenty-ui/src/icon/hooks/useIcons.ts
index ff89b9717d7..658c547c3d6 100644
--- a/packages/twenty-ui/src/display/icon/hooks/useIcons.ts
+++ b/packages/twenty-ui/src/icon/hooks/useIcons.ts
@@ -1,7 +1,7 @@
import { useAtomValue } from 'jotai';
-import { Icon123 } from '@ui/display/icon/components/TablerIcons';
-import { iconsState } from '@ui/display/icon/states/iconsState';
+import { Icon123 } from '@ui/icon/components/TablerIcons';
+import { iconsState } from '@ui/icon/states/iconsState';
export const useIcons = () => {
const icons = useAtomValue(iconsState);
diff --git a/packages/twenty-ui/src/display/index.ts b/packages/twenty-ui/src/icon/index.ts
similarity index 53%
rename from packages/twenty-ui/src/display/index.ts
rename to packages/twenty-ui/src/icon/index.ts
index 245414e0458..d4bf4f960ae 100644
--- a/packages/twenty-ui/src/display/index.ts
+++ b/packages/twenty-ui/src/icon/index.ts
@@ -7,78 +7,52 @@
* |___/
*/
-export type { AvatarProps } from './avatar/components/Avatar';
-export { Avatar } from './avatar/components/Avatar';
-export type { AvatarGroupProps } from './avatar/components/AvatarGroup';
-export { AvatarGroup } from './avatar/components/AvatarGroup';
-export { invalidAvatarUrlsAtomV2 } from './avatar/components/states/invalidAvatarUrlsAtomV2';
-export { AVATAR_PROPERTIES_BY_SIZE } from './avatar/constants/AvatarPropertiesBySize';
-export type { AvatarSize } from './avatar/types/AvatarSize';
-export type { AvatarType } from './avatar/types/AvatarType';
-export type { BannerColor, BannerVariant } from './banner/components/Banner';
-export { Banner } from './banner/components/Banner';
-export { InlineBanner } from './banner/components/InlineBanner';
-export type { SidePanelInformationBannerProps } from './banner/components/SidePanelInformationBanner';
-export { SidePanelInformationBanner } from './banner/components/SidePanelInformationBanner';
-export type { CalloutVariant, CalloutProps } from './callout/Callout';
-export { Callout } from './callout/Callout';
-export type { AnimatedCheckmarkProps } from './checkmark/components/AnimatedCheckmark';
-export { AnimatedCheckmark } from './checkmark/components/AnimatedCheckmark';
-export type { CheckmarkProps } from './checkmark/components/Checkmark';
-export { Checkmark } from './checkmark/components/Checkmark';
-export type {
- ColorSampleVariant,
- ColorSampleProps,
-} from './color/components/ColorSample';
-export { ColorSample } from './color/components/ColorSample';
-export { CommandBlock } from './command-block/components/CommandBlock';
-export { LinkifiedText } from './components/LinkifiedText';
-export type { IconProps } from './icon/components/Icon';
-export { Icon } from './icon/components/Icon';
-export { IconAddressBook } from './icon/components/IconAddressBook';
-export { IconBrandAnthropic } from './icon/components/IconBrandAnthropic';
-export { IconBrandGemini } from './icon/components/IconBrandGemini';
-export { IconBrandGroq } from './icon/components/IconBrandGroq';
-export { IconBrandMistral } from './icon/components/IconBrandMistral';
-export { IconBrandXai } from './icon/components/IconBrandXai';
-export { IconChartBarHorizontal } from './icon/components/IconChartBarHorizontal';
-export { IconGmail } from './icon/components/IconGmail';
-export { IconGoogle } from './icon/components/IconGoogle';
-export { IconGoogleCalendar } from './icon/components/IconGoogleCalendar';
-export { IconLockCustom } from './icon/components/IconLock';
-export { IconMicrosoft } from './icon/components/IconMicrosoft';
-export { IconMicrosoftCalendar } from './icon/components/IconMicrosoftCalendar';
-export { IconMicrosoftOutlook } from './icon/components/IconMicrosoftOutlook';
-export { IconModelClaude } from './icon/components/IconModelClaude';
-export { IconProviderOpenai } from './icon/components/IconProviderOpenai';
-export { IconRelationManyToOne } from './icon/components/IconRelationManyToOne';
-export { IconTrashXOff } from './icon/components/IconTrashXOff';
-export { IconTwentyStar } from './icon/components/IconTwentyStar';
-export { IconTwentyStarFilled } from './icon/components/IconTwentyStarFilled';
-export { IllustrationIconArray } from './icon/components/IllustrationIconArray';
-export { IllustrationIconCalendarEvent } from './icon/components/IllustrationIconCalendarEvent';
-export { IllustrationIconCalendarTime } from './icon/components/IllustrationIconCalendarTime';
-export { IllustrationIconCurrency } from './icon/components/IllustrationIconCurrency';
-export { IllustrationIconFile } from './icon/components/IllustrationIconFile';
-export { IllustrationIconJson } from './icon/components/IllustrationIconJson';
-export { IllustrationIconLink } from './icon/components/IllustrationIconLink';
-export { IllustrationIconMail } from './icon/components/IllustrationIconMail';
-export { IllustrationIconManyToMany } from './icon/components/IllustrationIconManyToMany';
-export { IllustrationIconMap } from './icon/components/IllustrationIconMap';
-export { IllustrationIconNumbers } from './icon/components/IllustrationIconNumbers';
-export { IllustrationIconOneToMany } from './icon/components/IllustrationIconOneToMany';
-export { IllustrationIconOneToOne } from './icon/components/IllustrationIconOneToOne';
-export { IllustrationIconPhone } from './icon/components/IllustrationIconPhone';
-export { IllustrationIconSetting } from './icon/components/IllustrationIconSetting';
-export { IllustrationIconStar } from './icon/components/IllustrationIconStar';
-export { IllustrationIconTag } from './icon/components/IllustrationIconTag';
-export { IllustrationIconTags } from './icon/components/IllustrationIconTags';
-export { IllustrationIconText } from './icon/components/IllustrationIconText';
-export { IllustrationIconToggle } from './icon/components/IllustrationIconToggle';
-export { IllustrationIconUid } from './icon/components/IllustrationIconUid';
-export { IllustrationIconUser } from './icon/components/IllustrationIconUser';
-export { IllustrationIconWrapper } from './icon/components/IllustrationIconWrapper';
-export type { TablerIconsProps } from './icon/components/TablerIcons';
+export type { IconProps } from './components/Icon';
+export { Icon } from './components/Icon';
+export { IconAddressBook } from './components/IconAddressBook';
+export { IconBrandAnthropic } from './components/IconBrandAnthropic';
+export { IconBrandGemini } from './components/IconBrandGemini';
+export { IconBrandGroq } from './components/IconBrandGroq';
+export { IconBrandMistral } from './components/IconBrandMistral';
+export { IconBrandXai } from './components/IconBrandXai';
+export { IconChartBarHorizontal } from './components/IconChartBarHorizontal';
+export { IconGmail } from './components/IconGmail';
+export { IconGoogle } from './components/IconGoogle';
+export { IconGoogleCalendar } from './components/IconGoogleCalendar';
+export { IconLockCustom } from './components/IconLock';
+export { IconMicrosoft } from './components/IconMicrosoft';
+export { IconMicrosoftCalendar } from './components/IconMicrosoftCalendar';
+export { IconMicrosoftOutlook } from './components/IconMicrosoftOutlook';
+export { IconModelClaude } from './components/IconModelClaude';
+export { IconProviderOpenai } from './components/IconProviderOpenai';
+export { IconRelationManyToOne } from './components/IconRelationManyToOne';
+export { IconTrashXOff } from './components/IconTrashXOff';
+export { IconTwentyStar } from './components/IconTwentyStar';
+export { IconTwentyStarFilled } from './components/IconTwentyStarFilled';
+export { IllustrationIconArray } from './components/IllustrationIconArray';
+export { IllustrationIconCalendarEvent } from './components/IllustrationIconCalendarEvent';
+export { IllustrationIconCalendarTime } from './components/IllustrationIconCalendarTime';
+export { IllustrationIconCurrency } from './components/IllustrationIconCurrency';
+export { IllustrationIconFile } from './components/IllustrationIconFile';
+export { IllustrationIconJson } from './components/IllustrationIconJson';
+export { IllustrationIconLink } from './components/IllustrationIconLink';
+export { IllustrationIconMail } from './components/IllustrationIconMail';
+export { IllustrationIconManyToMany } from './components/IllustrationIconManyToMany';
+export { IllustrationIconMap } from './components/IllustrationIconMap';
+export { IllustrationIconNumbers } from './components/IllustrationIconNumbers';
+export { IllustrationIconOneToMany } from './components/IllustrationIconOneToMany';
+export { IllustrationIconOneToOne } from './components/IllustrationIconOneToOne';
+export { IllustrationIconPhone } from './components/IllustrationIconPhone';
+export { IllustrationIconSetting } from './components/IllustrationIconSetting';
+export { IllustrationIconStar } from './components/IllustrationIconStar';
+export { IllustrationIconTag } from './components/IllustrationIconTag';
+export { IllustrationIconTags } from './components/IllustrationIconTags';
+export { IllustrationIconText } from './components/IllustrationIconText';
+export { IllustrationIconToggle } from './components/IllustrationIconToggle';
+export { IllustrationIconUid } from './components/IllustrationIconUid';
+export { IllustrationIconUser } from './components/IllustrationIconUser';
+export { IllustrationIconWrapper } from './components/IllustrationIconWrapper';
+export type { TablerIconsProps } from './components/TablerIcons';
export {
Icon123,
IconAdjustments,
@@ -511,39 +485,9 @@ export {
IconWindow,
IconWorld,
IconX,
-} from './icon/components/TablerIcons';
-export { ThinkingOrbitLoaderIcon } from './icon/components/ThinkingOrbitLoaderIcon';
-export { useIcons } from './icon/hooks/useIcons';
-export { IconsProvider } from './icon/providers/IconsProvider';
-export { iconsState } from './icon/states/iconsState';
-export type {
- IconComponentProps,
- IconComponent,
-} from './icon/types/IconComponent';
-export type { InfoAccent, InfoProps } from './info/components/Info';
-export { Info } from './info/components/Info';
-export { Status } from './status/components/Status';
-export { HorizontalSeparator } from './text/components/HorizontalSeparator';
-export { SeparatorLineText } from './text/components/SeparatorLineText';
-export { StyledTintedIconTileContainer } from './tinted-icon-tile/components/StyledTintedIconTileContainer';
-export type { TintedIconTileProps } from './tinted-icon-tile/components/TintedIconTile';
-export { TintedIconTile } from './tinted-icon-tile/components/TintedIconTile';
-export type { IconTileColorShades } from './tinted-icon-tile/utils/getIconTileColorShades';
-export { getIconTileColorShades } from './tinted-icon-tile/utils/getIconTileColorShades';
-export type { AppTooltipProps } from './tooltip/AppTooltip';
-export {
- TooltipPosition,
- TooltipDelay,
- AppTooltip,
-} from './tooltip/AppTooltip';
-export { OverflowingTextWithTooltip } from './tooltip/OverflowingTextWithTooltip';
-export { H1TitleFontColor, H1Title } from './typography/components/H1Title';
-export { H2Title } from './typography/components/H2Title';
-export { H3Title } from './typography/components/H3Title';
-export type { LabelVariant } from './typography/components/Label';
-export { Label } from './typography/components/Label';
-export {
- StyledTextContent,
- StyledTextWrapper,
- StyledText,
-} from './typography/components/StyledText';
+} from './components/TablerIcons';
+export { ThinkingOrbitLoaderIcon } from './components/ThinkingOrbitLoaderIcon';
+export { useIcons } from './hooks/useIcons';
+export { IconsProvider } from './providers/IconsProvider';
+export { iconsState } from './states/iconsState';
+export type { IconComponentProps, IconComponent } from './types/IconComponent';
diff --git a/packages/twenty-ui/src/display/icon/providers/IconsProvider.tsx b/packages/twenty-ui/src/icon/providers/IconsProvider.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/icon/providers/IconsProvider.tsx
rename to packages/twenty-ui/src/icon/providers/IconsProvider.tsx
index 1e93a39f990..aaa2c6e8962 100644
--- a/packages/twenty-ui/src/display/icon/providers/IconsProvider.tsx
+++ b/packages/twenty-ui/src/icon/providers/IconsProvider.tsx
@@ -1,7 +1,7 @@
import { useSetAtom } from 'jotai';
import { type JSX, useEffect } from 'react';
-import { iconsState } from '@ui/display/icon/states/iconsState';
+import { iconsState } from '@ui/icon/states/iconsState';
type IconsProviderProps = {
children: JSX.Element;
diff --git a/packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts b/packages/twenty-ui/src/icon/providers/internal/AllIcons.ts
similarity index 100%
rename from packages/twenty-ui/src/display/icon/providers/internal/AllIcons.ts
rename to packages/twenty-ui/src/icon/providers/internal/AllIcons.ts
diff --git a/packages/twenty-ui/src/display/icon/states/iconsState.ts b/packages/twenty-ui/src/icon/states/iconsState.ts
similarity index 64%
rename from packages/twenty-ui/src/display/icon/states/iconsState.ts
rename to packages/twenty-ui/src/icon/states/iconsState.ts
index 4a88b2cf07e..f4cbea163e1 100644
--- a/packages/twenty-ui/src/display/icon/states/iconsState.ts
+++ b/packages/twenty-ui/src/icon/states/iconsState.ts
@@ -1,6 +1,6 @@
import { atom } from 'jotai';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
export const iconsState = atom<Record<string, IconComponent>>({});
iconsState.debugLabel = 'iconsState';
diff --git a/packages/twenty-ui/src/display/icon/types/IconComponent.ts b/packages/twenty-ui/src/icon/types/IconComponent.ts
similarity index 100%
rename from packages/twenty-ui/src/display/icon/types/IconComponent.ts
rename to packages/twenty-ui/src/icon/types/IconComponent.ts
diff --git a/packages/twenty-ui/src/index.ts b/packages/twenty-ui/src/index.ts
index d0de71b2ae4..4bfda57bb1e 100644
--- a/packages/twenty-ui/src/index.ts
+++ b/packages/twenty-ui/src/index.ts
@@ -1,4 +1,24 @@
-// Side-effect import: the reset must ship exactly once in the aggregated style.css.
+/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
+ * |_| \_/\_/ \___|_| |_|\__|\__, |
+ * |___/
+ */
+
import './styles/base/reset.scss';
-export {};
+export * from './accessibility';
+export * from './data-display';
+export * from './feedback';
+export * from './icon';
+export * from './input';
+export * from './json-visualizer';
+export * from './layout';
+export * from './navigation';
+export * from './surfaces';
+export * from './theme';
+export * from './theme-constants';
+export * from './typography';
+export * from './utilities';
diff --git a/packages/twenty-ui/src/individual-entry.ts b/packages/twenty-ui/src/individual-entry.ts
index 2702c9d8db3..cf516527194 100644
--- a/packages/twenty-ui/src/individual-entry.ts
+++ b/packages/twenty-ui/src/individual-entry.ts
@@ -1,15 +1,22 @@
-// Entry point for the individual/self-contained build (vite.config.individual.ts).
-// Re-exports all public modules so a single bundle contains every component with
-// internal deps bundled, while React stays external for the consumer's bundler.
+/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
+ * |_| \_/\_/ \___|_| |_|\__|\__, |
+ * |___/
+ */
export * from './accessibility';
-export * from './components';
-export * from './display';
+export * from './data-display';
export * from './feedback';
+export * from './icon';
export * from './input';
export * from './json-visualizer';
export * from './layout';
export * from './navigation';
+export * from './surfaces';
export * from './theme';
export * from './theme-constants';
+export * from './typography';
export * from './utilities';
diff --git a/packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.module.scss b/packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.module.scss
rename to packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.module.scss.d.ts b/packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.module.scss.d.ts
rename to packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.tsx b/packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/AdvancedSettingsToggle.tsx
rename to packages/twenty-ui/src/input/AdvancedSettingsToggle/AdvancedSettingsToggle.tsx
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedButton.module.scss b/packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/AnimatedButton.module.scss
rename to packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedButton.module.scss.d.ts b/packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/AnimatedButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedButton.tsx b/packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.tsx
similarity index 99%
rename from packages/twenty-ui/src/input/button/components/AnimatedButton.tsx
rename to packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.tsx
index 59236332daf..2653c7a2e11 100644
--- a/packages/twenty-ui/src/input/button/components/AnimatedButton.tsx
+++ b/packages/twenty-ui/src/input/AnimatedButton/AnimatedButton.tsx
@@ -3,7 +3,7 @@ import { type MotionProps, motion } from 'framer-motion';
import React, { useContext, useMemo } from 'react';
import { Link } from 'react-router-dom';
-import { Pill } from '@ui/components/Pill/Pill';
+import { Pill } from '@ui/data-display/Pill/Pill';
import { ThemeContext, themeCssVariables } from '@ui/theme-constants';
import { GRAY_SCALE_LIGHT } from '@ui/theme/constants/GrayScaleLight';
import { useIsMobile } from '@ui/utilities';
@@ -13,7 +13,7 @@ import {
type ButtonPosition,
type ButtonProps,
type ButtonVariant,
-} from './Button/Button';
+} from '@ui/input/Button/Button';
import styles from './AnimatedButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.module.scss b/packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.module.scss
rename to packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.module.scss.d.ts b/packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx b/packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx
rename to packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.tsx
index 7828b847f47..ec590c47c57 100644
--- a/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx
+++ b/packages/twenty-ui/src/input/AnimatedLightIconButton/AnimatedLightIconButton.tsx
@@ -2,11 +2,11 @@ import { clsx } from 'clsx';
import { motion, type MotionProps } from 'framer-motion';
import { type ComponentProps, type MouseEvent, useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import {
type LightIconButtonAccent,
type LightIconButtonSize,
-} from '@ui/input/button/components/LightIconButton';
+} from '@ui/input/LightIconButton/LightIconButton';
import { ThemeContext } from '@ui/theme-constants';
import styles from './AnimatedLightIconButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx b/packages/twenty-ui/src/input/AnimatedLightIconButton/__stories__/AnimatedLightIconButton.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx
rename to packages/twenty-ui/src/input/AnimatedLightIconButton/__stories__/AnimatedLightIconButton.stories.tsx
index c9f4a8e2b25..3fad775eb8b 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/AnimatedLightIconButton/__stories__/AnimatedLightIconButton.stories.tsx
@@ -1,15 +1,15 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
type LightIconButtonAccent,
type LightIconButtonSize,
-} from '@ui/input/button/components/LightIconButton';
+} from '@ui/input/LightIconButton/LightIconButton';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { AnimatedLightIconButton } from '../AnimatedLightIconButton';
+import { AnimatedLightIconButton } from '@ui/input/AnimatedLightIconButton/AnimatedLightIconButton';
const meta: Meta<typeof AnimatedLightIconButton> = {
title: 'UI/Input/Button/AnimatedLightIconButton',
diff --git a/packages/twenty-ui/src/input/button/components/Button/Button.module.scss b/packages/twenty-ui/src/input/Button/Button.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/Button.module.scss
rename to packages/twenty-ui/src/input/Button/Button.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/Button/Button.module.scss.d.ts b/packages/twenty-ui/src/input/Button/Button.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/Button.module.scss.d.ts
rename to packages/twenty-ui/src/input/Button/Button.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/Button.tsx b/packages/twenty-ui/src/input/Button/Button.tsx
similarity index 90%
rename from packages/twenty-ui/src/input/button/components/Button/Button.tsx
rename to packages/twenty-ui/src/input/Button/Button.tsx
index 70960a20932..9a6f9e583e6 100644
--- a/packages/twenty-ui/src/input/button/components/Button/Button.tsx
+++ b/packages/twenty-ui/src/input/Button/Button.tsx
@@ -3,13 +3,13 @@ import React, { useState } from 'react';
import { Link } from 'react-router-dom';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
-import { ButtonHotkeys } from '@ui/input/button/components/Button/internal/ButtonHotKeys';
-import { ButtonIcon } from '@ui/input/button/components/Button/internal/ButtonIcon';
-import { ButtonSoon } from '@ui/input/button/components/Button/internal/ButtonSoon';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+import { ButtonHotkeys } from '@ui/input/Button/internal/ButtonHotKeys';
+import { ButtonIcon } from '@ui/input/Button/internal/ButtonIcon';
+import { ButtonSoon } from '@ui/input/Button/internal/ButtonSoon';
import { useIsMobile } from '@ui/utilities';
import { type ClickOutsideAttributes } from '@ui/utilities/types/ClickOutsideAttributes';
-import { ButtonText } from './internal/ButtonText';
+import { ButtonText } from '@ui/input/Button/internal/ButtonText';
import styles from './Button.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx b/packages/twenty-ui/src/input/Button/__stories__/Button.stories.tsx
similarity index 99%
rename from packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
rename to packages/twenty-ui/src/input/Button/__stories__/Button.stories.tsx
index 9de181ff912..9d9379b2bfc 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
+++ b/packages/twenty-ui/src/input/Button/__stories__/Button.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconReload, IconSearch } from '@ui/display';
+import { IconReload, IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
@@ -11,7 +11,7 @@ import {
type ButtonPosition,
type ButtonSize,
type ButtonVariant,
-} from '../Button/Button';
+} from '@ui/input/Button/Button';
const meta: Meta<typeof Button> = {
title: 'UI/Input/Button/Button',
diff --git a/packages/twenty-ui/src/input/button/components/Button/constant.ts b/packages/twenty-ui/src/input/Button/constant.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/constant.ts
rename to packages/twenty-ui/src/input/Button/constant.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.module.scss b/packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.module.scss
rename to packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.module.scss.d.ts b/packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.module.scss.d.ts
rename to packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.tsx b/packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.tsx
similarity index 92%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.tsx
rename to packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.tsx
index 07ab119c997..0e0178eb7e8 100644
--- a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonHotKeys.tsx
+++ b/packages/twenty-ui/src/input/Button/internal/ButtonHotKeys.tsx
@@ -2,7 +2,7 @@ import {
type ButtonAccent,
type ButtonSize,
type ButtonVariant,
-} from '@ui/input/button/components/Button/Button';
+} from '@ui/input/Button/Button';
import { getOsShortcutSeparator } from '@ui/utilities';
import styles from './ButtonHotKeys.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.module.scss b/packages/twenty-ui/src/input/Button/internal/ButtonIcon.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.module.scss
rename to packages/twenty-ui/src/input/Button/internal/ButtonIcon.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.module.scss.d.ts b/packages/twenty-ui/src/input/Button/internal/ButtonIcon.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.module.scss.d.ts
rename to packages/twenty-ui/src/input/Button/internal/ButtonIcon.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.tsx b/packages/twenty-ui/src/input/Button/internal/ButtonIcon.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.tsx
rename to packages/twenty-ui/src/input/Button/internal/ButtonIcon.tsx
index 8d8f5fb1f9d..e5fdc5f09ab 100644
--- a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonIcon.tsx
+++ b/packages/twenty-ui/src/input/Button/internal/ButtonIcon.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { Loader } from '@ui/feedback';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.module.scss b/packages/twenty-ui/src/input/Button/internal/ButtonSoon.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.module.scss
rename to packages/twenty-ui/src/input/Button/internal/ButtonSoon.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.module.scss.d.ts b/packages/twenty-ui/src/input/Button/internal/ButtonSoon.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.module.scss.d.ts
rename to packages/twenty-ui/src/input/Button/internal/ButtonSoon.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.tsx b/packages/twenty-ui/src/input/Button/internal/ButtonSoon.tsx
similarity index 85%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.tsx
rename to packages/twenty-ui/src/input/Button/internal/ButtonSoon.tsx
index 50abfde4e03..9cf0dd15409 100644
--- a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonSoon.tsx
+++ b/packages/twenty-ui/src/input/Button/internal/ButtonSoon.tsx
@@ -1,4 +1,4 @@
-import { Pill } from '@ui/components';
+import { Pill } from '@ui/data-display';
import styles from './ButtonSoon.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.module.scss b/packages/twenty-ui/src/input/Button/internal/ButtonText.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.module.scss
rename to packages/twenty-ui/src/input/Button/internal/ButtonText.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.module.scss.d.ts b/packages/twenty-ui/src/input/Button/internal/ButtonText.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.module.scss.d.ts
rename to packages/twenty-ui/src/input/Button/internal/ButtonText.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.tsx b/packages/twenty-ui/src/input/Button/internal/ButtonText.tsx
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/Button/internal/ButtonText.tsx
rename to packages/twenty-ui/src/input/Button/internal/ButtonText.tsx
diff --git a/packages/twenty-ui/src/input/button/components/ButtonGroup.module.scss b/packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/ButtonGroup.module.scss
rename to packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/ButtonGroup.module.scss.d.ts b/packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/ButtonGroup.module.scss.d.ts
rename to packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/ButtonGroup.tsx b/packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/button/components/ButtonGroup.tsx
rename to packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.tsx
index d6124002060..b005b2a7c28 100644
--- a/packages/twenty-ui/src/input/button/components/ButtonGroup.tsx
+++ b/packages/twenty-ui/src/input/ButtonGroup/ButtonGroup.tsx
@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
import React, { type ReactNode } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { type ButtonPosition, type ButtonProps } from './Button/Button';
+import { type ButtonPosition, type ButtonProps } from '@ui/input/Button/Button';
import styles from './ButtonGroup.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/ButtonGroup.stories.tsx b/packages/twenty-ui/src/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/input/button/components/__stories__/ButtonGroup.stories.tsx
rename to packages/twenty-ui/src/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
index ef2ddea9da9..74bd98a3cb7 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/ButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/display';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
@@ -10,8 +10,8 @@ import {
type ButtonAccent,
type ButtonSize,
type ButtonVariant,
-} from '../Button/Button';
-import { ButtonGroup } from '../ButtonGroup';
+} from '@ui/input/Button/Button';
+import { ButtonGroup } from '@ui/input/ButtonGroup/ButtonGroup';
const meta: Meta<typeof ButtonGroup> = {
title: 'UI/Input/Button/ButtonGroup',
diff --git a/packages/twenty-ui/src/input/components/CardPicker.module.scss b/packages/twenty-ui/src/input/CardPicker/CardPicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/components/CardPicker.module.scss
rename to packages/twenty-ui/src/input/CardPicker/CardPicker.module.scss
diff --git a/packages/twenty-ui/src/input/components/CardPicker.module.scss.d.ts b/packages/twenty-ui/src/input/CardPicker/CardPicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/components/CardPicker.module.scss.d.ts
rename to packages/twenty-ui/src/input/CardPicker/CardPicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/components/CardPicker.tsx b/packages/twenty-ui/src/input/CardPicker/CardPicker.tsx
similarity index 91%
rename from packages/twenty-ui/src/input/components/CardPicker.tsx
rename to packages/twenty-ui/src/input/CardPicker/CardPicker.tsx
index a061508a20f..49207e26956 100644
--- a/packages/twenty-ui/src/input/components/CardPicker.tsx
+++ b/packages/twenty-ui/src/input/CardPicker/CardPicker.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import styles from './CardPicker.module.scss';
-import { Radio } from './Radio';
+import { Radio } from '@ui/input/Radio/Radio';
type CardPickerProps = {
children: React.ReactNode;
diff --git a/packages/twenty-ui/src/input/components/Checkbox.module.scss b/packages/twenty-ui/src/input/Checkbox/Checkbox.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/components/Checkbox.module.scss
rename to packages/twenty-ui/src/input/Checkbox/Checkbox.module.scss
diff --git a/packages/twenty-ui/src/input/components/Checkbox.module.scss.d.ts b/packages/twenty-ui/src/input/Checkbox/Checkbox.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/components/Checkbox.module.scss.d.ts
rename to packages/twenty-ui/src/input/Checkbox/Checkbox.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/components/Checkbox.tsx b/packages/twenty-ui/src/input/Checkbox/Checkbox.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/components/Checkbox.tsx
rename to packages/twenty-ui/src/input/Checkbox/Checkbox.tsx
index b93f38e6b96..4057c8bc6dd 100644
--- a/packages/twenty-ui/src/input/components/Checkbox.tsx
+++ b/packages/twenty-ui/src/input/Checkbox/Checkbox.tsx
@@ -2,7 +2,7 @@ import { Checkbox as CheckboxPrimitive } from '@base-ui/react/checkbox';
import { clsx } from 'clsx';
import * as React from 'react';
-import { IconCheck, IconMinus } from '@ui/display/icon/components/TablerIcons';
+import { IconCheck, IconMinus } from '@ui/icon/components/TablerIcons';
import styles from './Checkbox.module.scss';
diff --git a/packages/twenty-ui/src/input/components/__stories__/Checkbox.stories.tsx b/packages/twenty-ui/src/input/Checkbox/__stories__/Checkbox.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/input/components/__stories__/Checkbox.stories.tsx
rename to packages/twenty-ui/src/input/Checkbox/__stories__/Checkbox.stories.tsx
index efdab51fe19..93105dfe3eb 100644
--- a/packages/twenty-ui/src/input/components/__stories__/Checkbox.stories.tsx
+++ b/packages/twenty-ui/src/input/Checkbox/__stories__/Checkbox.stories.tsx
@@ -11,7 +11,7 @@ import {
CheckboxShape,
CheckboxSize,
CheckboxVariant,
-} from '../Checkbox';
+} from '@ui/input/Checkbox/Checkbox';
const meta: Meta<typeof Checkbox> = {
title: 'UI/Input/Checkbox/Checkbox',
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.module.scss b/packages/twenty-ui/src/input/CodeEditor/CodeEditor.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditor.module.scss
rename to packages/twenty-ui/src/input/CodeEditor/CodeEditor.module.scss
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.module.scss.d.ts b/packages/twenty-ui/src/input/CodeEditor/CodeEditor.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditor.module.scss.d.ts
rename to packages/twenty-ui/src/input/CodeEditor/CodeEditor.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx b/packages/twenty-ui/src/input/CodeEditor/CodeEditor.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
rename to packages/twenty-ui/src/input/CodeEditor/CodeEditor.tsx
index 54e7734c702..2c2fa84101a 100644
--- a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
+++ b/packages/twenty-ui/src/input/CodeEditor/CodeEditor.tsx
@@ -1,9 +1,9 @@
import Editor, { type EditorProps, type Monaco } from '@monaco-editor/react';
-import { Loader } from '@ui/feedback/loader/components/Loader';
-import { BASE_CODE_EDITOR_THEME_ID } from '@ui/input/code-editor/constants/BaseCodeEditorThemeId';
-import { getBaseCodeEditorTheme } from '@ui/input/code-editor/theme/utils/getBaseCodeEditorTheme';
-import { ResizeHandle } from '@ui/layout/resize-handle/components/ResizeHandle';
-import { useResizeHandle } from '@ui/layout/resize-handle/hooks/useResizeHandle';
+import { Loader } from '@ui/feedback/Loader/Loader';
+import { BASE_CODE_EDITOR_THEME_ID } from '@ui/input/CodeEditor/constants/BaseCodeEditorThemeId';
+import { getBaseCodeEditorTheme } from '@ui/input/CodeEditor/utils/getBaseCodeEditorTheme';
+import { ResizeHandle } from '@ui/layout/ResizeHandle/ResizeHandle';
+import { useResizeHandle } from '@ui/layout/ResizeHandle/hooks/useResizeHandle';
import { ThemeContext, type ThemeType } from '@ui/theme-constants';
import { type editor } from 'monaco-editor';
import { type KeyboardEvent, useContext, useEffect, useState } from 'react';
diff --git a/packages/twenty-ui/src/input/code-editor/constants/BaseCodeEditorThemeId.ts b/packages/twenty-ui/src/input/CodeEditor/constants/BaseCodeEditorThemeId.ts
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/constants/BaseCodeEditorThemeId.ts
rename to packages/twenty-ui/src/input/CodeEditor/constants/BaseCodeEditorThemeId.ts
diff --git a/packages/twenty-ui/src/input/code-editor/theme/utils/getBaseCodeEditorTheme.ts b/packages/twenty-ui/src/input/CodeEditor/utils/getBaseCodeEditorTheme.ts
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/theme/utils/getBaseCodeEditorTheme.ts
rename to packages/twenty-ui/src/input/CodeEditor/utils/getBaseCodeEditorTheme.ts
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.module.scss b/packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.module.scss
rename to packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.module.scss
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.module.scss.d.ts b/packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.module.scss.d.ts
rename to packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.tsx b/packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.tsx
similarity index 100%
rename from packages/twenty-ui/src/input/code-editor/components/CodeEditorHeader.tsx
rename to packages/twenty-ui/src/input/CodeEditorHeader/CodeEditorHeader.tsx
diff --git a/packages/twenty-ui/src/input/button/components/ColorPickerButton.module.scss b/packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/ColorPickerButton.module.scss
rename to packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/ColorPickerButton.module.scss.d.ts b/packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/ColorPickerButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/ColorPickerButton.tsx b/packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.tsx
similarity index 83%
rename from packages/twenty-ui/src/input/button/components/ColorPickerButton.tsx
rename to packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.tsx
index 842e8977f73..b9d451811ba 100644
--- a/packages/twenty-ui/src/input/button/components/ColorPickerButton.tsx
+++ b/packages/twenty-ui/src/input/ColorPickerButton/ColorPickerButton.tsx
@@ -1,8 +1,8 @@
-import { ColorSample, type ColorSampleProps } from '@ui/display';
+import { ColorSample, type ColorSampleProps } from '@ui/data-display';
import {
LightIconButton,
type LightIconButtonProps,
-} from '@ui/input/button/components/LightIconButton';
+} from '@ui/input/LightIconButton/LightIconButton';
import styles from './ColorPickerButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/ColorPickerButton.stories.tsx b/packages/twenty-ui/src/input/ColorPickerButton/__stories__/ColorPickerButton.stories.tsx
similarity index 89%
rename from packages/twenty-ui/src/input/button/components/__stories__/ColorPickerButton.stories.tsx
rename to packages/twenty-ui/src/input/ColorPickerButton/__stories__/ColorPickerButton.stories.tsx
index 9f9aa133960..63540cae6a5 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/ColorPickerButton.stories.tsx
+++ b/packages/twenty-ui/src/input/ColorPickerButton/__stories__/ColorPickerButton.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { ColorPickerButton } from '../ColorPickerButton';
+import { ColorPickerButton } from '@ui/input/ColorPickerButton/ColorPickerButton';
const meta: Meta<typeof ColorPickerButton> = {
title: 'UI/Input/Button/ColorPickerButton',
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.module.scss b/packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.module.scss
rename to packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.module.scss
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.module.scss.d.ts b/packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.module.scss.d.ts
rename to packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.tsx b/packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.tsx
similarity index 97%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.tsx
rename to packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.tsx
index e23d2a115a8..c8ba03f5bd5 100644
--- a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemeCard.tsx
+++ b/packages/twenty-ui/src/input/ColorSchemeCard/ColorSchemeCard.tsx
@@ -3,7 +3,7 @@ import React from 'react';
import { clsx } from 'clsx';
import { type AnimationControls } from 'framer-motion';
-import { Checkmark } from '@ui/display/checkmark/components/Checkmark';
+import { Checkmark } from '@ui/data-display/Checkmark/Checkmark';
import { type ColorScheme } from '@ui/input/types/ColorScheme';
import { GRAY_SCALE_DARK } from '@ui/theme/constants/GrayScaleDark';
import { GRAY_SCALE_LIGHT } from '@ui/theme/constants/GrayScaleLight';
diff --git a/packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.module.scss b/packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.module.scss
rename to packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss
diff --git a/packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.module.scss.d.ts b/packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.module.scss.d.ts
rename to packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx b/packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
similarity index 92%
rename from packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx
rename to packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
index c41978265f8..6b2a95758bc 100644
--- a/packages/twenty-ui/src/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx
+++ b/packages/twenty-ui/src/input/ColorSchemeCard/__stories__/ColorSchemeCard.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { ColorSchemeCard } from '../ColorSchemeCard';
+import { ColorSchemeCard } from '@ui/input/ColorSchemeCard/ColorSchemeCard';
import styles from './ColorSchemeCard.stories.module.scss';
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.module.scss b/packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.module.scss
rename to packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.module.scss
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.module.scss.d.ts b/packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.module.scss.d.ts
rename to packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.tsx b/packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.tsx
rename to packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.tsx
index 72c977bbddd..111e214c0e0 100644
--- a/packages/twenty-ui/src/input/color-scheme/components/ColorSchemePicker.tsx
+++ b/packages/twenty-ui/src/input/ColorSchemePicker/ColorSchemePicker.tsx
@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
import { type ColorScheme } from '@ui/input/types/ColorScheme';
-import { ColorSchemeCard } from './ColorSchemeCard';
+import { ColorSchemeCard } from '@ui/input/ColorSchemeCard/ColorSchemeCard';
import styles from './ColorSchemePicker.module.scss';
export type ColorSchemePickerProps = {
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButton.module.scss b/packages/twenty-ui/src/input/FloatingButton/FloatingButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingButton.module.scss
rename to packages/twenty-ui/src/input/FloatingButton/FloatingButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButton.module.scss.d.ts b/packages/twenty-ui/src/input/FloatingButton/FloatingButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/FloatingButton/FloatingButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButton.tsx b/packages/twenty-ui/src/input/FloatingButton/FloatingButton.tsx
similarity index 97%
rename from packages/twenty-ui/src/input/button/components/FloatingButton.tsx
rename to packages/twenty-ui/src/input/FloatingButton/FloatingButton.tsx
index a3970b3563f..6a97ee57646 100644
--- a/packages/twenty-ui/src/input/button/components/FloatingButton.tsx
+++ b/packages/twenty-ui/src/input/FloatingButton/FloatingButton.tsx
@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
import { useContext } from 'react';
import { Link } from 'react-router-dom';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './FloatingButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/FloatingButton.stories.tsx b/packages/twenty-ui/src/input/FloatingButton/__stories__/FloatingButton.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/__stories__/FloatingButton.stories.tsx
rename to packages/twenty-ui/src/input/FloatingButton/__stories__/FloatingButton.stories.tsx
index 704044977b0..532dda18668 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/FloatingButton.stories.tsx
+++ b/packages/twenty-ui/src/input/FloatingButton/__stories__/FloatingButton.stories.tsx
@@ -1,11 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { FloatingButton, type FloatingButtonSize } from '../FloatingButton';
+import {
+ FloatingButton,
+ type FloatingButtonSize,
+} from '@ui/input/FloatingButton/FloatingButton';
const meta: Meta<typeof FloatingButton> = {
title: 'UI/Input/Button/FloatingButton',
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButtonGroup.module.scss b/packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingButtonGroup.module.scss
rename to packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButtonGroup.module.scss.d.ts b/packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingButtonGroup.module.scss.d.ts
rename to packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/FloatingButtonGroup.tsx b/packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/button/components/FloatingButtonGroup.tsx
rename to packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.tsx
index 74d48ef76eb..41085b64566 100644
--- a/packages/twenty-ui/src/input/button/components/FloatingButtonGroup.tsx
+++ b/packages/twenty-ui/src/input/FloatingButtonGroup/FloatingButtonGroup.tsx
@@ -5,7 +5,7 @@ import { isDefined } from '@ui/utilities/utils/isDefined';
import {
type FloatingButtonPosition,
type FloatingButtonProps,
-} from './FloatingButton';
+} from '@ui/input/FloatingButton/FloatingButton';
import styles from './FloatingButtonGroup.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/FloatingButtonGroup.stories.tsx b/packages/twenty-ui/src/input/FloatingButtonGroup/__stories__/FloatingButtonGroup.stories.tsx
similarity index 89%
rename from packages/twenty-ui/src/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
rename to packages/twenty-ui/src/input/FloatingButtonGroup/__stories__/FloatingButtonGroup.stories.tsx
index f9293485e33..0be3985fbba 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/input/FloatingButtonGroup/__stories__/FloatingButtonGroup.stories.tsx
@@ -1,12 +1,15 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/display';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { FloatingButton, type FloatingButtonSize } from '../FloatingButton';
-import { FloatingButtonGroup } from '../FloatingButtonGroup';
+import {
+ FloatingButton,
+ type FloatingButtonSize,
+} from '@ui/input/FloatingButton/FloatingButton';
+import { FloatingButtonGroup } from '@ui/input/FloatingButtonGroup/FloatingButtonGroup';
const meta: Meta<typeof FloatingButtonGroup> = {
title: 'UI/Input/Button/FloatingButtonGroup',
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButton.module.scss b/packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButton.module.scss
rename to packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButton.module.scss.d.ts b/packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButton.tsx b/packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButton.tsx
rename to packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.tsx
index 1a9a816f876..c60cc40a9c5 100644
--- a/packages/twenty-ui/src/input/button/components/FloatingIconButton.tsx
+++ b/packages/twenty-ui/src/input/FloatingIconButton/FloatingIconButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import React, { useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './FloatingIconButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButton.stories.tsx b/packages/twenty-ui/src/input/FloatingIconButton/__stories__/FloatingIconButton.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButton.stories.tsx
rename to packages/twenty-ui/src/input/FloatingIconButton/__stories__/FloatingIconButton.stories.tsx
index e81fe23585b..c1a226eee46 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/FloatingIconButton/__stories__/FloatingIconButton.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
@@ -8,7 +8,7 @@ import {
import {
FloatingIconButton,
type FloatingIconButtonSize,
-} from '../FloatingIconButton';
+} from '@ui/input/FloatingIconButton/FloatingIconButton';
const meta: Meta<typeof FloatingIconButton> = {
title: 'UI/Input/Button/FloatingIconButton',
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.module.scss b/packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.module.scss
rename to packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.module.scss.d.ts b/packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.module.scss.d.ts
rename to packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.tsx b/packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.tsx
rename to packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.tsx
index 05f0c24a5dd..c728551a8de 100644
--- a/packages/twenty-ui/src/input/button/components/FloatingIconButtonGroup.tsx
+++ b/packages/twenty-ui/src/input/FloatingIconButtonGroup/FloatingIconButtonGroup.tsx
@@ -1,13 +1,13 @@
import { clsx } from 'clsx';
import { type MouseEvent } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import {
FloatingIconButton,
type FloatingIconButtonPosition,
type FloatingIconButtonProps,
-} from './FloatingIconButton';
+} from '@ui/input/FloatingIconButton/FloatingIconButton';
import styles from './FloatingIconButtonGroup.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx b/packages/twenty-ui/src/input/FloatingIconButtonGroup/__stories__/FloatingIconButtonGroup.stories.tsx
similarity index 87%
rename from packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
rename to packages/twenty-ui/src/input/FloatingIconButtonGroup/__stories__/FloatingIconButtonGroup.stories.tsx
index e0d8ce998af..d2082db341e 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/input/FloatingIconButtonGroup/__stories__/FloatingIconButtonGroup.stories.tsx
@@ -1,12 +1,12 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/display';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { type FloatingIconButtonSize } from '../FloatingIconButton';
-import { FloatingIconButtonGroup } from '../FloatingIconButtonGroup';
+import { type FloatingIconButtonSize } from '@ui/input/FloatingIconButton/FloatingIconButton';
+import { FloatingIconButtonGroup } from '@ui/input/FloatingIconButtonGroup/FloatingIconButtonGroup';
const meta: Meta<typeof FloatingIconButtonGroup> = {
title: 'UI/Input/Button/FloatingIconButtonGroup',
diff --git a/packages/twenty-ui/src/input/button/components/IconButton.module.scss b/packages/twenty-ui/src/input/IconButton/IconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/IconButton.module.scss
rename to packages/twenty-ui/src/input/IconButton/IconButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/IconButton.module.scss.d.ts b/packages/twenty-ui/src/input/IconButton/IconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/IconButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/IconButton/IconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/IconButton.tsx b/packages/twenty-ui/src/input/IconButton/IconButton.tsx
similarity index 97%
rename from packages/twenty-ui/src/input/button/components/IconButton.tsx
rename to packages/twenty-ui/src/input/IconButton/IconButton.tsx
index bcf985b3d9c..a0d30057999 100644
--- a/packages/twenty-ui/src/input/button/components/IconButton.tsx
+++ b/packages/twenty-ui/src/input/IconButton/IconButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import React, { useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './IconButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/IconButton.stories.tsx b/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/input/button/components/__stories__/IconButton.stories.tsx
rename to packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
index 06e6b40c9ac..ba5f1acc787 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/IconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
@@ -11,7 +11,7 @@ import {
type IconButtonPosition,
type IconButtonSize,
type IconButtonVariant,
-} from '../IconButton';
+} from '@ui/input/IconButton/IconButton';
const meta: Meta<typeof IconButton> = {
title: 'UI/Input/Button/IconButton',
diff --git a/packages/twenty-ui/src/input/button/components/IconButtonGroup.module.scss b/packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/IconButtonGroup.module.scss
rename to packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/IconButtonGroup.module.scss.d.ts b/packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/IconButtonGroup.module.scss.d.ts
rename to packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/IconButtonGroup.tsx b/packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.tsx
similarity index 87%
rename from packages/twenty-ui/src/input/button/components/IconButtonGroup.tsx
rename to packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.tsx
index 9bb9c016136..1f8cf134ee2 100644
--- a/packages/twenty-ui/src/input/button/components/IconButtonGroup.tsx
+++ b/packages/twenty-ui/src/input/IconButtonGroup/IconButtonGroup.tsx
@@ -1,8 +1,8 @@
import { clsx } from 'clsx';
import { type MouseEvent } from 'react';
-import { type IconComponent } from '@ui/display';
-import { InsideButton } from '@ui/input/button/components/InsideButton';
+import { type IconComponent } from '@ui/icon';
+import { InsideButton } from '@ui/input/InsideButton/InsideButton';
import styles from './IconButtonGroup.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/IconButtonGroup.stories.tsx b/packages/twenty-ui/src/input/IconButtonGroup/__stories__/IconButtonGroup.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/button/components/__stories__/IconButtonGroup.stories.tsx
rename to packages/twenty-ui/src/input/IconButtonGroup/__stories__/IconButtonGroup.stories.tsx
index b1d40258ab2..fc6fc25985e 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/IconButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/input/IconButtonGroup/__stories__/IconButtonGroup.stories.tsx
@@ -1,12 +1,12 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/display';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { IconButtonGroup } from '../IconButtonGroup';
+import { IconButtonGroup } from '@ui/input/IconButtonGroup/IconButtonGroup';
const meta: Meta<typeof IconButtonGroup> = {
title: 'UI/Input/Button/IconButtonGroup',
diff --git a/packages/twenty-ui/src/input/components/IconListViewGrip.tsx b/packages/twenty-ui/src/input/IconListViewGrip/IconListViewGrip.tsx
similarity index 81%
rename from packages/twenty-ui/src/input/components/IconListViewGrip.tsx
rename to packages/twenty-ui/src/input/IconListViewGrip/IconListViewGrip.tsx
index c7f4b344bfa..4b60c016bac 100644
--- a/packages/twenty-ui/src/input/components/IconListViewGrip.tsx
+++ b/packages/twenty-ui/src/input/IconListViewGrip/IconListViewGrip.tsx
@@ -1,5 +1,5 @@
import IconListViewGripRaw from '@assets/misc/list-view-grip.svg?react';
-import { type IconComponentProps } from '@ui/display/icon/types/IconComponent';
+import { type IconComponentProps } from '@ui/icon/types/IconComponent';
type IconListViewGripProps = Pick<IconComponentProps, 'size' | 'stroke'>;
diff --git a/packages/twenty-ui/src/input/button/components/InsideButton.module.scss b/packages/twenty-ui/src/input/InsideButton/InsideButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/InsideButton.module.scss
rename to packages/twenty-ui/src/input/InsideButton/InsideButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/InsideButton.module.scss.d.ts b/packages/twenty-ui/src/input/InsideButton/InsideButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/InsideButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/InsideButton/InsideButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/InsideButton.tsx b/packages/twenty-ui/src/input/InsideButton/InsideButton.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/InsideButton.tsx
rename to packages/twenty-ui/src/input/InsideButton/InsideButton.tsx
index 7edb37ac799..e24853c31f0 100644
--- a/packages/twenty-ui/src/input/button/components/InsideButton.tsx
+++ b/packages/twenty-ui/src/input/InsideButton/InsideButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import React, { useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './InsideButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/LightButton.module.scss b/packages/twenty-ui/src/input/LightButton/LightButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightButton.module.scss
rename to packages/twenty-ui/src/input/LightButton/LightButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/LightButton.module.scss.d.ts b/packages/twenty-ui/src/input/LightButton/LightButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/LightButton/LightButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/LightButton.tsx b/packages/twenty-ui/src/input/LightButton/LightButton.tsx
similarity index 95%
rename from packages/twenty-ui/src/input/button/components/LightButton.tsx
rename to packages/twenty-ui/src/input/LightButton/LightButton.tsx
index 118afaae8b5..54b67a3fd51 100644
--- a/packages/twenty-ui/src/input/button/components/LightButton.tsx
+++ b/packages/twenty-ui/src/input/LightButton/LightButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import { type MouseEvent, useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './LightButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/LightButton.stories.tsx b/packages/twenty-ui/src/input/LightButton/__stories__/LightButton.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/button/components/__stories__/LightButton.stories.tsx
rename to packages/twenty-ui/src/input/LightButton/__stories__/LightButton.stories.tsx
index a16b79c196c..61775d4340d 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/LightButton.stories.tsx
+++ b/packages/twenty-ui/src/input/LightButton/__stories__/LightButton.stories.tsx
@@ -1,11 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { LightButton, type LightButtonAccent } from '../LightButton';
+import {
+ LightButton,
+ type LightButtonAccent,
+} from '@ui/input/LightButton/LightButton';
const meta: Meta<typeof LightButton> = {
title: 'UI/Input/Button/LightButton',
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButton.module.scss b/packages/twenty-ui/src/input/LightIconButton/LightIconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightIconButton.module.scss
rename to packages/twenty-ui/src/input/LightIconButton/LightIconButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButton.module.scss.d.ts b/packages/twenty-ui/src/input/LightIconButton/LightIconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightIconButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/LightIconButton/LightIconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButton.tsx b/packages/twenty-ui/src/input/LightIconButton/LightIconButton.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/button/components/LightIconButton.tsx
rename to packages/twenty-ui/src/input/LightIconButton/LightIconButton.tsx
index 7092d18a715..02c793d0452 100644
--- a/packages/twenty-ui/src/input/button/components/LightIconButton.tsx
+++ b/packages/twenty-ui/src/input/LightIconButton/LightIconButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import { type ComponentProps, type MouseEvent, useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './LightIconButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/LightIconButton.stories.tsx b/packages/twenty-ui/src/input/LightIconButton/__stories__/LightIconButton.stories.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/button/components/__stories__/LightIconButton.stories.tsx
rename to packages/twenty-ui/src/input/LightIconButton/__stories__/LightIconButton.stories.tsx
index bb9c10ee1a1..c0f93241954 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/LightIconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/LightIconButton/__stories__/LightIconButton.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/display';
+import { IconSearch } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
@@ -9,7 +9,7 @@ import {
LightIconButton,
type LightIconButtonAccent,
type LightIconButtonSize,
-} from '../LightIconButton';
+} from '@ui/input/LightIconButton/LightIconButton';
const meta: Meta<typeof LightIconButton> = {
title: 'UI/Input/Button/LightIconButton',
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButtonGroup.module.scss b/packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightIconButtonGroup.module.scss
rename to packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButtonGroup.module.scss.d.ts b/packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/LightIconButtonGroup.module.scss.d.ts
rename to packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButtonGroup.tsx b/packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.tsx
similarity index 90%
rename from packages/twenty-ui/src/input/button/components/LightIconButtonGroup.tsx
rename to packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.tsx
index b4a0847f885..8b605dc4397 100644
--- a/packages/twenty-ui/src/input/button/components/LightIconButtonGroup.tsx
+++ b/packages/twenty-ui/src/input/LightIconButtonGroup/LightIconButtonGroup.tsx
@@ -4,10 +4,13 @@ import {
type ReactElement,
} from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { clsx } from 'clsx';
-import { LightIconButton, type LightIconButtonProps } from './LightIconButton';
+import {
+ LightIconButton,
+ type LightIconButtonProps,
+} from '@ui/input/LightIconButton/LightIconButton';
import styles from './LightIconButtonGroup.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/MainButton.module.scss b/packages/twenty-ui/src/input/MainButton/MainButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/MainButton.module.scss
rename to packages/twenty-ui/src/input/MainButton/MainButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/MainButton.module.scss.d.ts b/packages/twenty-ui/src/input/MainButton/MainButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/MainButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/MainButton/MainButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/MainButton.tsx b/packages/twenty-ui/src/input/MainButton/MainButton.tsx
similarity index 96%
rename from packages/twenty-ui/src/input/button/components/MainButton.tsx
rename to packages/twenty-ui/src/input/MainButton/MainButton.tsx
index 24ca26c40e1..f564e971127 100644
--- a/packages/twenty-ui/src/input/button/components/MainButton.tsx
+++ b/packages/twenty-ui/src/input/MainButton/MainButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import React, { type FunctionComponent, useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './MainButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/MainButton.stories.tsx b/packages/twenty-ui/src/input/MainButton/__stories__/MainButton.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/__stories__/MainButton.stories.tsx
rename to packages/twenty-ui/src/input/MainButton/__stories__/MainButton.stories.tsx
index b1f68b1f513..ff86cf79834 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/MainButton.stories.tsx
+++ b/packages/twenty-ui/src/input/MainButton/__stories__/MainButton.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBrandGoogle } from '@ui/display';
+import { IconBrandGoogle } from '@ui/icon';
import { ComponentDecorator } from '@ui/testing';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { MainButton } from '../MainButton';
+import { MainButton } from '@ui/input/MainButton/MainButton';
const clickJestFn = fn();
diff --git a/packages/twenty-ui/src/input/components/Radio.module.scss b/packages/twenty-ui/src/input/Radio/Radio.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/components/Radio.module.scss
rename to packages/twenty-ui/src/input/Radio/Radio.module.scss
diff --git a/packages/twenty-ui/src/input/components/Radio.module.scss.d.ts b/packages/twenty-ui/src/input/Radio/Radio.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/components/Radio.module.scss.d.ts
rename to packages/twenty-ui/src/input/Radio/Radio.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/components/Radio.tsx b/packages/twenty-ui/src/input/Radio/Radio.tsx
similarity index 97%
rename from packages/twenty-ui/src/input/components/Radio.tsx
rename to packages/twenty-ui/src/input/Radio/Radio.tsx
index 79be597cc10..ed652dc1458 100644
--- a/packages/twenty-ui/src/input/components/Radio.tsx
+++ b/packages/twenty-ui/src/input/Radio/Radio.tsx
@@ -4,7 +4,7 @@ import { clsx } from 'clsx';
import * as React from 'react';
import styles from './Radio.module.scss';
-import { RadioGroup } from './RadioGroup';
+import { RadioGroup } from '@ui/input/RadioGroup/RadioGroup';
export enum RadioSize {
Large = 'large',
diff --git a/packages/twenty-ui/src/input/components/__stories__/Radio.stories.tsx b/packages/twenty-ui/src/input/Radio/__stories__/Radio.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/input/components/__stories__/Radio.stories.tsx
rename to packages/twenty-ui/src/input/Radio/__stories__/Radio.stories.tsx
index 763587b74e1..c55cb23cd97 100644
--- a/packages/twenty-ui/src/input/components/__stories__/Radio.stories.tsx
+++ b/packages/twenty-ui/src/input/Radio/__stories__/Radio.stories.tsx
@@ -5,7 +5,7 @@ import {
ComponentDecorator,
} from '@ui/testing';
-import { LabelPosition, Radio, RadioSize } from '../Radio';
+import { LabelPosition, Radio, RadioSize } from '@ui/input/Radio/Radio';
const meta: Meta<typeof Radio> = {
title: 'UI/Input/Radio/Radio',
diff --git a/packages/twenty-ui/src/input/components/RadioGroup.tsx b/packages/twenty-ui/src/input/RadioGroup/RadioGroup.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/components/RadioGroup.tsx
rename to packages/twenty-ui/src/input/RadioGroup/RadioGroup.tsx
index 2c9a3ede743..4c2f021d5c0 100644
--- a/packages/twenty-ui/src/input/components/RadioGroup.tsx
+++ b/packages/twenty-ui/src/input/RadioGroup/RadioGroup.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { themeCssVariables } from '@ui/theme-constants';
-import { type RadioProps } from './Radio';
+import { type RadioProps } from '@ui/input/Radio/Radio';
type RadioGroupProps = React.PropsWithChildren & {
value?: string;
diff --git a/packages/twenty-ui/src/input/button/components/RoundedIconButton.module.scss b/packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/RoundedIconButton.module.scss
rename to packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/RoundedIconButton.module.scss.d.ts b/packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/RoundedIconButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/RoundedIconButton.tsx b/packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.tsx
similarity index 93%
rename from packages/twenty-ui/src/input/button/components/RoundedIconButton.tsx
rename to packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.tsx
index a37a58e1fdc..562671b2897 100644
--- a/packages/twenty-ui/src/input/button/components/RoundedIconButton.tsx
+++ b/packages/twenty-ui/src/input/RoundedIconButton/RoundedIconButton.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import React, { useContext } from 'react';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import styles from './RoundedIconButton.module.scss';
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/RoundedIconButton.stories.tsx b/packages/twenty-ui/src/input/RoundedIconButton/__stories__/RoundedIconButton.stories.tsx
similarity index 88%
rename from packages/twenty-ui/src/input/button/components/__stories__/RoundedIconButton.stories.tsx
rename to packages/twenty-ui/src/input/RoundedIconButton/__stories__/RoundedIconButton.stories.tsx
index b8da41752af..752455b0ddc 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/RoundedIconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/RoundedIconButton/__stories__/RoundedIconButton.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconArrowRight } from '@ui/display';
+import { IconArrowRight } from '@ui/icon';
import { ComponentDecorator } from '@ui/testing';
import { expect, fn, userEvent, within } from 'storybook/test';
-import { RoundedIconButton } from '../RoundedIconButton';
+import { RoundedIconButton } from '@ui/input/RoundedIconButton/RoundedIconButton';
const clickJestFn = fn();
diff --git a/packages/twenty-ui/src/input/components/SearchInput.module.scss b/packages/twenty-ui/src/input/SearchInput/SearchInput.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/components/SearchInput.module.scss
rename to packages/twenty-ui/src/input/SearchInput/SearchInput.module.scss
diff --git a/packages/twenty-ui/src/input/components/SearchInput.module.scss.d.ts b/packages/twenty-ui/src/input/SearchInput/SearchInput.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/components/SearchInput.module.scss.d.ts
rename to packages/twenty-ui/src/input/SearchInput/SearchInput.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/components/SearchInput.tsx b/packages/twenty-ui/src/input/SearchInput/SearchInput.tsx
similarity index 92%
rename from packages/twenty-ui/src/input/components/SearchInput.tsx
rename to packages/twenty-ui/src/input/SearchInput/SearchInput.tsx
index 55c7a3f71f2..951b8aa11d3 100644
--- a/packages/twenty-ui/src/input/components/SearchInput.tsx
+++ b/packages/twenty-ui/src/input/SearchInput/SearchInput.tsx
@@ -2,8 +2,8 @@ import { Input } from '@base-ui/react/input';
import { clsx } from 'clsx';
import { type ReactNode, useContext, useState } from 'react';
-import { IconFilter, IconSearch } from '@ui/display';
-import { IconButton } from '@ui/input/button/components/IconButton';
+import { IconFilter, IconSearch } from '@ui/icon';
+import { IconButton } from '@ui/input/IconButton/IconButton';
import { ThemeContext } from '@ui/theme-constants';
import styles from './SearchInput.module.scss';
diff --git a/packages/twenty-ui/src/input/components/__stories__/SearchInput.stories.tsx b/packages/twenty-ui/src/input/SearchInput/__stories__/SearchInput.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/input/components/__stories__/SearchInput.stories.tsx
rename to packages/twenty-ui/src/input/SearchInput/__stories__/SearchInput.stories.tsx
index e454a75fc04..b6593b3a8c4 100644
--- a/packages/twenty-ui/src/input/components/__stories__/SearchInput.stories.tsx
+++ b/packages/twenty-ui/src/input/SearchInput/__stories__/SearchInput.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
import { useState } from 'react';
-import { SearchInput } from '../SearchInput';
+import { SearchInput } from '@ui/input/SearchInput/SearchInput';
type InteractiveSearchInputProps = {
placeholder?: string;
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/TabButton.module.scss b/packages/twenty-ui/src/input/TabButton/TabButton.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/TabButton/TabButton.module.scss
rename to packages/twenty-ui/src/input/TabButton/TabButton.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/TabButton.module.scss.d.ts b/packages/twenty-ui/src/input/TabButton/TabButton.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/TabButton/TabButton.module.scss.d.ts
rename to packages/twenty-ui/src/input/TabButton/TabButton.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/TabButton.tsx b/packages/twenty-ui/src/input/TabButton/TabButton.tsx
similarity index 80%
rename from packages/twenty-ui/src/input/button/components/TabButton/TabButton.tsx
rename to packages/twenty-ui/src/input/TabButton/TabButton.tsx
index 94c305f755b..5b392b0dce3 100644
--- a/packages/twenty-ui/src/input/button/components/TabButton/TabButton.tsx
+++ b/packages/twenty-ui/src/input/TabButton/TabButton.tsx
@@ -1,10 +1,20 @@
-import { AppTooltip, type IconComponent, TooltipDelay } from '@ui/display';
-import { StyledTabButton } from '@ui/input/button/components/TabButton/internals/components/StyledTabBase';
-import { TabContent } from '@ui/input/button/components/TabButton/internals/components/TabContent';
+import { type IconComponent } from '@ui/icon';
+import { AppTooltip, TooltipDelay } from '@ui/surfaces';
+import {
+ StyledTabButton,
+ StyledTabContainer,
+} from '@ui/input/TabButton/parts/StyledTabBase';
+import {
+ TabContent,
+ type TabContentProps,
+} from '@ui/input/TabButton/parts/TabContent';
import { type ReactElement } from 'react';
import styles from './TabButton.module.scss';
+export { StyledTabContainer, TabContent };
+export type { TabContentProps };
+
type TabButtonProps = {
id: string;
active?: boolean;
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.module.scss b/packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.module.scss
rename to packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.module.scss.d.ts b/packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.module.scss.d.ts
rename to packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.tsx b/packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.tsx
rename to packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.tsx
index bb04e200fa5..2960650048a 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/TabButton.stories.tsx
+++ b/packages/twenty-ui/src/input/TabButton/__stories__/TabButton.stories.tsx
@@ -7,8 +7,8 @@ import {
IconSearch,
IconSettings,
IconUser,
-} from '@ui/display';
-import { TabButton } from '@ui/input/button/components/TabButton/TabButton';
+} from '@ui/icon';
+import { TabButton } from '@ui/input/TabButton/TabButton';
import {
AVATAR_URL_MOCK,
CatalogDecorator,
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.module.scss b/packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.module.scss
rename to packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.module.scss
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.module.scss.d.ts b/packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.module.scss.d.ts
rename to packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.tsx b/packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.tsx
similarity index 100%
rename from packages/twenty-ui/src/input/button/components/TabButton/internals/components/StyledTabBase.tsx
rename to packages/twenty-ui/src/input/TabButton/parts/StyledTabBase.tsx
diff --git a/packages/twenty-ui/src/input/button/components/TabButton/internals/components/TabContent.tsx b/packages/twenty-ui/src/input/TabButton/parts/TabContent.tsx
similarity index 84%
rename from packages/twenty-ui/src/input/button/components/TabButton/internals/components/TabContent.tsx
rename to packages/twenty-ui/src/input/TabButton/parts/TabContent.tsx
index 9ca002675ea..699510e52f8 100644
--- a/packages/twenty-ui/src/input/button/components/TabButton/internals/components/TabContent.tsx
+++ b/packages/twenty-ui/src/input/TabButton/parts/TabContent.tsx
@@ -1,8 +1,9 @@
-import { Pill } from '@ui/components/Pill/Pill';
-import { Avatar, type IconComponent } from '@ui/display';
+import { Pill } from '@ui/data-display/Pill/Pill';
+import { Avatar } from '@ui/data-display';
+import { type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import { type ReactElement, useContext } from 'react';
-import { StyledTabHover } from './StyledTabBase';
+import { StyledTabHover } from '@ui/input/TabButton/parts/StyledTabBase';
export type TabContentProps = {
id: string;
diff --git a/packages/twenty-ui/src/input/components/Toggle.module.scss b/packages/twenty-ui/src/input/Toggle/Toggle.module.scss
similarity index 100%
rename from packages/twenty-ui/src/input/components/Toggle.module.scss
rename to packages/twenty-ui/src/input/Toggle/Toggle.module.scss
diff --git a/packages/twenty-ui/src/input/components/Toggle.module.scss.d.ts b/packages/twenty-ui/src/input/Toggle/Toggle.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/input/components/Toggle.module.scss.d.ts
rename to packages/twenty-ui/src/input/Toggle/Toggle.module.scss.d.ts
diff --git a/packages/twenty-ui/src/input/components/Toggle.tsx b/packages/twenty-ui/src/input/Toggle/Toggle.tsx
similarity index 100%
rename from packages/twenty-ui/src/input/components/Toggle.tsx
rename to packages/twenty-ui/src/input/Toggle/Toggle.tsx
diff --git a/packages/twenty-ui/src/input/components/__stories__/Toggle.stories.tsx b/packages/twenty-ui/src/input/Toggle/__stories__/Toggle.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/input/components/__stories__/Toggle.stories.tsx
rename to packages/twenty-ui/src/input/Toggle/__stories__/Toggle.stories.tsx
index 6a0c708d009..7cddb3d5287 100644
--- a/packages/twenty-ui/src/input/components/__stories__/Toggle.stories.tsx
+++ b/packages/twenty-ui/src/input/Toggle/__stories__/Toggle.stories.tsx
@@ -7,7 +7,7 @@ import {
import { themeCssVariables } from '@ui/theme-constants';
import { useState } from 'react';
-import { Toggle, type ToggleSize } from '../Toggle';
+import { Toggle, type ToggleSize } from '@ui/input/Toggle/Toggle';
type InteractiveToggleProps = {
initialValue?: boolean;
diff --git a/packages/twenty-ui/src/input/index.ts b/packages/twenty-ui/src/input/index.ts
index 0e148b1653a..c03c4a32553 100644
--- a/packages/twenty-ui/src/input/index.ts
+++ b/packages/twenty-ui/src/input/index.ts
@@ -7,102 +7,101 @@
* |___/
*/
-export type { AnimatedButtonProps } from './button/components/AnimatedButton';
-export { AnimatedButton } from './button/components/AnimatedButton';
-export type { AnimatedLightIconButtonProps } from './button/components/AnimatedLightIconButton';
-export { AnimatedLightIconButton } from './button/components/AnimatedLightIconButton';
+export { AdvancedSettingsToggle } from './AdvancedSettingsToggle/AdvancedSettingsToggle';
+export type { AnimatedButtonProps } from './AnimatedButton/AnimatedButton';
+export { AnimatedButton } from './AnimatedButton/AnimatedButton';
+export type { AnimatedLightIconButtonProps } from './AnimatedLightIconButton/AnimatedLightIconButton';
+export { AnimatedLightIconButton } from './AnimatedLightIconButton/AnimatedLightIconButton';
export type {
ButtonSize,
ButtonPosition,
ButtonVariant,
ButtonAccent,
ButtonProps,
-} from './button/components/Button/Button';
-export { Button } from './button/components/Button/Button';
-export { baseTransitionTiming } from './button/components/Button/constant';
-export type { ButtonGroupProps } from './button/components/ButtonGroup';
-export { ButtonGroup } from './button/components/ButtonGroup';
-export { ColorPickerButton } from './button/components/ColorPickerButton';
+} from './Button/Button';
+export { Button } from './Button/Button';
+export { baseTransitionTiming } from './Button/constant';
+export type { ButtonGroupProps } from './ButtonGroup/ButtonGroup';
+export { ButtonGroup } from './ButtonGroup/ButtonGroup';
+export { CardPicker } from './CardPicker/CardPicker';
+export {
+ CheckboxVariant,
+ CheckboxShape,
+ CheckboxSize,
+ CheckboxAccent,
+ Checkbox,
+} from './Checkbox/Checkbox';
+export { CodeEditor } from './CodeEditor/CodeEditor';
+export { BASE_CODE_EDITOR_THEME_ID } from './CodeEditor/constants/BaseCodeEditorThemeId';
+export { getBaseCodeEditorTheme } from './CodeEditor/utils/getBaseCodeEditorTheme';
+export type { CoreEditorHeaderProps } from './CodeEditorHeader/CodeEditorHeader';
+export { CoreEditorHeader } from './CodeEditorHeader/CodeEditorHeader';
+export { ColorPickerButton } from './ColorPickerButton/ColorPickerButton';
+export type {
+ ColorSchemeSegmentProps,
+ ColorSchemeCardProps,
+} from './ColorSchemeCard/ColorSchemeCard';
+export { ColorSchemeCard } from './ColorSchemeCard/ColorSchemeCard';
+export type { ColorSchemePickerProps } from './ColorSchemePicker/ColorSchemePicker';
+export { ColorSchemePicker } from './ColorSchemePicker/ColorSchemePicker';
export type {
FloatingButtonSize,
FloatingButtonPosition,
FloatingButtonProps,
-} from './button/components/FloatingButton';
-export { FloatingButton } from './button/components/FloatingButton';
-export type { FloatingButtonGroupProps } from './button/components/FloatingButtonGroup';
-export { FloatingButtonGroup } from './button/components/FloatingButtonGroup';
+} from './FloatingButton/FloatingButton';
+export { FloatingButton } from './FloatingButton/FloatingButton';
+export type { FloatingButtonGroupProps } from './FloatingButtonGroup/FloatingButtonGroup';
+export { FloatingButtonGroup } from './FloatingButtonGroup/FloatingButtonGroup';
export type {
FloatingIconButtonSize,
FloatingIconButtonPosition,
FloatingIconButtonProps,
-} from './button/components/FloatingIconButton';
-export { FloatingIconButton } from './button/components/FloatingIconButton';
-export type { FloatingIconButtonGroupProps } from './button/components/FloatingIconButtonGroup';
-export { FloatingIconButtonGroup } from './button/components/FloatingIconButtonGroup';
+} from './FloatingIconButton/FloatingIconButton';
+export { FloatingIconButton } from './FloatingIconButton/FloatingIconButton';
+export type { FloatingIconButtonGroupProps } from './FloatingIconButtonGroup/FloatingIconButtonGroup';
+export { FloatingIconButtonGroup } from './FloatingIconButtonGroup/FloatingIconButtonGroup';
export type {
IconButtonSize,
IconButtonPosition,
IconButtonVariant,
IconButtonAccent,
IconButtonProps,
-} from './button/components/IconButton';
-export { IconButton } from './button/components/IconButton';
-export type { IconButtonGroupProps } from './button/components/IconButtonGroup';
-export { IconButtonGroup } from './button/components/IconButtonGroup';
-export type { InsideButtonProps } from './button/components/InsideButton';
-export { InsideButton } from './button/components/InsideButton';
+} from './IconButton/IconButton';
+export { IconButton } from './IconButton/IconButton';
+export type { IconButtonGroupProps } from './IconButtonGroup/IconButtonGroup';
+export { IconButtonGroup } from './IconButtonGroup/IconButtonGroup';
+export { IconListViewGrip } from './IconListViewGrip/IconListViewGrip';
+export type { InsideButtonProps } from './InsideButton/InsideButton';
+export { InsideButton } from './InsideButton/InsideButton';
export type {
LightButtonAccent,
LightButtonProps,
-} from './button/components/LightButton';
-export { LightButton } from './button/components/LightButton';
+} from './LightButton/LightButton';
+export { LightButton } from './LightButton/LightButton';
export type {
LightIconButtonAccent,
LightIconButtonSize,
LightIconButtonProps,
-} from './button/components/LightIconButton';
-export { LightIconButton } from './button/components/LightIconButton';
-export type { LightIconButtonGroupProps } from './button/components/LightIconButtonGroup';
-export { LightIconButtonGroup } from './button/components/LightIconButtonGroup';
-export type { MainButtonVariant } from './button/components/MainButton';
-export { MainButton } from './button/components/MainButton';
-export type { RoundedIconButtonSize } from './button/components/RoundedIconButton';
-export { RoundedIconButton } from './button/components/RoundedIconButton';
+} from './LightIconButton/LightIconButton';
+export { LightIconButton } from './LightIconButton/LightIconButton';
+export type { LightIconButtonGroupProps } from './LightIconButtonGroup/LightIconButtonGroup';
+export { LightIconButtonGroup } from './LightIconButtonGroup/LightIconButtonGroup';
+export type { MainButtonVariant } from './MainButton/MainButton';
+export { MainButton } from './MainButton/MainButton';
+export type { RadioProps } from './Radio/Radio';
+export { RadioSize, LabelPosition, Radio } from './Radio/Radio';
+export { RadioGroup } from './RadioGroup/RadioGroup';
+export type { RoundedIconButtonSize } from './RoundedIconButton/RoundedIconButton';
+export { RoundedIconButton } from './RoundedIconButton/RoundedIconButton';
+export type { SearchInputProps } from './SearchInput/SearchInput';
+export { SearchInput } from './SearchInput/SearchInput';
+export type { TabContentProps } from './TabButton/TabButton';
export {
- StyledTabButton,
StyledTabContainer,
- StyledTabHover,
-} from './button/components/TabButton/internals/components/StyledTabBase';
-export type { TabContentProps } from './button/components/TabButton/internals/components/TabContent';
-export { TabContent } from './button/components/TabButton/internals/components/TabContent';
-export { TabButton } from './button/components/TabButton/TabButton';
-export { CodeEditor } from './code-editor/components/CodeEditor';
-export type { CoreEditorHeaderProps } from './code-editor/components/CodeEditorHeader';
-export { CoreEditorHeader } from './code-editor/components/CodeEditorHeader';
-export { BASE_CODE_EDITOR_THEME_ID } from './code-editor/constants/BaseCodeEditorThemeId';
-export { getBaseCodeEditorTheme } from './code-editor/theme/utils/getBaseCodeEditorTheme';
-export type {
- ColorSchemeSegmentProps,
- ColorSchemeCardProps,
-} from './color-scheme/components/ColorSchemeCard';
-export { ColorSchemeCard } from './color-scheme/components/ColorSchemeCard';
-export type { ColorSchemePickerProps } from './color-scheme/components/ColorSchemePicker';
-export { ColorSchemePicker } from './color-scheme/components/ColorSchemePicker';
-export { CardPicker } from './components/CardPicker';
-export {
- CheckboxVariant,
- CheckboxShape,
- CheckboxSize,
- CheckboxAccent,
- Checkbox,
-} from './components/Checkbox';
-export { IconListViewGrip } from './components/IconListViewGrip';
-export type { RadioProps } from './components/Radio';
-export { RadioSize, LabelPosition, Radio } from './components/Radio';
-export { RadioGroup } from './components/RadioGroup';
-export type { SearchInputProps } from './components/SearchInput';
-export { SearchInput } from './components/SearchInput';
-export type { ToggleSize, ToggleProps } from './components/Toggle';
-export { Toggle } from './components/Toggle';
+ TabContent,
+ TabButton,
+} from './TabButton/TabButton';
+export type { ToggleSize, ToggleProps } from './Toggle/Toggle';
+export { Toggle } from './Toggle/Toggle';
export type { ColorScheme } from './types/ColorScheme';
export type { SelectOption } from './types/SelectOption';
diff --git a/packages/twenty-ui/src/input/types/SelectOption.ts b/packages/twenty-ui/src/input/types/SelectOption.ts
index e2a5190f185..21b80a01a86 100644
--- a/packages/twenty-ui/src/input/types/SelectOption.ts
+++ b/packages/twenty-ui/src/input/types/SelectOption.ts
@@ -1,4 +1,4 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
export type SelectOption<
diff --git a/packages/twenty-ui/src/json-visualizer/components/JsonArrayNode.tsx b/packages/twenty-ui/src/json-visualizer/components/JsonArrayNode.tsx
index 14278f04552..49f06e8e6df 100644
--- a/packages/twenty-ui/src/json-visualizer/components/JsonArrayNode.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/JsonArrayNode.tsx
@@ -1,4 +1,4 @@
-import { IconBrackets } from '@ui/display';
+import { IconBrackets } from '@ui/icon';
import { JsonNestedNode } from '@ui/json-visualizer/components/JsonNestedNode';
import { useJsonTreeContextOrThrow } from '@ui/json-visualizer/hooks/useJsonTreeContextOrThrow';
import { type JsonNodeHighlighting } from '@ui/json-visualizer/types/JsonNodeHighlighting';
diff --git a/packages/twenty-ui/src/json-visualizer/components/JsonNestedNode.tsx b/packages/twenty-ui/src/json-visualizer/components/JsonNestedNode.tsx
index 442cf5ea132..31f17c71027 100644
--- a/packages/twenty-ui/src/json-visualizer/components/JsonNestedNode.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/JsonNestedNode.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
import { type JsonValue } from 'type-fest';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { JsonArrow } from '@ui/json-visualizer/components/internal/JsonArrow';
import { JsonNodeLabel } from '@ui/json-visualizer/components/internal/JsonNodeLabel';
import { JsonNodeValue } from '@ui/json-visualizer/components/internal/JsonNodeValue';
diff --git a/packages/twenty-ui/src/json-visualizer/components/JsonNode.tsx b/packages/twenty-ui/src/json-visualizer/components/JsonNode.tsx
index 427a76363eb..153b5a36016 100644
--- a/packages/twenty-ui/src/json-visualizer/components/JsonNode.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/JsonNode.tsx
@@ -9,7 +9,7 @@ import {
IconCircleOff,
IconNumber9,
IconTypography,
-} from '@ui/display';
+} from '@ui/icon';
import { JsonArrayNode } from '@ui/json-visualizer/components/JsonArrayNode';
import { JsonObjectNode } from '@ui/json-visualizer/components/JsonObjectNode';
import { JsonValueNode } from '@ui/json-visualizer/components/JsonValueNode';
diff --git a/packages/twenty-ui/src/json-visualizer/components/JsonObjectNode.tsx b/packages/twenty-ui/src/json-visualizer/components/JsonObjectNode.tsx
index e83919d0510..fe7da9efe6b 100644
--- a/packages/twenty-ui/src/json-visualizer/components/JsonObjectNode.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/JsonObjectNode.tsx
@@ -1,4 +1,4 @@
-import { IconCube } from '@ui/display';
+import { IconCube } from '@ui/icon';
import { JsonNestedNode } from '@ui/json-visualizer/components/JsonNestedNode';
import { useJsonTreeContextOrThrow } from '@ui/json-visualizer/hooks/useJsonTreeContextOrThrow';
import { type JsonNodeHighlighting } from '@ui/json-visualizer/types/JsonNodeHighlighting';
diff --git a/packages/twenty-ui/src/json-visualizer/components/JsonValueNode.tsx b/packages/twenty-ui/src/json-visualizer/components/JsonValueNode.tsx
index fc5bed8c7b4..c416b549bae 100644
--- a/packages/twenty-ui/src/json-visualizer/components/JsonValueNode.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/JsonValueNode.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { JsonNodeLabel } from '@ui/json-visualizer/components/internal/JsonNodeLabel';
import { JsonNodeValue } from '@ui/json-visualizer/components/internal/JsonNodeValue';
import { type JsonNodeHighlighting } from '@ui/json-visualizer/types/JsonNodeHighlighting';
diff --git a/packages/twenty-ui/src/json-visualizer/components/internal/JsonArrow.tsx b/packages/twenty-ui/src/json-visualizer/components/internal/JsonArrow.tsx
index 8ce1f32495c..5d1a18455ce 100644
--- a/packages/twenty-ui/src/json-visualizer/components/internal/JsonArrow.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/internal/JsonArrow.tsx
@@ -1,5 +1,5 @@
import { VisibilityHidden } from '@ui/accessibility';
-import { IconChevronDown } from '@ui/display';
+import { IconChevronDown } from '@ui/icon';
import { useJsonTreeContextOrThrow } from '@ui/json-visualizer/hooks/useJsonTreeContextOrThrow';
import { ThemeContext, themeCssVariables } from '@ui/theme-constants';
import { clsx } from 'clsx';
diff --git a/packages/twenty-ui/src/json-visualizer/components/internal/JsonNodeLabel.tsx b/packages/twenty-ui/src/json-visualizer/components/internal/JsonNodeLabel.tsx
index 8e3fbd0457d..5dbd95f633b 100644
--- a/packages/twenty-ui/src/json-visualizer/components/internal/JsonNodeLabel.tsx
+++ b/packages/twenty-ui/src/json-visualizer/components/internal/JsonNodeLabel.tsx
@@ -1,4 +1,4 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { type JsonNodeHighlighting } from '@ui/json-visualizer/types/JsonNodeHighlighting';
import { ThemeContext } from '@ui/theme-constants';
import { clsx } from 'clsx';
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.module.scss b/packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.module.scss
rename to packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.module.scss.d.ts b/packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.module.scss.d.ts
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.tsx b/packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedCircleLoading.tsx
rename to packages/twenty-ui/src/layout/AnimatedCircleLoading/AnimatedCircleLoading.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedContainer.tsx b/packages/twenty-ui/src/layout/AnimatedContainer/AnimatedContainer.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedContainer.tsx
rename to packages/twenty-ui/src/layout/AnimatedContainer/AnimatedContainer.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedEaseIn.tsx b/packages/twenty-ui/src/layout/AnimatedEaseIn/AnimatedEaseIn.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedEaseIn.tsx
rename to packages/twenty-ui/src/layout/AnimatedEaseIn/AnimatedEaseIn.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedEaseInOut.tsx b/packages/twenty-ui/src/layout/AnimatedEaseInOut/AnimatedEaseInOut.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedEaseInOut.tsx
rename to packages/twenty-ui/src/layout/AnimatedEaseInOut/AnimatedEaseInOut.tsx
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/components/AnimatedExpandableContainer.tsx b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
similarity index 76%
rename from packages/twenty-ui/src/layout/animated-expandable-container/components/AnimatedExpandableContainer.tsx
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
index afc7e0a9d61..9d6291bee7c 100644
--- a/packages/twenty-ui/src/layout/animated-expandable-container/components/AnimatedExpandableContainer.tsx
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/AnimatedExpandableContainer.tsx
@@ -1,9 +1,9 @@
-import { type AnimationDimension } from '@ui/layout/animated-expandable-container/types/AnimationDimension';
-import { type AnimationDurationObject } from '@ui/layout/animated-expandable-container/types/AnimationDurationObject';
-import { type AnimationDurations } from '@ui/layout/animated-expandable-container/types/AnimationDurations';
-import { type AnimationMode } from '@ui/layout/animated-expandable-container/types/AnimationMode';
-import { type AnimationSize } from '@ui/layout/animated-expandable-container/types/AnimationSize';
-import { getExpandableAnimationConfig } from '@ui/layout/animated-expandable-container/utils/getExpandableAnimationConfig';
+import { type AnimationDimension } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDimension';
+import { type AnimationDurationObject } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDurationObject';
+import { type AnimationDurations } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDurations';
+import { type AnimationMode } from '@ui/layout/AnimatedExpandableContainer/types/AnimationMode';
+import { type AnimationSize } from '@ui/layout/AnimatedExpandableContainer/types/AnimationSize';
+import { getExpandableAnimationConfig } from '@ui/layout/AnimatedExpandableContainer/utils/getExpandableAnimationConfig';
import { ThemeContext } from '@ui/theme-constants';
import { AnimatePresence, motion } from 'framer-motion';
import { type ReactNode, useContext, useRef, useState } from 'react';
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.module.scss b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.module.scss
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.module.scss
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.module.scss.d.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.tsx b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
similarity index 97%
rename from packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.tsx
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
index 75d16cb3a9a..b954217e248 100644
--- a/packages/twenty-ui/src/layout/animated-expandable-container/__stories__/AnimatedExpandableContainer.stories.tsx
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
import { clsx } from 'clsx';
import { useState } from 'react';
-import { AnimatedExpandableContainer } from '../components/AnimatedExpandableContainer';
+import { AnimatedExpandableContainer } from '@ui/layout/AnimatedExpandableContainer/AnimatedExpandableContainer';
import styles from './AnimatedExpandableContainer.stories.module.scss';
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDimension.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDimension.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDimension.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDimension.ts
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDurationObject.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDurationObject.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDurationObject.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDurationObject.ts
diff --git a/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDurations.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDurations.ts
new file mode 100644
index 00000000000..fe5e8e8405e
--- /dev/null
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationDurations.ts
@@ -0,0 +1,3 @@
+import { type AnimationDurationObject } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDurationObject';
+
+export type AnimationDurations = AnimationDurationObject | 'default';
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationMode.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationMode.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationMode.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationMode.ts
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationSize.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationSize.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationSize.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/types/AnimationSize.ts
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getCommonStyles.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getCommonStyles.ts
similarity index 51%
rename from packages/twenty-ui/src/layout/animated-expandable-container/utils/getCommonStyles.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getCommonStyles.ts
index 0a7e82ff16d..3a98a4f7c11 100644
--- a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getCommonStyles.ts
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getCommonStyles.ts
@@ -1,5 +1,5 @@
-import { type AnimationDimension } from '@ui/layout/animated-expandable-container/types/AnimationDimension';
-import { getTransitionValues } from '@ui/layout/animated-expandable-container/utils/getTransitionValues';
+import { type AnimationDimension } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDimension';
+import { getTransitionValues } from '@ui/layout/AnimatedExpandableContainer/utils/getTransitionValues';
export const getCommonStyles = (
dimension: AnimationDimension,
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getExpandableAnimationConfig.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getExpandableAnimationConfig.ts
similarity index 60%
rename from packages/twenty-ui/src/layout/animated-expandable-container/utils/getExpandableAnimationConfig.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getExpandableAnimationConfig.ts
index 59e2cc5e22b..6727db613d8 100644
--- a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getExpandableAnimationConfig.ts
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getExpandableAnimationConfig.ts
@@ -1,7 +1,7 @@
-import { type AnimationDimension } from '@ui/layout/animated-expandable-container/types/AnimationDimension';
-import { type AnimationSize } from '@ui/layout/animated-expandable-container/types/AnimationSize';
-import { getCommonStyles } from '@ui/layout/animated-expandable-container/utils/getCommonStyles';
-import { getTransitionValues } from '@ui/layout/animated-expandable-container/utils/getTransitionValues';
+import { type AnimationDimension } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDimension';
+import { type AnimationSize } from '@ui/layout/AnimatedExpandableContainer/types/AnimationSize';
+import { getCommonStyles } from '@ui/layout/AnimatedExpandableContainer/utils/getCommonStyles';
+import { getTransitionValues } from '@ui/layout/AnimatedExpandableContainer/utils/getTransitionValues';
export const getExpandableAnimationConfig = (
isExpanded: boolean,
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getTransitionValues.ts b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getTransitionValues.ts
similarity index 74%
rename from packages/twenty-ui/src/layout/animated-expandable-container/utils/getTransitionValues.ts
rename to packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getTransitionValues.ts
index 420966dbd43..abf6d5b6545 100644
--- a/packages/twenty-ui/src/layout/animated-expandable-container/utils/getTransitionValues.ts
+++ b/packages/twenty-ui/src/layout/AnimatedExpandableContainer/utils/getTransitionValues.ts
@@ -1,4 +1,4 @@
-import { type AnimationDimension } from '@ui/layout/animated-expandable-container/types/AnimationDimension';
+import { type AnimationDimension } from '@ui/layout/AnimatedExpandableContainer/types/AnimationDimension';
export const getTransitionValues = (
dimension: AnimationDimension,
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedFadeOut.tsx b/packages/twenty-ui/src/layout/AnimatedFadeOut/AnimatedFadeOut.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedFadeOut.tsx
rename to packages/twenty-ui/src/layout/AnimatedFadeOut/AnimatedFadeOut.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.module.scss b/packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.module.scss
rename to packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.module.scss.d.ts b/packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.module.scss.d.ts
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.tsx b/packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
similarity index 95%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.tsx
rename to packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
index a91d695c496..db283578ab0 100644
--- a/packages/twenty-ui/src/utilities/animation/components/AnimatedIconCrossfade.tsx
+++ b/packages/twenty-ui/src/layout/AnimatedIconCrossfade/AnimatedIconCrossfade.tsx
@@ -1,7 +1,7 @@
import { motion } from 'framer-motion';
import React, { useContext } from 'react';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { ThemeContext } from '@ui/theme-constants';
import styles from './AnimatedIconCrossfade.module.scss';
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.module.scss b/packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.module.scss
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.module.scss
rename to packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.module.scss
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.module.scss.d.ts b/packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.module.scss.d.ts
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.tsx b/packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedRotate.tsx
rename to packages/twenty-ui/src/layout/AnimatedRotate/AnimatedRotate.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.module.scss b/packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.module.scss
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.module.scss
rename to packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.module.scss
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.module.scss.d.ts b/packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.module.scss.d.ts
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.tsx b/packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedTextWord.tsx
rename to packages/twenty-ui/src/layout/AnimatedTextWord/AnimatedTextWord.tsx
diff --git a/packages/twenty-ui/src/utilities/animation/components/AnimatedTranslation.tsx b/packages/twenty-ui/src/layout/AnimatedTranslation/AnimatedTranslation.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/animation/components/AnimatedTranslation.tsx
rename to packages/twenty-ui/src/layout/AnimatedTranslation/AnimatedTranslation.tsx
diff --git a/packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.module.scss b/packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.module.scss
similarity index 100%
rename from packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.module.scss
rename to packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.module.scss
diff --git a/packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.module.scss.d.ts b/packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.module.scss.d.ts
rename to packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.module.scss.d.ts
diff --git a/packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.tsx b/packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.tsx
similarity index 100%
rename from packages/twenty-ui/src/utilities/dimensions/components/AutogrowWrapper.tsx
rename to packages/twenty-ui/src/layout/AutogrowWrapper/AutogrowWrapper.tsx
diff --git a/packages/twenty-ui/src/display/text/components/HorizontalSeparator.module.scss b/packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/text/components/HorizontalSeparator.module.scss
rename to packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.module.scss
diff --git a/packages/twenty-ui/src/display/text/components/HorizontalSeparator.module.scss.d.ts b/packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/text/components/HorizontalSeparator.module.scss.d.ts
rename to packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/text/components/HorizontalSeparator.tsx b/packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.tsx
similarity index 96%
rename from packages/twenty-ui/src/display/text/components/HorizontalSeparator.tsx
rename to packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.tsx
index bc47161ae9a..2bafb35e1fa 100644
--- a/packages/twenty-ui/src/display/text/components/HorizontalSeparator.tsx
+++ b/packages/twenty-ui/src/layout/HorizontalSeparator/HorizontalSeparator.tsx
@@ -1,6 +1,6 @@
import { type JSX } from 'react';
-import { Label } from '@ui/display';
+import { Label } from '@ui/typography';
import styles from './HorizontalSeparator.module.scss';
diff --git a/packages/twenty-ui/src/display/text/components/__stories__/HorizontalSeparator.stories.tsx b/packages/twenty-ui/src/layout/HorizontalSeparator/__stories__/HorizontalSeparator.stories.tsx
similarity index 72%
rename from packages/twenty-ui/src/display/text/components/__stories__/HorizontalSeparator.stories.tsx
rename to packages/twenty-ui/src/layout/HorizontalSeparator/__stories__/HorizontalSeparator.stories.tsx
index 2b72597e1ce..c59658aa450 100644
--- a/packages/twenty-ui/src/display/text/components/__stories__/HorizontalSeparator.stories.tsx
+++ b/packages/twenty-ui/src/layout/HorizontalSeparator/__stories__/HorizontalSeparator.stories.tsx
@@ -1,10 +1,10 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { HorizontalSeparator } from '../HorizontalSeparator';
+import { HorizontalSeparator } from '@ui/layout/HorizontalSeparator/HorizontalSeparator';
const meta: Meta<typeof HorizontalSeparator> = {
- title: 'UI/Display/Text/HorizontalSeparator',
+ title: 'UI/Layout/HorizontalSeparator',
component: HorizontalSeparator,
decorators: [ComponentDecorator],
};
diff --git a/packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.module.scss b/packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.module.scss
rename to packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.module.scss
diff --git a/packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.module.scss.d.ts b/packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.module.scss.d.ts
rename to packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.tsx b/packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/resize-handle/components/ResizeHandle.tsx
rename to packages/twenty-ui/src/layout/ResizeHandle/ResizeHandle.tsx
diff --git a/packages/twenty-ui/src/layout/resize-handle/components/__stories__/ResizeHandle.stories.tsx b/packages/twenty-ui/src/layout/ResizeHandle/__stories__/ResizeHandle.stories.tsx
similarity index 92%
rename from packages/twenty-ui/src/layout/resize-handle/components/__stories__/ResizeHandle.stories.tsx
rename to packages/twenty-ui/src/layout/ResizeHandle/__stories__/ResizeHandle.stories.tsx
index 727ba5f8adb..72bf06f6b08 100644
--- a/packages/twenty-ui/src/layout/resize-handle/components/__stories__/ResizeHandle.stories.tsx
+++ b/packages/twenty-ui/src/layout/ResizeHandle/__stories__/ResizeHandle.stories.tsx
@@ -1,10 +1,10 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { useResizeHandle } from '@ui/layout/resize-handle/hooks/useResizeHandle';
+import { useResizeHandle } from '@ui/layout/ResizeHandle/hooks/useResizeHandle';
import { ComponentDecorator } from '@ui/testing';
import { themeCssVariables } from '@ui/theme-constants';
import { expect, userEvent, within } from 'storybook/test';
-import { ResizeHandle } from '../ResizeHandle';
+import { ResizeHandle } from '@ui/layout/ResizeHandle/ResizeHandle';
const INITIAL_HEIGHT = 150;
diff --git a/packages/twenty-ui/src/layout/resize-handle/hooks/useResizeHandle.ts b/packages/twenty-ui/src/layout/ResizeHandle/hooks/useResizeHandle.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/resize-handle/hooks/useResizeHandle.ts
rename to packages/twenty-ui/src/layout/ResizeHandle/hooks/useResizeHandle.ts
diff --git a/packages/twenty-ui/src/layout/section/components/Section.module.scss b/packages/twenty-ui/src/layout/Section/Section.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/section/components/Section.module.scss
rename to packages/twenty-ui/src/layout/Section/Section.module.scss
diff --git a/packages/twenty-ui/src/layout/section/components/Section.module.scss.d.ts b/packages/twenty-ui/src/layout/Section/Section.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/section/components/Section.module.scss.d.ts
rename to packages/twenty-ui/src/layout/Section/Section.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/section/components/Section.tsx b/packages/twenty-ui/src/layout/Section/Section.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/section/components/Section.tsx
rename to packages/twenty-ui/src/layout/Section/Section.tsx
diff --git a/packages/twenty-ui/src/layout/section/components/__stories__/Section.stories.tsx b/packages/twenty-ui/src/layout/Section/__stories__/Section.stories.tsx
similarity index 87%
rename from packages/twenty-ui/src/layout/section/components/__stories__/Section.stories.tsx
rename to packages/twenty-ui/src/layout/Section/__stories__/Section.stories.tsx
index 82a844e6382..23ebee521d7 100644
--- a/packages/twenty-ui/src/layout/section/components/__stories__/Section.stories.tsx
+++ b/packages/twenty-ui/src/layout/Section/__stories__/Section.stories.tsx
@@ -1,7 +1,11 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { Section, SectionAlignment, SectionFontColor } from '../Section';
+import {
+ Section,
+ SectionAlignment,
+ SectionFontColor,
+} from '@ui/layout/Section/Section';
const meta: Meta<typeof Section> = {
title: 'UI/Layout/Section',
diff --git a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDurations.ts b/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDurations.ts
deleted file mode 100644
index c3006aaf101..00000000000
--- a/packages/twenty-ui/src/layout/animated-expandable-container/types/AnimationDurations.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { type AnimationDurationObject } from '@ui/layout/animated-expandable-container/types/AnimationDurationObject';
-
-export type AnimationDurations = AnimationDurationObject | 'default';
diff --git a/packages/twenty-ui/src/layout/animated-placeholder/index.ts b/packages/twenty-ui/src/layout/animated-placeholder/index.ts
deleted file mode 100644
index 74da7bd40c8..00000000000
--- a/packages/twenty-ui/src/layout/animated-placeholder/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './components/AnimatedPlaceholder';
-export * from './components/EmptyPlaceholderStyled';
-export * from './components/ErrorPlaceholderStyled';
-export * from './constants/Background';
-export * from './constants/DarkBackground';
-export * from './constants/DarkMovingImage';
-export * from './constants/MovingImage';
diff --git a/packages/twenty-ui/src/layout/index.ts b/packages/twenty-ui/src/layout/index.ts
index eb65aac5cf3..198245d6358 100644
--- a/packages/twenty-ui/src/layout/index.ts
+++ b/packages/twenty-ui/src/layout/index.ts
@@ -7,54 +7,26 @@
* |___/
*/
-export { AnimatedExpandableContainer } from './animated-expandable-container/components/AnimatedExpandableContainer';
-export type { AnimationDimension } from './animated-expandable-container/types/AnimationDimension';
-export type { AnimationDurationObject } from './animated-expandable-container/types/AnimationDurationObject';
-export type { AnimationDurations } from './animated-expandable-container/types/AnimationDurations';
-export type { AnimationMode } from './animated-expandable-container/types/AnimationMode';
-export type { AnimationSize } from './animated-expandable-container/types/AnimationSize';
-export { getCommonStyles } from './animated-expandable-container/utils/getCommonStyles';
-export { getExpandableAnimationConfig } from './animated-expandable-container/utils/getExpandableAnimationConfig';
-export { getTransitionValues } from './animated-expandable-container/utils/getTransitionValues';
-export type { AnimatedPlaceholderType } from './animated-placeholder/components/AnimatedPlaceholder';
-export { AnimatedPlaceholder } from './animated-placeholder/components/AnimatedPlaceholder';
-export {
- AnimatedPlaceholderEmptyContainer,
- EMPTY_PLACEHOLDER_TRANSITION_PROPS,
- AnimatedPlaceholderEmptyTextContainer,
- AnimatedPlaceholderEmptyTitle,
- AnimatedPlaceholderEmptySubTitle,
-} from './animated-placeholder/components/EmptyPlaceholderStyled';
-export {
- AnimatedPlaceholderErrorContainer,
- AnimatedPlaceholderErrorTextContainer,
- AnimatedPlaceholderErrorTitle,
- AnimatedPlaceholderErrorSubTitle,
-} from './animated-placeholder/components/ErrorPlaceholderStyled';
-export { BACKGROUND } from './animated-placeholder/constants/Background';
-export { DARK_BACKGROUND } from './animated-placeholder/constants/DarkBackground';
-export { DARK_MOVING_IMAGE } from './animated-placeholder/constants/DarkMovingImage';
-export { MOVING_IMAGE } from './animated-placeholder/constants/MovingImage';
-export { Card } from './card/components/Card';
-export { CardContent } from './card/components/CardContent';
-export { CardFooter } from './card/components/CardFooter';
-export { CardHeader } from './card/components/CardHeader';
-export { Modal } from './modal/components/Modal';
-export { ModalBackdrop } from './modal/components/ModalBackdrop';
-export type { ModalContentProps } from './modal/components/ModalContent';
-export { ModalContent } from './modal/components/ModalContent';
-export type { ModalFooterProps } from './modal/components/ModalFooter';
-export { ModalFooter } from './modal/components/ModalFooter';
-export type { ModalHeaderProps } from './modal/components/ModalHeader';
-export { ModalHeader } from './modal/components/ModalHeader';
-export type { ModalOverlay } from './modal/types/ModalOverlay';
-export type { ModalPadding } from './modal/types/ModalPadding';
-export type { ModalProps } from './modal/types/ModalProps';
-export type { ModalSize } from './modal/types/ModalSize';
-export { ResizeHandle } from './resize-handle/components/ResizeHandle';
-export { useResizeHandle } from './resize-handle/hooks/useResizeHandle';
-export {
- SectionAlignment,
- SectionFontColor,
- Section,
-} from './section/components/Section';
+export { AnimatedCircleLoading } from './AnimatedCircleLoading/AnimatedCircleLoading';
+export { AnimatedContainer } from './AnimatedContainer/AnimatedContainer';
+export { AnimatedEaseIn } from './AnimatedEaseIn/AnimatedEaseIn';
+export { AnimatedEaseInOut } from './AnimatedEaseInOut/AnimatedEaseInOut';
+export { AnimatedExpandableContainer } from './AnimatedExpandableContainer/AnimatedExpandableContainer';
+export type { AnimationDimension } from './AnimatedExpandableContainer/types/AnimationDimension';
+export type { AnimationDurationObject } from './AnimatedExpandableContainer/types/AnimationDurationObject';
+export type { AnimationDurations } from './AnimatedExpandableContainer/types/AnimationDurations';
+export type { AnimationMode } from './AnimatedExpandableContainer/types/AnimationMode';
+export type { AnimationSize } from './AnimatedExpandableContainer/types/AnimationSize';
+export { getCommonStyles } from './AnimatedExpandableContainer/utils/getCommonStyles';
+export { getExpandableAnimationConfig } from './AnimatedExpandableContainer/utils/getExpandableAnimationConfig';
+export { getTransitionValues } from './AnimatedExpandableContainer/utils/getTransitionValues';
+export { AnimatedFadeOut } from './AnimatedFadeOut/AnimatedFadeOut';
+export { AnimatedIconCrossfade } from './AnimatedIconCrossfade/AnimatedIconCrossfade';
+export { AnimatedRotate } from './AnimatedRotate/AnimatedRotate';
+export { AnimatedTextWord } from './AnimatedTextWord/AnimatedTextWord';
+export { AnimatedTranslation } from './AnimatedTranslation/AnimatedTranslation';
+export { AutogrowWrapper } from './AutogrowWrapper/AutogrowWrapper';
+export { HorizontalSeparator } from './HorizontalSeparator/HorizontalSeparator';
+export { useResizeHandle } from './ResizeHandle/hooks/useResizeHandle';
+export { ResizeHandle } from './ResizeHandle/ResizeHandle';
+export { SectionAlignment, SectionFontColor, Section } from './Section/Section';
diff --git a/packages/twenty-ui/src/navigation/link/components/ClickToActionLink.module.scss b/packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ClickToActionLink.module.scss
rename to packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/ClickToActionLink.module.scss.d.ts b/packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ClickToActionLink.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/ClickToActionLink.tsx b/packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ClickToActionLink.tsx
rename to packages/twenty-ui/src/navigation/ClickToActionLink/ClickToActionLink.tsx
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/ClickToActionLink.stories.tsx b/packages/twenty-ui/src/navigation/ClickToActionLink/__stories__/ClickToActionLink.stories.tsx
similarity index 84%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/ClickToActionLink.stories.tsx
rename to packages/twenty-ui/src/navigation/ClickToActionLink/__stories__/ClickToActionLink.stories.tsx
index 52d12a502c4..222c5612d61 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/ClickToActionLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/ClickToActionLink/__stories__/ClickToActionLink.stories.tsx
@@ -1,9 +1,9 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { ClickToActionLink } from '@ui/navigation/link/components/ClickToActionLink';
+import { ClickToActionLink } from '@ui/navigation/ClickToActionLink/ClickToActionLink';
import { ComponentDecorator } from '@ui/testing';
const meta: Meta<typeof ClickToActionLink> = {
- title: 'UI/navigation/link/ClickToActionLink',
+ title: 'UI/Navigation/ClickToActionLink',
component: ClickToActionLink,
};
diff --git a/packages/twenty-ui/src/navigation/link/components/ContactLink.module.scss b/packages/twenty-ui/src/navigation/ContactLink/ContactLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ContactLink.module.scss
rename to packages/twenty-ui/src/navigation/ContactLink/ContactLink.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/ContactLink.module.scss.d.ts b/packages/twenty-ui/src/navigation/ContactLink/ContactLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ContactLink.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/ContactLink/ContactLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/ContactLink.tsx b/packages/twenty-ui/src/navigation/ContactLink/ContactLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/ContactLink.tsx
rename to packages/twenty-ui/src/navigation/ContactLink/ContactLink.tsx
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/ContactLink.stories.tsx b/packages/twenty-ui/src/navigation/ContactLink/__stories__/ContactLink.stories.tsx
similarity index 91%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/ContactLink.stories.tsx
rename to packages/twenty-ui/src/navigation/ContactLink/__stories__/ContactLink.stories.tsx
index a4f931d496d..12af5f9d286 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/ContactLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/ContactLink/__stories__/ContactLink.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { fn } from 'storybook/test';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { ContactLink } from '../ContactLink';
+import { ContactLink } from '@ui/navigation/ContactLink/ContactLink';
const meta: Meta<typeof ContactLink> = {
title: 'UI/Navigation/Link/ContactLink',
diff --git a/packages/twenty-ui/src/navigation/link/components/GithubVersionLink.tsx b/packages/twenty-ui/src/navigation/GithubVersionLink/GithubVersionLink.tsx
similarity index 69%
rename from packages/twenty-ui/src/navigation/link/components/GithubVersionLink.tsx
rename to packages/twenty-ui/src/navigation/GithubVersionLink/GithubVersionLink.tsx
index d045e5bf12b..3eb654e875e 100644
--- a/packages/twenty-ui/src/navigation/link/components/GithubVersionLink.tsx
+++ b/packages/twenty-ui/src/navigation/GithubVersionLink/GithubVersionLink.tsx
@@ -1,6 +1,6 @@
-import { IconBrandGithub } from '@ui/display';
-import { ClickToActionLink } from '@ui/navigation/link/components/ClickToActionLink';
-import { GITHUB_LINK } from '../constants/GithubLink';
+import { IconBrandGithub } from '@ui/icon';
+import { ClickToActionLink } from '@ui/navigation/ClickToActionLink/ClickToActionLink';
+import { GITHUB_LINK } from '@ui/navigation/Link/constants/GithubLink';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/GithubVersionLink.stories.tsx b/packages/twenty-ui/src/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx
similarity index 85%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/GithubVersionLink.stories.tsx
rename to packages/twenty-ui/src/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx
index 33726d68341..9e4d34ef157 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/GithubVersionLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/GithubVersionLink/__stories__/GithubVersionLink.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { GithubVersionLink } from '../GithubVersionLink';
+import { GithubVersionLink } from '@ui/navigation/GithubVersionLink/GithubVersionLink';
const meta: Meta<typeof GithubVersionLink> = {
title: 'UI/Navigation/Link/GithubVersionLink',
diff --git a/packages/twenty-ui/src/navigation/link/constants/Cal.ts b/packages/twenty-ui/src/navigation/Link/constants/Cal.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/constants/Cal.ts
rename to packages/twenty-ui/src/navigation/Link/constants/Cal.ts
diff --git a/packages/twenty-ui/src/navigation/link/constants/GithubLink.ts b/packages/twenty-ui/src/navigation/Link/constants/GithubLink.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/constants/GithubLink.ts
rename to packages/twenty-ui/src/navigation/Link/constants/GithubLink.ts
diff --git a/packages/twenty-ui/src/navigation/link/constants/TwentyPricingLink.ts b/packages/twenty-ui/src/navigation/Link/constants/TwentyPricingLink.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/constants/TwentyPricingLink.ts
rename to packages/twenty-ui/src/navigation/Link/constants/TwentyPricingLink.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.module.scss b/packages/twenty-ui/src/navigation/MenuItem/MenuItem.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.module.scss
rename to packages/twenty-ui/src/navigation/MenuItem/MenuItem.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/MenuItem.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItem/MenuItem.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx b/packages/twenty-ui/src/navigation/MenuItem/MenuItem.tsx
similarity index 84%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/MenuItem.tsx
index 6f4dc3d636f..2e39ce760f4 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/MenuItem.tsx
@@ -1,6 +1,6 @@
-import { IconChevronRight, type IconComponent } from '@ui/display';
-import { type LightIconButtonProps } from '@ui/input/button/components/LightIconButton';
-import { LightIconButtonGroup } from '@ui/input/button/components/LightIconButtonGroup';
+import { IconChevronRight, type IconComponent } from '@ui/icon';
+import { type LightIconButtonProps } from '@ui/input/LightIconButton/LightIconButton';
+import { LightIconButtonGroup } from '@ui/input/LightIconButtonGroup/LightIconButtonGroup';
import {
type FunctionComponent,
type MouseEvent,
@@ -9,20 +9,31 @@ import {
useContext,
} from 'react';
-import { MenuItemHotKeys } from '@ui/navigation/menu/menu-item/components/MenuItemHotKeys';
+import { MenuItemHotKeys } from '@ui/navigation/MenuItemHotKeys/MenuItemHotKeys';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { clsx } from 'clsx';
import { type Nullable } from '@ui/utilities/types/Nullable';
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledHoverableMenuItemBase,
+ StyledMenuItemIconCheck,
+ StyledMenuItemLabel,
+ StyledMenuItemLeftContent,
StyledMenuItemRightContent,
-} from '../internals/components/StyledMenuItemBase';
-import { type MenuItemAccent } from '../types/MenuItemAccent';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
import styles from './MenuItem.module.scss';
+export {
+ MenuItemLeftContent,
+ StyledHoverableMenuItemBase,
+ StyledMenuItemIconCheck,
+ StyledMenuItemLabel,
+ StyledMenuItemLeftContent,
+};
+
export type MenuItemIconButton = {
Wrapper?: FunctionComponent<{ iconButton: ReactElement }>;
Icon: IconComponent;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItem.stories.tsx b/packages/twenty-ui/src/navigation/MenuItem/__stories__/MenuItem.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItem.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/__stories__/MenuItem.stories.tsx
index 2fc2f7761c3..1a6752864dd 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItem.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/__stories__/MenuItem.stories.tsx
@@ -1,14 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
-import { IconBell } from '@ui/display';
+import { IconBell } from '@ui/icon';
import {
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { type MenuItemAccent } from '../../types/MenuItemAccent';
-import { MenuItem } from '../MenuItem';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
+import { MenuItem } from '@ui/navigation/MenuItem/MenuItem';
const meta: Meta<typeof MenuItem> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItem',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/constants/DefaultColorLabels.ts b/packages/twenty-ui/src/navigation/MenuItem/constants/DefaultColorLabels.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/constants/DefaultColorLabels.ts
rename to packages/twenty-ui/src/navigation/MenuItem/constants/DefaultColorLabels.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIcon.tsx
similarity index 85%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIcon.tsx
index 4667780a88f..71a20d92e6b 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIcon.tsx
@@ -1,9 +1,10 @@
-import { type IconComponent, TintedIconTile } from '@ui/display';
+import { TintedIconTile } from '@ui/data-display';
+import { type IconComponent } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';
+import { MenuItemIconBoxContainer } from '@ui/navigation/MenuItem/parts/MenuItemIconBoxContainer';
export type MenuItemIconProps = {
Icon: IconComponent | null | undefined;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.module.scss b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.module.scss
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconBoxContainer.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconBoxContainer.tsx
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.module.scss b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.module.scss
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
similarity index 88%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
index d5589b2107c..20e16c8b9aa 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemIconWithGripSwap.tsx
@@ -1,14 +1,11 @@
-import {
- type IconComponent,
- IconGripVertical,
- TintedIconTile,
-} from '@ui/display';
+import { TintedIconTile } from '@ui/data-display';
+import { type IconComponent, IconGripVertical } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { clsx } from 'clsx';
import { useContext } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';
+import { MenuItemIconBoxContainer } from '@ui/navigation/MenuItem/parts/MenuItemIconBoxContainer';
import styles from './MenuItemIconWithGripSwap.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.module.scss b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.module.scss
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.tsx
similarity index 87%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.tsx
index 9830e57a76a..16c0d4a8bb3 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemLeftContent.tsx
@@ -1,24 +1,21 @@
import { isNonEmptyString, isString } from '@sniptt/guards';
import { type ReactNode, useContext } from 'react';
-import {
- type IconComponent,
- IconGripVertical,
- OverflowingTextWithTooltip,
-} from '@ui/display';
+import { type IconComponent, IconGripVertical } from '@ui/icon';
+import { OverflowingTextWithTooltip } from '@ui/surfaces';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext, themeCssVariables } from '@ui/theme-constants';
-import { type MenuItemDraggableGripMode } from '../../types/MenuItemDraggableGripMode';
-import { MenuItemIcon } from './MenuItemIcon';
-import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';
-import { MenuItemIconWithGripSwap } from './MenuItemIconWithGripSwap';
+import { type MenuItemDraggableGripMode } from '@ui/navigation/MenuItem/types/MenuItemDraggableGripMode';
+import { MenuItemIcon } from '@ui/navigation/MenuItem/parts/MenuItemIcon';
+import { MenuItemIconBoxContainer } from '@ui/navigation/MenuItem/parts/MenuItemIconBoxContainer';
+import { MenuItemIconWithGripSwap } from '@ui/navigation/MenuItem/parts/MenuItemIconWithGripSwap';
import {
StyledDraggableItem,
StyledMenuItemContextualText,
StyledMenuItemLabel,
StyledMenuItemLeftContent,
StyledRightMenuItemContextualText,
-} from './StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemLeftContent.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.module.scss b/packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.module.scss
rename to packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.tsx
similarity index 97%
rename from packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.tsx
rename to packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.tsx
index d81b35c2341..5b058d5a655 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/StyledMenuItemBase.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/StyledMenuItemBase.tsx
@@ -1,8 +1,8 @@
import { clsx } from 'clsx';
import { type ComponentPropsWithoutRef, forwardRef } from 'react';
-import { IconCheck } from '@ui/display';
-import { type MenuItemAccent } from '../../types/MenuItemAccent';
+import { IconCheck } from '@ui/icon';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
import styles from './StyledMenuItemBase.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/types/MenuItemAccent.ts b/packages/twenty-ui/src/navigation/MenuItem/types/MenuItemAccent.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/types/MenuItemAccent.ts
rename to packages/twenty-ui/src/navigation/MenuItem/types/MenuItemAccent.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/types/MenuItemDraggableGripMode.ts b/packages/twenty-ui/src/navigation/MenuItem/types/MenuItemDraggableGripMode.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/types/MenuItemDraggableGripMode.ts
rename to packages/twenty-ui/src/navigation/MenuItem/types/MenuItemDraggableGripMode.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemAvatar.tsx b/packages/twenty-ui/src/navigation/MenuItemAvatar/MenuItemAvatar.tsx
similarity index 90%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemAvatar.tsx
rename to packages/twenty-ui/src/navigation/MenuItemAvatar/MenuItemAvatar.tsx
index 920a5f47fda..47f01ad2707 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemAvatar/MenuItemAvatar.tsx
@@ -1,11 +1,11 @@
-import { Avatar, type AvatarProps } from '@ui/display';
+import { Avatar, type AvatarProps } from '@ui/data-display';
import {
type MenuItemIconButton,
MenuItem,
-} from '@ui/navigation/menu/menu-item/components/MenuItem';
+} from '@ui/navigation/MenuItem/MenuItem';
import { type MouseEvent, type ReactNode } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { type MenuItemAccent } from '../types/MenuItemAccent';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
export type MenuItemAvatarProps = {
accent?: MenuItemAccent;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemDraggable.tsx b/packages/twenty-ui/src/navigation/MenuItemDraggable/MenuItemDraggable.tsx
similarity index 76%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemDraggable.tsx
rename to packages/twenty-ui/src/navigation/MenuItemDraggable/MenuItemDraggable.tsx
index b6e7b3db898..236ee8f2870 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemDraggable.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemDraggable/MenuItemDraggable.tsx
@@ -1,12 +1,12 @@
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
-import { StyledHoverableMenuItemBase } from '../internals/components/StyledMenuItemBase';
-import { type MenuItemAccent } from '../types/MenuItemAccent';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
+import { StyledHoverableMenuItemBase } from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { LightIconButtonGroup } from '@ui/input';
import { type ReactNode } from 'react';
-import { type MenuItemDraggableGripMode } from '../types/MenuItemDraggableGripMode';
-import { type MenuItemIconButton } from './MenuItem';
+import { type MenuItemDraggableGripMode } from '@ui/navigation/MenuItem/types/MenuItemDraggableGripMode';
+import { type MenuItemIconButton } from '@ui/navigation/MenuItem/MenuItem';
export type MenuItemDraggableProps = {
LeftIcon?: IconComponent | undefined;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemDraggable.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
index fbb9706c970..a4d796b0bc0 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemDraggable/__stories__/MenuItemDraggable.stories.tsx
@@ -1,15 +1,15 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { action } from 'storybook/actions';
-import { IconBell, IconMinus } from '@ui/display';
+import { IconBell, IconMinus } from '@ui/icon';
import {
CatalogDecorator,
type CatalogDimension,
type CatalogOptions,
ComponentDecorator,
} from '@ui/testing';
-import { type MenuItemAccent } from '../../types/MenuItemAccent';
-import { MenuItemDraggable } from '../MenuItemDraggable';
+import { type MenuItemAccent } from '@ui/navigation/MenuItem/types/MenuItemAccent';
+import { MenuItemDraggable } from '@ui/navigation/MenuItemDraggable/MenuItemDraggable';
const meta: Meta<typeof MenuItemDraggable> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemDraggable',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.module.scss b/packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.tsx b/packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemHotKeys.tsx
rename to packages/twenty-ui/src/navigation/MenuItemHotKeys/MenuItemHotKeys.tsx
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.module.scss b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
similarity index 78%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
index a1b1b8cc9c9..f0dc5360d90 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
@@ -1,9 +1,9 @@
-import { Tag } from '@ui/components';
-import { type IconComponent } from '@ui/display';
-import { Checkbox } from '@ui/input/components/Checkbox';
-import { MenuItemLeftContent } from '@ui/navigation/menu/menu-item/internals/components/MenuItemLeftContent';
+import { Tag } from '@ui/data-display';
+import { type IconComponent } from '@ui/icon';
+import { Checkbox } from '@ui/input/Checkbox/Checkbox';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
import { type ThemeColor } from '@ui/theme';
-import { StyledMenuItemBase } from '../internals/components/StyledMenuItemBase';
+import { StyledMenuItemBase } from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemMultiSelect.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/__stories__/MenuItemMultiSelect.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelect/__stories__/MenuItemMultiSelect.stories.tsx
index 7a75ecbbce5..f1e3a60c063 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/__stories__/MenuItemMultiSelect.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBell } from '@ui/display';
+import { IconBell } from '@ui/icon';
import {
CatalogDecorator,
type CatalogDimension,
@@ -8,7 +8,7 @@ import {
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { MenuItemMultiSelect } from '../MenuItemMultiSelect';
+import { MenuItemMultiSelect } from '@ui/navigation/MenuItemMultiSelect/MenuItemMultiSelect';
const meta: Meta<typeof MenuItemMultiSelect> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemMultiSelect',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.module.scss b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
similarity index 90%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.tsx
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
index bbbc368d78e..e348541e113 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
@@ -1,13 +1,13 @@
import { type ReactNode } from 'react';
-import { OverflowingTextWithTooltip } from '@ui/display';
-import { Checkbox } from '@ui/input/components/Checkbox';
+import { OverflowingTextWithTooltip } from '@ui/surfaces';
+import { Checkbox } from '@ui/input/Checkbox/Checkbox';
import {
StyledMenuItemBase,
StyledMenuItemLabel,
StyledMenuItemLabelLight,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemMultiSelectAvatar.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
index cd1dce7de63..c0fa0c5d7cf 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemMultiSelectAvatar.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Avatar } from '@ui/display';
+import { Avatar } from '@ui/data-display';
import {
AVATAR_URL_MOCK,
CatalogDecorator,
@@ -10,7 +10,7 @@ import {
ComponentDecorator,
JotaiRootDecorator,
} from '@ui/testing';
-import { MenuItemMultiSelectAvatar } from '../MenuItemMultiSelectAvatar';
+import { MenuItemMultiSelectAvatar } from '@ui/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar';
const meta: Meta<typeof MenuItemMultiSelectAvatar> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemMultiSelectAvatar',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectTag.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
similarity index 86%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectTag.tsx
rename to packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
index 0f7e7b6b05f..26e662c65cb 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelectTag.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
@@ -1,11 +1,11 @@
-import { Tag } from '@ui/components';
-import { type IconComponent } from '@ui/display';
+import { Tag } from '@ui/data-display';
+import { type IconComponent } from '@ui/icon';
import { Checkbox, CheckboxShape, CheckboxSize } from '@ui/input';
import { type ThemeColor } from '@ui/theme';
import {
StyledMenuItemBase,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
type MenuItemMultiSelectTagProps = {
selected: boolean;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemNavigate.tsx b/packages/twenty-ui/src/navigation/MenuItemNavigate/MenuItemNavigate.tsx
similarity index 81%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemNavigate.tsx
rename to packages/twenty-ui/src/navigation/MenuItemNavigate/MenuItemNavigate.tsx
index 1bd3416ae98..34eda6e56fe 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemNavigate.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemNavigate/MenuItemNavigate.tsx
@@ -1,11 +1,11 @@
-import { IconChevronRight, type IconComponent } from '@ui/display';
+import { IconChevronRight, type IconComponent } from '@ui/icon';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledMenuItemBase,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
export type MenuItemNavigateProps = {
LeftIcon?: IconComponent;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemNavigate.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemNavigate/__stories__/MenuItemNavigate.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemNavigate/__stories__/MenuItemNavigate.stories.tsx
index 771b096de22..cd6831271fd 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemNavigate/__stories__/MenuItemNavigate.stories.tsx
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBell } from '@ui/display';
-import { MenuItemNavigate } from '../MenuItemNavigate';
+import { IconBell } from '@ui/icon';
+import { MenuItemNavigate } from '@ui/navigation/MenuItemNavigate/MenuItemNavigate';
import {
CatalogDecorator,
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.module.scss b/packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx b/packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.tsx
similarity index 91%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.tsx
index f4da3e2749c..b0501412e6a 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelect/MenuItemSelect.tsx
@@ -1,10 +1,6 @@
import { isString } from '@sniptt/guards';
-import {
- IconCheck,
- IconChevronRight,
- OverflowingTextWithTooltip,
- type IconComponent,
-} from '@ui/display';
+import { IconCheck, IconChevronRight, type IconComponent } from '@ui/icon';
+import { OverflowingTextWithTooltip } from '@ui/surfaces';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { clsx } from 'clsx';
@@ -14,12 +10,12 @@ import {
useContext,
type ReactNode,
} from 'react';
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledMenuItemLabel,
StyledMenuItemRightContent,
StyledRightMenuItemContextualText,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemSelect.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelect.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemSelect/__stories__/MenuItemSelect.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelect.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelect/__stories__/MenuItemSelect.stories.tsx
index 79405883d4b..ad8a18ea3cd 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelect.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelect/__stories__/MenuItemSelect.stories.tsx
@@ -7,9 +7,9 @@ import {
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { MenuItemSelect } from '../MenuItemSelect';
+import { MenuItemSelect } from '@ui/navigation/MenuItemSelect/MenuItemSelect';
-import { IconBell } from '@ui/display';
+import { IconBell } from '@ui/icon';
const meta: Meta<typeof MenuItemSelect> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemSelect',
component: MenuItemSelect,
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.module.scss b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.tsx
similarity index 89%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.tsx
index 95083ae71b3..ff2e9efa02c 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar.tsx
@@ -5,11 +5,11 @@ import {
StyledMenuItemLabel,
StyledMenuItemLabelLight,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
-import { OverflowingTextWithTooltip } from '@ui/display';
+import { OverflowingTextWithTooltip } from '@ui/surfaces';
import { ThemeContext } from '@ui/theme-constants';
-import { StyledMenuItemSelect } from './MenuItemSelect';
+import { StyledMenuItemSelect } from '@ui/navigation/MenuItemSelect/MenuItemSelect';
import styles from './MenuItemSelectAvatar.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/__stories__/MenuItemSelectAvatar.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectAvatar/__stories__/MenuItemSelectAvatar.stories.tsx
index 5d2257003e0..d8730fbad6d 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectAvatar.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectAvatar/__stories__/MenuItemSelectAvatar.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Avatar } from '@ui/display';
+import { Avatar } from '@ui/data-display';
import {
AVATAR_URL_MOCK,
CatalogDecorator,
@@ -10,7 +10,7 @@ import {
ComponentDecorator,
JotaiRootDecorator,
} from '@ui/testing';
-import { MenuItemSelectAvatar } from '../MenuItemSelectAvatar';
+import { MenuItemSelectAvatar } from '@ui/navigation/MenuItemSelectAvatar/MenuItemSelectAvatar';
const meta: Meta<typeof MenuItemSelectAvatar> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemSelectAvatar',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectColor.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectColor/MenuItemSelectColor.tsx
similarity index 81%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectColor.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectColor/MenuItemSelectColor.tsx
index 7abb018fd00..0a9cc2f954b 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectColor.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectColor/MenuItemSelectColor.tsx
@@ -2,17 +2,17 @@ import {
StyledMenuItemIconCheck,
StyledMenuItemLabel,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
-import { ColorSample, type ColorSampleVariant } from '@ui/display';
+import { ColorSample, type ColorSampleVariant } from '@ui/data-display';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
import {
DEFAULT_COLOR_LABELS,
type ColorLabels,
-} from '../constants/DefaultColorLabels';
-import { StyledMenuItemSelect } from './MenuItemSelect';
+} from '@ui/navigation/MenuItem/constants/DefaultColorLabels';
+import { StyledMenuItemSelect } from '@ui/navigation/MenuItemSelect/MenuItemSelect';
type MenuItemSelectColorProps = {
selected: boolean;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectColor/__stories__/MenuItemSelectColor.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectColor/__stories__/MenuItemSelectColor.stories.tsx
index 4ccd34eb40f..552d6fa863e 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectColor/__stories__/MenuItemSelectColor.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { type ColorSampleVariant } from '@ui/display';
+import { type ColorSampleVariant } from '@ui/data-display';
import {
CatalogDecorator,
type CatalogDimension,
@@ -9,7 +9,7 @@ import {
ComponentDecorator,
} from '@ui/testing';
import { type ThemeColor, MAIN_COLOR_NAMES } from '@ui/theme';
-import { MenuItemSelectColor } from '../MenuItemSelectColor';
+import { MenuItemSelectColor } from '@ui/navigation/MenuItemSelectColor/MenuItemSelectColor';
const meta: Meta<typeof MenuItemSelectColor> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemSelectColor',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectTag.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
similarity index 83%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectTag.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
index e28e34505f4..b72e475c59e 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelectTag.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
@@ -1,14 +1,14 @@
import {
StyledMenuItemIconCheck,
StyledMenuItemLeftContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
-import { Tag } from '@ui/components';
-import { type IconComponent } from '@ui/display';
+import { Tag } from '@ui/data-display';
+import { type IconComponent } from '@ui/icon';
import { type ThemeColor } from '@ui/theme';
import { ThemeContext } from '@ui/theme-constants';
import { useContext } from 'react';
-import { StyledMenuItemSelect } from './MenuItemSelect';
+import { StyledMenuItemSelect } from '@ui/navigation/MenuItemSelect/MenuItemSelect';
type MenuItemSelectTagProps = {
selected?: boolean;
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectTag.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
similarity index 96%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectTag.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
index dc8891703ff..00f24c5f032 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemSelectTag.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
@@ -8,7 +8,7 @@ import {
ComponentDecorator,
} from '@ui/testing';
import { type ThemeColor } from '@ui/theme';
-import { MenuItemSelectTag } from '../MenuItemSelectTag';
+import { MenuItemSelectTag } from '@ui/navigation/MenuItemSelectTag/MenuItemSelectTag';
const meta: Meta<typeof MenuItemSelectTag> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemSelectTag',
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.module.scss b/packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.tsx b/packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
similarity index 85%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.tsx
rename to packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
index ad80e78e535..d27258f87c3 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSuggestion.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemSuggestion/MenuItemSuggestion.tsx
@@ -1,9 +1,9 @@
import { clsx } from 'clsx';
import { type MouseEvent } from 'react';
-import { type IconComponent } from '@ui/display';
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
-import { StyledMenuItemLeftContent } from '../internals/components/StyledMenuItemBase';
+import { type IconComponent } from '@ui/icon';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
+import { StyledMenuItemLeftContent } from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemSuggestion.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.module.scss b/packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.module.scss
rename to packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.tsx b/packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.tsx
similarity index 88%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.tsx
rename to packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.tsx
index 9a65a7524e5..ee6cf061f8d 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemToggle/MenuItemToggle.tsx
@@ -1,10 +1,10 @@
-import { type IconComponent } from '@ui/display';
+import { type IconComponent } from '@ui/icon';
import { Toggle, type ToggleSize } from '@ui/input';
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
+import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
import {
StyledMenuItemBase,
StyledMenuItemRightContent,
-} from '../internals/components/StyledMenuItemBase';
+} from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
import styles from './MenuItemToggle.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemToggle.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemToggle/__stories__/MenuItemToggle.stories.tsx
similarity index 95%
rename from packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemToggle.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuItemToggle/__stories__/MenuItemToggle.stories.tsx
index db3a919fce1..f3d8e352b61 100644
--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/__stories__/MenuItemToggle.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemToggle/__stories__/MenuItemToggle.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBell } from '@ui/display';
+import { IconBell } from '@ui/icon';
import {
CatalogDecorator,
type CatalogDimension,
@@ -8,7 +8,7 @@ import {
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { MenuItemToggle } from '../MenuItemToggle';
+import { MenuItemToggle } from '@ui/navigation/MenuItemToggle/MenuItemToggle';
const meta: Meta<typeof MenuItemToggle> = {
title: 'UI/Navigation/Menu/MenuItem/MenuItemToggle',
diff --git a/packages/twenty-ui/src/navigation/menu/components/MenuPicker.module.scss b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/components/MenuPicker.module.scss
rename to packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/components/MenuPicker.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/components/MenuPicker.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/components/MenuPicker.tsx b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
similarity index 94%
rename from packages/twenty-ui/src/navigation/menu/components/MenuPicker.tsx
rename to packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
index e5bd3e958b1..d51df0b8100 100644
--- a/packages/twenty-ui/src/navigation/menu/components/MenuPicker.tsx
+++ b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
@@ -3,12 +3,8 @@ import { clsx } from 'clsx';
import { useContext } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import {
- AppTooltip,
- TooltipDelay,
- TooltipPosition,
- type IconComponent,
-} from '@ui/display';
+import { type IconComponent } from '@ui/icon';
+import { AppTooltip, TooltipDelay, TooltipPosition } from '@ui/surfaces';
import { ThemeContext } from '@ui/theme-constants';
import styles from './MenuPicker.module.scss';
diff --git a/packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.module.scss b/packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.module.scss
rename to packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
diff --git a/packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.tsx b/packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.tsx
rename to packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
index 5587673053d..2039e59876a 100644
--- a/packages/twenty-ui/src/navigation/menu/components/__stories__/MenuPicker.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
@@ -1,6 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconChartPie, TooltipDelay } from '@ui/display';
-import { MenuPicker } from '@ui/navigation/menu/components/MenuPicker';
+import { IconChartPie } from '@ui/icon';
+import { TooltipDelay } from '@ui/surfaces';
+import { MenuPicker } from '@ui/navigation/MenuPicker/MenuPicker';
import { ComponentDecorator } from '@ui/testing';
import { type ReactNode } from 'react';
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.module.scss b/packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.module.scss
rename to packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.module.scss
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.module.scss.d.ts b/packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.tsx b/packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.tsx
similarity index 78%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.tsx
rename to packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.tsx
index b30dccfe13f..86589386174 100644
--- a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBar.tsx
+++ b/packages/twenty-ui/src/navigation/NavigationBar/NavigationBar.tsx
@@ -1,6 +1,6 @@
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { NavigationBarItem } from './NavigationBarItem';
+import { NavigationBarItem } from '@ui/navigation/NavigationBarItem/NavigationBarItem';
import styles from './NavigationBar.module.scss';
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx b/packages/twenty-ui/src/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
similarity index 82%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
rename to packages/twenty-ui/src/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
index 6da40879b6b..5a27da03b7b 100644
--- a/packages/twenty-ui/src/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
+++ b/packages/twenty-ui/src/navigation/NavigationBar/__stories__/NavigationBar.stories.tsx
@@ -1,8 +1,8 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconHome, IconSearch, IconSettings } from '@ui/display';
+import { IconHome, IconSearch, IconSettings } from '@ui/icon';
import { ComponentDecorator } from '@ui/testing';
-import { NavigationBar } from '../NavigationBar';
+import { NavigationBar } from '@ui/navigation/NavigationBar/NavigationBar';
const meta: Meta<typeof NavigationBar> = {
title: 'UI/Navigation/NavigationBar/NavigationBar',
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.module.scss b/packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.module.scss
rename to packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.module.scss
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.module.scss.d.ts b/packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.tsx b/packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.tsx
similarity index 89%
rename from packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.tsx
rename to packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.tsx
index 86060f803cc..9aa0be43c27 100644
--- a/packages/twenty-ui/src/navigation/navigation-bar/components/NavigationBarItem.tsx
+++ b/packages/twenty-ui/src/navigation/NavigationBarItem/NavigationBarItem.tsx
@@ -1,6 +1,6 @@
import { useContext } from 'react';
-import { type IconComponent } from '@ui/display/icon/types/IconComponent';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { ThemeContext, themeCssVariables } from '@ui/theme-constants';
import styles from './NavigationBarItem.module.scss';
diff --git a/packages/twenty-ui/src/navigation/link/components/RawLink.module.scss b/packages/twenty-ui/src/navigation/RawLink/RawLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RawLink.module.scss
rename to packages/twenty-ui/src/navigation/RawLink/RawLink.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/RawLink.module.scss.d.ts b/packages/twenty-ui/src/navigation/RawLink/RawLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RawLink.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/RawLink/RawLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/RawLink.tsx b/packages/twenty-ui/src/navigation/RawLink/RawLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RawLink.tsx
rename to packages/twenty-ui/src/navigation/RawLink/RawLink.tsx
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/RawLink.stories.tsx b/packages/twenty-ui/src/navigation/RawLink/__stories__/RawLink.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/RawLink.stories.tsx
rename to packages/twenty-ui/src/navigation/RawLink/__stories__/RawLink.stories.tsx
index 20ab59746d7..49c573eaa53 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/RawLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/RawLink/__stories__/RawLink.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { RawLink } from '../RawLink';
+import { RawLink } from '@ui/navigation/RawLink/RawLink';
const meta: Meta<typeof RawLink> = {
title: 'UI/Navigation/Link/RawLink',
diff --git a/packages/twenty-ui/src/navigation/link/components/RoundedLink.module.scss b/packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RoundedLink.module.scss
rename to packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/RoundedLink.module.scss.d.ts b/packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RoundedLink.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/RoundedLink.tsx b/packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/RoundedLink.tsx
rename to packages/twenty-ui/src/navigation/RoundedLink/RoundedLink.tsx
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/RoundedLink.stories.tsx b/packages/twenty-ui/src/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
similarity index 92%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/RoundedLink.stories.tsx
rename to packages/twenty-ui/src/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
index 868a9ccd54d..8cda5d8259c 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/RoundedLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/RoundedLink/__stories__/RoundedLink.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { RoundedLink } from '../RoundedLink';
+import { RoundedLink } from '@ui/navigation/RoundedLink/RoundedLink';
const meta: Meta<typeof RoundedLink> = {
title: 'UI/Navigation/Link/RoundedLink',
diff --git a/packages/twenty-ui/src/navigation/link/components/SocialLink.tsx b/packages/twenty-ui/src/navigation/SocialLink/SocialLink.tsx
similarity index 88%
rename from packages/twenty-ui/src/navigation/link/components/SocialLink.tsx
rename to packages/twenty-ui/src/navigation/SocialLink/SocialLink.tsx
index 13b69a24db0..2deea3b8e62 100644
--- a/packages/twenty-ui/src/navigation/link/components/SocialLink.tsx
+++ b/packages/twenty-ui/src/navigation/SocialLink/SocialLink.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
-import { RoundedLink } from '@ui/navigation/link/components/RoundedLink';
+import { RoundedLink } from '@ui/navigation/RoundedLink/RoundedLink';
import { getDisplayValueByUrlType } from '@ui/utilities';
export enum LinkType {
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/SocialLink.stories.tsx b/packages/twenty-ui/src/navigation/SocialLink/__stories__/SocialLink.stories.tsx
similarity index 93%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/SocialLink.stories.tsx
rename to packages/twenty-ui/src/navigation/SocialLink/__stories__/SocialLink.stories.tsx
index fe3b1f51a07..067ced0f221 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/SocialLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/SocialLink/__stories__/SocialLink.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { expect, fn, userEvent, within } from 'storybook/test';
import { ComponentWithRouterDecorator } from '@ui/testing';
-import { LinkType, SocialLink } from '../SocialLink';
+import { LinkType, SocialLink } from '@ui/navigation/SocialLink/SocialLink';
const meta: Meta<typeof SocialLink> = {
title: 'UI/Navigation/Link/SocialLink',
diff --git a/packages/twenty-ui/src/navigation/link/components/UndecoratedLink.module.scss b/packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.module.scss
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/UndecoratedLink.module.scss
rename to packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.module.scss
diff --git a/packages/twenty-ui/src/navigation/link/components/UndecoratedLink.module.scss.d.ts b/packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/UndecoratedLink.module.scss.d.ts
rename to packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.module.scss.d.ts
diff --git a/packages/twenty-ui/src/navigation/link/components/UndecoratedLink.tsx b/packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.tsx
similarity index 100%
rename from packages/twenty-ui/src/navigation/link/components/UndecoratedLink.tsx
rename to packages/twenty-ui/src/navigation/UndecoratedLink/UndecoratedLink.tsx
diff --git a/packages/twenty-ui/src/navigation/link/components/__stories__/UndecoratedLink.stories.tsx b/packages/twenty-ui/src/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
similarity index 86%
rename from packages/twenty-ui/src/navigation/link/components/__stories__/UndecoratedLink.stories.tsx
rename to packages/twenty-ui/src/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
index 7ee7446e026..2e1ce32e9aa 100644
--- a/packages/twenty-ui/src/navigation/link/components/__stories__/UndecoratedLink.stories.tsx
+++ b/packages/twenty-ui/src/navigation/UndecoratedLink/__stories__/UndecoratedLink.stories.tsx
@@ -1,10 +1,10 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { UndecoratedLink } from '@ui/navigation/link/components/UndecoratedLink';
+import { UndecoratedLink } from '@ui/navigation/UndecoratedLink/UndecoratedLink';
import { ComponentWithRouterDecorator } from '@ui/testing';
import { expect, userEvent, within } from 'storybook/test';
const meta: Meta<typeof UndecoratedLink> = {
- title: 'UI/navigation/link/UndecoratedLink',
+ title: 'UI/Navigation/UndecoratedLink',
component: UndecoratedLink,
decorators: [ComponentWithRouterDecorator],
};
diff --git a/packages/twenty-ui/src/navigation/index.ts b/packages/twenty-ui/src/navigation/index.ts
index 52f8997f2bb..814004ccc6b 100644
--- a/packages/twenty-ui/src/navigation/index.ts
+++ b/packages/twenty-ui/src/navigation/index.ts
@@ -7,73 +7,52 @@
* |___/
*/
-export { AdvancedSettingsToggle } from './link/components/AdvancedSettingsToggle';
-export { ClickToActionLink } from './link/components/ClickToActionLink';
-export { ContactLink } from './link/components/ContactLink';
-export { GithubVersionLink } from './link/components/GithubVersionLink';
-export { RawLink } from './link/components/RawLink';
-export { RoundedLink } from './link/components/RoundedLink';
-export { LinkType, SocialLink } from './link/components/SocialLink';
-export { UndecoratedLink } from './link/components/UndecoratedLink';
-export { CAL_LINK } from './link/constants/Cal';
-export { GITHUB_LINK } from './link/constants/GithubLink';
-export { TWENTY_PRICING_LINK } from './link/constants/TwentyPricingLink';
-export type { MenuPickerProps } from './menu/components/MenuPicker';
-export { MenuPicker } from './menu/components/MenuPicker';
-export type {
- MenuItemIconButton,
- MenuItemProps,
-} from './menu/menu-item/components/MenuItem';
-export { MenuItem } from './menu/menu-item/components/MenuItem';
-export type { MenuItemAvatarProps } from './menu/menu-item/components/MenuItemAvatar';
-export { MenuItemAvatar } from './menu/menu-item/components/MenuItemAvatar';
-export type { MenuItemDraggableProps } from './menu/menu-item/components/MenuItemDraggable';
-export { MenuItemDraggable } from './menu/menu-item/components/MenuItemDraggable';
-export type { MenuItemHotKeysProps } from './menu/menu-item/components/MenuItemHotKeys';
-export { MenuItemHotKeys } from './menu/menu-item/components/MenuItemHotKeys';
-export { MenuItemMultiSelect } from './menu/menu-item/components/MenuItemMultiSelect';
-export { MenuItemMultiSelectAvatar } from './menu/menu-item/components/MenuItemMultiSelectAvatar';
-export { MenuItemMultiSelectTag } from './menu/menu-item/components/MenuItemMultiSelectTag';
-export type { MenuItemNavigateProps } from './menu/menu-item/components/MenuItemNavigate';
-export { MenuItemNavigate } from './menu/menu-item/components/MenuItemNavigate';
+export { ClickToActionLink } from './ClickToActionLink/ClickToActionLink';
+export { ContactLink } from './ContactLink/ContactLink';
+export { GithubVersionLink } from './GithubVersionLink/GithubVersionLink';
+export { CAL_LINK } from './Link/constants/Cal';
+export { GITHUB_LINK } from './Link/constants/GithubLink';
+export { TWENTY_PRICING_LINK } from './Link/constants/TwentyPricingLink';
+export type { ColorLabels } from './MenuItem/constants/DefaultColorLabels';
+export { DEFAULT_COLOR_LABELS } from './MenuItem/constants/DefaultColorLabels';
+export type { MenuItemIconButton, MenuItemProps } from './MenuItem/MenuItem';
export {
- StyledMenuItemSelect,
- MenuItemSelect,
-} from './menu/menu-item/components/MenuItemSelect';
-export { MenuItemSelectAvatar } from './menu/menu-item/components/MenuItemSelectAvatar';
-export { MenuItemSelectColor } from './menu/menu-item/components/MenuItemSelectColor';
-export { MenuItemSelectTag } from './menu/menu-item/components/MenuItemSelectTag';
-export type { MenuItemSuggestionProps } from './menu/menu-item/components/MenuItemSuggestion';
-export { MenuItemSuggestion } from './menu/menu-item/components/MenuItemSuggestion';
-export type { MenuItemToggleProps } from './menu/menu-item/components/MenuItemToggle';
-export { MenuItemToggle } from './menu/menu-item/components/MenuItemToggle';
-export type { ColorLabels } from './menu/menu-item/constants/DefaultColorLabels';
-export { DEFAULT_COLOR_LABELS } from './menu/menu-item/constants/DefaultColorLabels';
-export type { MenuItemIconProps } from './menu/menu-item/internals/components/MenuItemIcon';
-export { MenuItemIcon } from './menu/menu-item/internals/components/MenuItemIcon';
-export {
- StyledIconContainer,
- MenuItemIconBoxContainer,
-} from './menu/menu-item/internals/components/MenuItemIconBoxContainer';
-export type { MenuItemIconWithGripSwapProps } from './menu/menu-item/internals/components/MenuItemIconWithGripSwap';
-export { MenuItemIconWithGripSwap } from './menu/menu-item/internals/components/MenuItemIconWithGripSwap';
-export { MenuItemLeftContent } from './menu/menu-item/internals/components/MenuItemLeftContent';
-export type { MenuItemBaseProps } from './menu/menu-item/internals/components/StyledMenuItemBase';
-export {
- StyledMenuItemBase,
- StyledMenuItemLabel,
- StyledMenuItemLabelLight,
- StyledNoIconFiller,
- StyledMenuItemLeftContent,
- StyledMenuItemRightContent,
- StyledDraggableItem,
+ MenuItemLeftContent,
StyledHoverableMenuItemBase,
StyledMenuItemIconCheck,
- StyledMenuItemContextualText,
- StyledRightMenuItemContextualText,
-} from './menu/menu-item/internals/components/StyledMenuItemBase';
-export type { MenuItemAccent } from './menu/menu-item/types/MenuItemAccent';
-export type { MenuItemDraggableGripMode } from './menu/menu-item/types/MenuItemDraggableGripMode';
-export { NavigationBar } from './navigation-bar/components/NavigationBar';
-export { NavigationBarItem } from './navigation-bar/components/NavigationBarItem';
-export { NotificationCounter } from './notification-counter/components/NotificationCounter';
+ StyledMenuItemLabel,
+ StyledMenuItemLeftContent,
+ MenuItem,
+} from './MenuItem/MenuItem';
+export type { MenuItemAccent } from './MenuItem/types/MenuItemAccent';
+export type { MenuItemDraggableGripMode } from './MenuItem/types/MenuItemDraggableGripMode';
+export type { MenuItemAvatarProps } from './MenuItemAvatar/MenuItemAvatar';
+export { MenuItemAvatar } from './MenuItemAvatar/MenuItemAvatar';
+export type { MenuItemDraggableProps } from './MenuItemDraggable/MenuItemDraggable';
+export { MenuItemDraggable } from './MenuItemDraggable/MenuItemDraggable';
+export type { MenuItemHotKeysProps } from './MenuItemHotKeys/MenuItemHotKeys';
+export { MenuItemHotKeys } from './MenuItemHotKeys/MenuItemHotKeys';
+export { MenuItemMultiSelect } from './MenuItemMultiSelect/MenuItemMultiSelect';
+export { MenuItemMultiSelectAvatar } from './MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar';
+export { MenuItemMultiSelectTag } from './MenuItemMultiSelectTag/MenuItemMultiSelectTag';
+export type { MenuItemNavigateProps } from './MenuItemNavigate/MenuItemNavigate';
+export { MenuItemNavigate } from './MenuItemNavigate/MenuItemNavigate';
+export {
+ StyledMenuItemSelect,
+ MenuItemSelect,
+} from './MenuItemSelect/MenuItemSelect';
+export { MenuItemSelectAvatar } from './MenuItemSelectAvatar/MenuItemSelectAvatar';
+export { MenuItemSelectColor } from './MenuItemSelectColor/MenuItemSelectColor';
+export { MenuItemSelectTag } from './MenuItemSelectTag/MenuItemSelectTag';
+export type { MenuItemSuggestionProps } from './MenuItemSuggestion/MenuItemSuggestion';
+export { MenuItemSuggestion } from './MenuItemSuggestion/MenuItemSuggestion';
+export type { MenuItemToggleProps } from './MenuItemToggle/MenuItemToggle';
+export { MenuItemToggle } from './MenuItemToggle/MenuItemToggle';
+export type { MenuPickerProps } from './MenuPicker/MenuPicker';
+export { MenuPicker } from './MenuPicker/MenuPicker';
+export { NavigationBar } from './NavigationBar/NavigationBar';
+export { NavigationBarItem } from './NavigationBarItem/NavigationBarItem';
+export { RawLink } from './RawLink/RawLink';
+export { RoundedLink } from './RoundedLink/RoundedLink';
+export { LinkType, SocialLink } from './SocialLink/SocialLink';
+export { UndecoratedLink } from './UndecoratedLink/UndecoratedLink';
diff --git a/packages/twenty-ui/src/navigation/link/components/index.ts b/packages/twenty-ui/src/navigation/link/components/index.ts
deleted file mode 100644
index 53d744ad975..00000000000
--- a/packages/twenty-ui/src/navigation/link/components/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './AdvancedSettingsToggle';
-export * from './ClickToActionLink';
-export * from './ContactLink';
-export * from './GithubVersionLink';
-export * from './RawLink';
-export * from './RoundedLink';
-export * from './SocialLink';
-export * from './UndecoratedLink';
diff --git a/packages/twenty-ui/src/navigation/link/index.ts b/packages/twenty-ui/src/navigation/link/index.ts
deleted file mode 100644
index c46a592e013..00000000000
--- a/packages/twenty-ui/src/navigation/link/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './components';
-export * from './constants/Cal';
-export * from './constants/GithubLink';
diff --git a/packages/twenty-ui/src/display/tooltip/AppTooltip.module.scss b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/tooltip/AppTooltip.module.scss
rename to packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss
diff --git a/packages/twenty-ui/src/display/tooltip/AppTooltip.module.scss.d.ts b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/tooltip/AppTooltip.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/tooltip/AppTooltip.tsx b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/tooltip/AppTooltip.tsx
rename to packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
diff --git a/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx b/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
similarity index 99%
rename from packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx
rename to packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
index ba1d73d4354..10096a782a1 100644
--- a/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
@@ -13,7 +13,7 @@ import {
} from '../AppTooltip';
const meta: Meta<typeof Tooltip> = {
- title: 'UI/Display/Tooltip',
+ title: 'UI/Surfaces/Tooltip',
component: Tooltip,
};
diff --git a/packages/twenty-ui/src/layout/card/components/Card.module.scss b/packages/twenty-ui/src/surfaces/Card/Card.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/Card.module.scss
rename to packages/twenty-ui/src/surfaces/Card/Card.module.scss
diff --git a/packages/twenty-ui/src/layout/card/components/Card.module.scss.d.ts b/packages/twenty-ui/src/surfaces/Card/Card.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/Card.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/Card/Card.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/card/components/Card.tsx b/packages/twenty-ui/src/surfaces/Card/Card.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/Card.tsx
rename to packages/twenty-ui/src/surfaces/Card/Card.tsx
diff --git a/packages/twenty-ui/src/layout/card/components/__stories__/Card.stories.tsx b/packages/twenty-ui/src/surfaces/Card/__stories__/Card.stories.tsx
similarity index 73%
rename from packages/twenty-ui/src/layout/card/components/__stories__/Card.stories.tsx
rename to packages/twenty-ui/src/surfaces/Card/__stories__/Card.stories.tsx
index ecac8b70d25..7af86a1149a 100644
--- a/packages/twenty-ui/src/layout/card/components/__stories__/Card.stories.tsx
+++ b/packages/twenty-ui/src/surfaces/Card/__stories__/Card.stories.tsx
@@ -1,13 +1,13 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { Card } from '../Card';
-import { CardContent } from '../CardContent';
-import { CardFooter } from '../CardFooter';
-import { CardHeader } from '../CardHeader';
+import { Card } from '@ui/surfaces/Card/Card';
+import { CardContent } from '@ui/surfaces/CardContent/CardContent';
+import { CardFooter } from '@ui/surfaces/CardFooter/CardFooter';
+import { CardHeader } from '@ui/surfaces/CardHeader/CardHeader';
const meta: Meta<typeof Card> = {
- title: 'UI/Layout/Card/Card',
+ title: 'UI/Surfaces/Card',
component: Card,
decorators: [ComponentDecorator],
render: (args) => (
diff --git a/packages/twenty-ui/src/layout/card/components/CardContent.module.scss b/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardContent.module.scss
rename to packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss
diff --git a/packages/twenty-ui/src/layout/card/components/CardContent.module.scss.d.ts b/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardContent.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/card/components/CardContent.tsx b/packages/twenty-ui/src/surfaces/CardContent/CardContent.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardContent.tsx
rename to packages/twenty-ui/src/surfaces/CardContent/CardContent.tsx
diff --git a/packages/twenty-ui/src/layout/card/components/CardFooter.module.scss b/packages/twenty-ui/src/surfaces/CardFooter/CardFooter.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardFooter.module.scss
rename to packages/twenty-ui/src/surfaces/CardFooter/CardFooter.module.scss
diff --git a/packages/twenty-ui/src/layout/card/components/CardFooter.module.scss.d.ts b/packages/twenty-ui/src/surfaces/CardFooter/CardFooter.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardFooter.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/CardFooter/CardFooter.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/card/components/CardFooter.tsx b/packages/twenty-ui/src/surfaces/CardFooter/CardFooter.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardFooter.tsx
rename to packages/twenty-ui/src/surfaces/CardFooter/CardFooter.tsx
diff --git a/packages/twenty-ui/src/layout/card/components/CardHeader.module.scss b/packages/twenty-ui/src/surfaces/CardHeader/CardHeader.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardHeader.module.scss
rename to packages/twenty-ui/src/surfaces/CardHeader/CardHeader.module.scss
diff --git a/packages/twenty-ui/src/layout/card/components/CardHeader.module.scss.d.ts b/packages/twenty-ui/src/surfaces/CardHeader/CardHeader.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardHeader.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/CardHeader/CardHeader.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/card/components/CardHeader.tsx b/packages/twenty-ui/src/surfaces/CardHeader/CardHeader.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/card/components/CardHeader.tsx
rename to packages/twenty-ui/src/surfaces/CardHeader/CardHeader.tsx
diff --git a/packages/twenty-ui/src/layout/modal/components/Modal.module.scss b/packages/twenty-ui/src/surfaces/Modal/Modal.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/Modal.module.scss
rename to packages/twenty-ui/src/surfaces/Modal/Modal.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/Modal.module.scss.d.ts b/packages/twenty-ui/src/surfaces/Modal/Modal.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/Modal.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/Modal/Modal.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/Modal.tsx b/packages/twenty-ui/src/surfaces/Modal/Modal.tsx
similarity index 92%
rename from packages/twenty-ui/src/layout/modal/components/Modal.tsx
rename to packages/twenty-ui/src/surfaces/Modal/Modal.tsx
index 770ef69254e..b886bbd708a 100644
--- a/packages/twenty-ui/src/layout/modal/components/Modal.tsx
+++ b/packages/twenty-ui/src/surfaces/Modal/Modal.tsx
@@ -3,12 +3,12 @@ import { clsx } from 'clsx';
import { useRef } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { type ModalOverlay } from '../types/ModalOverlay';
-import { type ModalPadding } from '../types/ModalPadding';
-import { type ModalProps } from '../types/ModalProps';
+import { type ModalOverlay } from '@ui/surfaces/Modal/types/ModalOverlay';
+import { type ModalPadding } from '@ui/surfaces/Modal/types/ModalPadding';
+import { type ModalProps } from '@ui/surfaces/Modal/types/ModalProps';
import styles from './Modal.module.scss';
-import { ModalBackdrop } from './ModalBackdrop';
+import { ModalBackdrop } from '@ui/surfaces/ModalBackdrop/ModalBackdrop';
const DEFAULT_MODAL_Z_INDEX = 40;
const DEFAULT_BACKDROP_Z_INDEX = 39;
diff --git a/packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.module.scss b/packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.module.scss
rename to packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.module.scss.d.ts b/packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.tsx b/packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.tsx
similarity index 94%
rename from packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.tsx
rename to packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.tsx
index a0e5ec16a70..fd5da765750 100644
--- a/packages/twenty-ui/src/layout/modal/components/__stories__/Modal.stories.tsx
+++ b/packages/twenty-ui/src/surfaces/Modal/__stories__/Modal.stories.tsx
@@ -1,19 +1,20 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { H1Title, H1TitleFontColor, H2Title, IconX } from '@ui/display';
+import { IconX } from '@ui/icon';
+import { H1Title, H1TitleFontColor, H2Title } from '@ui/typography';
import { Button, IconButton } from '@ui/input';
import { Section, SectionAlignment, SectionFontColor } from '@ui/layout';
import { ComponentDecorator } from '@ui/testing';
-import { Modal } from '../Modal';
-import { ModalContent } from '../ModalContent';
-import { ModalFooter } from '../ModalFooter';
-import { ModalHeader } from '../ModalHeader';
+import { Modal } from '@ui/surfaces/Modal/Modal';
+import { ModalContent } from '@ui/surfaces/ModalContent/ModalContent';
+import { ModalFooter } from '@ui/surfaces/ModalFooter/ModalFooter';
+import { ModalHeader } from '@ui/surfaces/ModalHeader/ModalHeader';
import styles from './Modal.stories.module.scss';
const meta: Meta<typeof Modal> = {
- title: 'UI/Layout/Modal/Modal',
+ title: 'UI/Surfaces/Modal',
component: Modal,
decorators: [ComponentDecorator],
argTypes: {
diff --git a/packages/twenty-ui/src/layout/modal/types/ModalOverlay.ts b/packages/twenty-ui/src/surfaces/Modal/types/ModalOverlay.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/types/ModalOverlay.ts
rename to packages/twenty-ui/src/surfaces/Modal/types/ModalOverlay.ts
diff --git a/packages/twenty-ui/src/layout/modal/types/ModalPadding.ts b/packages/twenty-ui/src/surfaces/Modal/types/ModalPadding.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/types/ModalPadding.ts
rename to packages/twenty-ui/src/surfaces/Modal/types/ModalPadding.ts
diff --git a/packages/twenty-ui/src/layout/modal/types/ModalProps.ts b/packages/twenty-ui/src/surfaces/Modal/types/ModalProps.ts
similarity index 73%
rename from packages/twenty-ui/src/layout/modal/types/ModalProps.ts
rename to packages/twenty-ui/src/surfaces/Modal/types/ModalProps.ts
index 9fcf2463453..099e26070ba 100644
--- a/packages/twenty-ui/src/layout/modal/types/ModalProps.ts
+++ b/packages/twenty-ui/src/surfaces/Modal/types/ModalProps.ts
@@ -1,8 +1,8 @@
import type React from 'react';
-import { type ModalOverlay } from './ModalOverlay';
-import { type ModalPadding } from './ModalPadding';
-import { type ModalSize } from './ModalSize';
+import { type ModalOverlay } from '@ui/surfaces/Modal/types/ModalOverlay';
+import { type ModalPadding } from '@ui/surfaces/Modal/types/ModalPadding';
+import { type ModalSize } from '@ui/surfaces/Modal/types/ModalSize';
export type ModalProps = React.PropsWithChildren & {
isOpen: boolean;
diff --git a/packages/twenty-ui/src/layout/modal/types/ModalSize.ts b/packages/twenty-ui/src/surfaces/Modal/types/ModalSize.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/types/ModalSize.ts
rename to packages/twenty-ui/src/surfaces/Modal/types/ModalSize.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalBackdrop.module.scss b/packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalBackdrop.module.scss
rename to packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalBackdrop.module.scss.d.ts b/packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalBackdrop.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalBackdrop.tsx b/packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.tsx
similarity index 93%
rename from packages/twenty-ui/src/layout/modal/components/ModalBackdrop.tsx
rename to packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.tsx
index 272823db784..6f1c570c694 100644
--- a/packages/twenty-ui/src/layout/modal/components/ModalBackdrop.tsx
+++ b/packages/twenty-ui/src/surfaces/ModalBackdrop/ModalBackdrop.tsx
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import { forwardRef } from 'react';
-import { type ModalOverlay } from '../types/ModalOverlay';
+import { type ModalOverlay } from '@ui/surfaces/Modal/types/ModalOverlay';
import styles from './ModalBackdrop.module.scss';
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalContent.module.scss b/packages/twenty-ui/src/surfaces/ModalContent/ModalContent.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalContent.module.scss
rename to packages/twenty-ui/src/surfaces/ModalContent/ModalContent.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalContent.module.scss.d.ts b/packages/twenty-ui/src/surfaces/ModalContent/ModalContent.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalContent.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/ModalContent/ModalContent.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalContent.tsx b/packages/twenty-ui/src/surfaces/ModalContent/ModalContent.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalContent.tsx
rename to packages/twenty-ui/src/surfaces/ModalContent/ModalContent.tsx
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalFooter.module.scss b/packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalFooter.module.scss
rename to packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalFooter.module.scss.d.ts b/packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalFooter.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalFooter.tsx b/packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalFooter.tsx
rename to packages/twenty-ui/src/surfaces/ModalFooter/ModalFooter.tsx
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalHeader.module.scss b/packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.module.scss
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalHeader.module.scss
rename to packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.module.scss
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalHeader.module.scss.d.ts b/packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalHeader.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.module.scss.d.ts
diff --git a/packages/twenty-ui/src/layout/modal/components/ModalHeader.tsx b/packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.tsx
similarity index 100%
rename from packages/twenty-ui/src/layout/modal/components/ModalHeader.tsx
rename to packages/twenty-ui/src/surfaces/ModalHeader/ModalHeader.tsx
diff --git a/packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.module.scss b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.module.scss
rename to packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
diff --git a/packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.module.scss.d.ts b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.module.scss.d.ts
rename to packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.tsx b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
similarity index 96%
rename from packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.tsx
rename to packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
index bc28c117a69..e995613f2d9 100644
--- a/packages/twenty-ui/src/display/tooltip/OverflowingTextWithTooltip.tsx
+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
@@ -3,9 +3,9 @@ import { createPortal } from 'react-dom';
import { isNonEmptyString } from '@sniptt/guards';
import { clsx } from 'clsx';
-import { LinkifiedText } from '@ui/display/components/LinkifiedText';
+import { LinkifiedText } from '@ui/typography/LinkifiedText/LinkifiedText';
import { isDefined } from '@ui/utilities/utils/isDefined';
-import { AppTooltip, TooltipDelay } from './AppTooltip';
+import { AppTooltip, TooltipDelay } from '@ui/surfaces/AppTooltip/AppTooltip';
import styles from './OverflowingTextWithTooltip.module.scss';
diff --git a/packages/twenty-ui/src/display/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
similarity index 98%
rename from packages/twenty-ui/src/display/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx
rename to packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
index 4f66dbf251b..3e20a5b0d0e 100644
--- a/packages/twenty-ui/src/display/tooltip/__stories__/OverflowTextWithTooltip.stories.tsx
+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/__stories__/OverflowTextWithTooltip.stories.tsx
@@ -9,7 +9,7 @@ const longText =
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi tellus diam, rhoncus nec consequat quis, dapibus quis massa. Praesent tincidunt augue at ex bibendum, non finibus augue faucibus. In at gravida orci. Nulla facilisi. Proin ut augue ut nisi pellentesque tristique. Proin sodales libero id turpis tincidunt posuere. Sed euismod, nunc at aliquam ultricies, nunc nisl aliquet nunc, quis aliquam nisl nunc quis nunc. Donec euismod, nunc quis aliquam ultricies, nunc nisl aliquet nunc.';
const meta: Meta<typeof OverflowingTextWithTooltip> = {
- title: 'UI/Display/Tooltip/OverflowingTextWithTooltip',
+ title: 'UI/Surfaces/OverflowingTextWithTooltip',
component: OverflowingTextWithTooltip,
};
diff --git a/packages/twenty-ui/src/surfaces/index.ts b/packages/twenty-ui/src/surfaces/index.ts
new file mode 100644
index 00000000000..dd449023df9
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/index.ts
@@ -0,0 +1,32 @@
+/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
+ * |_| \_/\_/ \___|_| |_|\__|\__, |
+ * |___/
+ */
+
+export type { AppTooltipProps } from './AppTooltip/AppTooltip';
+export {
+ TooltipPosition,
+ TooltipDelay,
+ AppTooltip,
+} from './AppTooltip/AppTooltip';
+export { Card } from './Card/Card';
+export { CardContent } from './CardContent/CardContent';
+export { CardFooter } from './CardFooter/CardFooter';
+export { CardHeader } from './CardHeader/CardHeader';
+export { Modal } from './Modal/Modal';
+export type { ModalOverlay } from './Modal/types/ModalOverlay';
+export type { ModalPadding } from './Modal/types/ModalPadding';
+export type { ModalProps } from './Modal/types/ModalProps';
+export type { ModalSize } from './Modal/types/ModalSize';
+export { ModalBackdrop } from './ModalBackdrop/ModalBackdrop';
+export type { ModalContentProps } from './ModalContent/ModalContent';
+export { ModalContent } from './ModalContent/ModalContent';
+export type { ModalFooterProps } from './ModalFooter/ModalFooter';
+export { ModalFooter } from './ModalFooter/ModalFooter';
+export type { ModalHeaderProps } from './ModalHeader/ModalHeader';
+export { ModalHeader } from './ModalHeader/ModalHeader';
+export { OverflowingTextWithTooltip } from './OverflowingTextWithTooltip/OverflowingTextWithTooltip';
diff --git a/packages/twenty-ui/src/display/typography/components/H1Title.module.scss b/packages/twenty-ui/src/typography/H1Title/H1Title.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H1Title.module.scss
rename to packages/twenty-ui/src/typography/H1Title/H1Title.module.scss
diff --git a/packages/twenty-ui/src/display/typography/components/H1Title.module.scss.d.ts b/packages/twenty-ui/src/typography/H1Title/H1Title.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H1Title.module.scss.d.ts
rename to packages/twenty-ui/src/typography/H1Title/H1Title.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/typography/components/H1Title.tsx b/packages/twenty-ui/src/typography/H1Title/H1Title.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H1Title.tsx
rename to packages/twenty-ui/src/typography/H1Title/H1Title.tsx
diff --git a/packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx b/packages/twenty-ui/src/typography/H1Title/__stories__/H1Title.stories.tsx
similarity index 90%
rename from packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx
rename to packages/twenty-ui/src/typography/H1Title/__stories__/H1Title.stories.tsx
index 9c7dd69a9de..a52326533ae 100644
--- a/packages/twenty-ui/src/display/typography/components/__stories__/H1Title.stories.tsx
+++ b/packages/twenty-ui/src/typography/H1Title/__stories__/H1Title.stories.tsx
@@ -4,10 +4,10 @@ import { CatalogDecorator } from '@ui/testing/decorators/CatalogDecorator';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
import { type CatalogStory } from '@ui/testing/types/CatalogStory';
-import { H1Title, H1TitleFontColor } from '../H1Title';
+import { H1Title, H1TitleFontColor } from '@ui/typography/H1Title/H1Title';
const meta: Meta<typeof H1Title> = {
- title: 'UI/Display/Typography/Title/H1Title',
+ title: 'UI/Typography/H1Title',
component: H1Title,
decorators: [ComponentDecorator],
};
diff --git a/packages/twenty-ui/src/display/typography/components/H2Title.module.scss b/packages/twenty-ui/src/typography/H2Title/H2Title.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H2Title.module.scss
rename to packages/twenty-ui/src/typography/H2Title/H2Title.module.scss
diff --git a/packages/twenty-ui/src/display/typography/components/H2Title.module.scss.d.ts b/packages/twenty-ui/src/typography/H2Title/H2Title.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H2Title.module.scss.d.ts
rename to packages/twenty-ui/src/typography/H2Title/H2Title.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/typography/components/H2Title.tsx b/packages/twenty-ui/src/typography/H2Title/H2Title.tsx
similarity index 86%
rename from packages/twenty-ui/src/display/typography/components/H2Title.tsx
rename to packages/twenty-ui/src/typography/H2Title/H2Title.tsx
index ceca604430e..46648c1f8c7 100644
--- a/packages/twenty-ui/src/display/typography/components/H2Title.tsx
+++ b/packages/twenty-ui/src/typography/H2Title/H2Title.tsx
@@ -1,6 +1,6 @@
import { clsx } from 'clsx';
-import { OverflowingTextWithTooltip } from '@ui/display/tooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from '@ui/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import styles from './H2Title.module.scss';
diff --git a/packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx b/packages/twenty-ui/src/typography/H2Title/__stories__/H2Title.stories.tsx
similarity index 88%
rename from packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx
rename to packages/twenty-ui/src/typography/H2Title/__stories__/H2Title.stories.tsx
index b936452bc0b..0601a1f94d0 100644
--- a/packages/twenty-ui/src/display/typography/components/__stories__/H2Title.stories.tsx
+++ b/packages/twenty-ui/src/typography/H2Title/__stories__/H2Title.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { H2Title } from '../H2Title';
+import { H2Title } from '@ui/typography/H2Title/H2Title';
const args = {
title: 'Sub title',
@@ -10,7 +10,7 @@ const args = {
};
const meta: Meta<typeof H2Title> = {
- title: 'UI/Display/Typography/Title/H2Title',
+ title: 'UI/Typography/H2Title',
component: H2Title,
decorators: [ComponentDecorator],
args: {
diff --git a/packages/twenty-ui/src/display/typography/components/H3Title.module.scss b/packages/twenty-ui/src/typography/H3Title/H3Title.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H3Title.module.scss
rename to packages/twenty-ui/src/typography/H3Title/H3Title.module.scss
diff --git a/packages/twenty-ui/src/display/typography/components/H3Title.module.scss.d.ts b/packages/twenty-ui/src/typography/H3Title/H3Title.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/H3Title.module.scss.d.ts
rename to packages/twenty-ui/src/typography/H3Title/H3Title.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/typography/components/H3Title.tsx b/packages/twenty-ui/src/typography/H3Title/H3Title.tsx
similarity index 87%
rename from packages/twenty-ui/src/display/typography/components/H3Title.tsx
rename to packages/twenty-ui/src/typography/H3Title/H3Title.tsx
index 9252d38e50d..ab1ba3fddff 100644
--- a/packages/twenty-ui/src/display/typography/components/H3Title.tsx
+++ b/packages/twenty-ui/src/typography/H3Title/H3Title.tsx
@@ -1,7 +1,7 @@
import { type ReactNode } from 'react';
import { clsx } from 'clsx';
-import { OverflowingTextWithTooltip } from '@ui/display/tooltip/OverflowingTextWithTooltip';
+import { OverflowingTextWithTooltip } from '@ui/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import styles from './H3Title.module.scss';
diff --git a/packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx b/packages/twenty-ui/src/typography/H3Title/__stories__/H3Title.stories.tsx
similarity index 81%
rename from packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx
rename to packages/twenty-ui/src/typography/H3Title/__stories__/H3Title.stories.tsx
index 78286472d71..6054f1a6d09 100644
--- a/packages/twenty-ui/src/display/typography/components/__stories__/H3Title.stories.tsx
+++ b/packages/twenty-ui/src/typography/H3Title/__stories__/H3Title.stories.tsx
@@ -2,10 +2,10 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { H3Title } from '../H3Title';
+import { H3Title } from '@ui/typography/H3Title/H3Title';
const meta: Meta<typeof H3Title> = {
- title: 'UI/Display/Typography/Title/H3Title',
+ title: 'UI/Typography/H3Title',
component: H3Title,
decorators: [ComponentDecorator],
args: {
diff --git a/packages/twenty-ui/src/display/typography/components/Label.module.scss b/packages/twenty-ui/src/typography/Label/Label.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/Label.module.scss
rename to packages/twenty-ui/src/typography/Label/Label.module.scss
diff --git a/packages/twenty-ui/src/display/typography/components/Label.module.scss.d.ts b/packages/twenty-ui/src/typography/Label/Label.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/Label.module.scss.d.ts
rename to packages/twenty-ui/src/typography/Label/Label.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/typography/components/Label.tsx b/packages/twenty-ui/src/typography/Label/Label.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/Label.tsx
rename to packages/twenty-ui/src/typography/Label/Label.tsx
diff --git a/packages/twenty-ui/src/display/typography/components/__stories__/Label.stories.tsx b/packages/twenty-ui/src/typography/Label/__stories__/Label.stories.tsx
similarity index 91%
rename from packages/twenty-ui/src/display/typography/components/__stories__/Label.stories.tsx
rename to packages/twenty-ui/src/typography/Label/__stories__/Label.stories.tsx
index 3497371d282..49f77265362 100644
--- a/packages/twenty-ui/src/display/typography/components/__stories__/Label.stories.tsx
+++ b/packages/twenty-ui/src/typography/Label/__stories__/Label.stories.tsx
@@ -4,10 +4,10 @@ import { CatalogDecorator } from '@ui/testing/decorators/CatalogDecorator';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
import { type CatalogStory } from '@ui/testing/types/CatalogStory';
-import { Label, type LabelVariant } from '../Label';
+import { Label, type LabelVariant } from '@ui/typography/Label/Label';
const meta: Meta<typeof Label> = {
- title: 'UI/Display/Typography/Label',
+ title: 'UI/Typography/Label',
component: Label,
decorators: [ComponentDecorator],
};
diff --git a/packages/twenty-ui/src/display/components/LinkifiedText.module.scss b/packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/components/LinkifiedText.module.scss
rename to packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.module.scss
diff --git a/packages/twenty-ui/src/display/components/LinkifiedText.module.scss.d.ts b/packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/components/LinkifiedText.module.scss.d.ts
rename to packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/components/LinkifiedText.tsx b/packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/components/LinkifiedText.tsx
rename to packages/twenty-ui/src/typography/LinkifiedText/LinkifiedText.tsx
diff --git a/packages/twenty-ui/src/display/text/components/SeparatorLineText.module.scss b/packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/text/components/SeparatorLineText.module.scss
rename to packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.module.scss
diff --git a/packages/twenty-ui/src/display/text/components/SeparatorLineText.module.scss.d.ts b/packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/text/components/SeparatorLineText.module.scss.d.ts
rename to packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/text/components/SeparatorLineText.tsx b/packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/text/components/SeparatorLineText.tsx
rename to packages/twenty-ui/src/typography/SeparatorLineText/SeparatorLineText.tsx
diff --git a/packages/twenty-ui/src/display/text/components/__stories__/SeparatorLineText.stories.tsx b/packages/twenty-ui/src/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx
similarity index 78%
rename from packages/twenty-ui/src/display/text/components/__stories__/SeparatorLineText.stories.tsx
rename to packages/twenty-ui/src/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx
index 44957bf5ace..63fd095b180 100644
--- a/packages/twenty-ui/src/display/text/components/__stories__/SeparatorLineText.stories.tsx
+++ b/packages/twenty-ui/src/typography/SeparatorLineText/__stories__/SeparatorLineText.stories.tsx
@@ -1,10 +1,10 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { ComponentDecorator } from '@ui/testing';
-import { SeparatorLineText } from '../SeparatorLineText';
+import { SeparatorLineText } from '@ui/typography/SeparatorLineText/SeparatorLineText';
const meta: Meta<typeof SeparatorLineText> = {
- title: 'UI/Display/Text/SeparatorLineText',
+ title: 'UI/Typography/SeparatorLineText',
component: SeparatorLineText,
args: { children: 'Or' },
decorators: [ComponentDecorator],
diff --git a/packages/twenty-ui/src/display/typography/components/StyledText.module.scss b/packages/twenty-ui/src/typography/StyledText/StyledText.module.scss
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/StyledText.module.scss
rename to packages/twenty-ui/src/typography/StyledText/StyledText.module.scss
diff --git a/packages/twenty-ui/src/display/typography/components/StyledText.module.scss.d.ts b/packages/twenty-ui/src/typography/StyledText/StyledText.module.scss.d.ts
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/StyledText.module.scss.d.ts
rename to packages/twenty-ui/src/typography/StyledText/StyledText.module.scss.d.ts
diff --git a/packages/twenty-ui/src/display/typography/components/StyledText.tsx b/packages/twenty-ui/src/typography/StyledText/StyledText.tsx
similarity index 100%
rename from packages/twenty-ui/src/display/typography/components/StyledText.tsx
rename to packages/twenty-ui/src/typography/StyledText/StyledText.tsx
diff --git a/packages/twenty-ui/src/typography/index.ts b/packages/twenty-ui/src/typography/index.ts
new file mode 100644
index 00000000000..3eff53c400c
--- /dev/null
+++ b/packages/twenty-ui/src/typography/index.ts
@@ -0,0 +1,21 @@
+/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
+ * |_| \_/\_/ \___|_| |_|\__|\__, |
+ * |___/
+ */
+
+export { H1TitleFontColor, H1Title } from './H1Title/H1Title';
+export { H2Title } from './H2Title/H2Title';
+export { H3Title } from './H3Title/H3Title';
+export type { LabelVariant } from './Label/Label';
+export { Label } from './Label/Label';
+export { LinkifiedText } from './LinkifiedText/LinkifiedText';
+export { SeparatorLineText } from './SeparatorLineText/SeparatorLineText';
+export {
+ StyledTextContent,
+ StyledTextWrapper,
+ StyledText,
+} from './StyledText/StyledText';
diff --git a/packages/twenty-ui/src/utilities/animation/index.ts b/packages/twenty-ui/src/utilities/animation/index.ts
deleted file mode 100644
index 17543126392..00000000000
--- a/packages/twenty-ui/src/utilities/animation/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './components/AnimatedCircleLoading';
-export * from './components/AnimatedContainer';
-export * from './components/AnimatedEaseIn';
-export * from './components/AnimatedEaseInOut';
-export * from './components/AnimatedFadeOut';
-export * from './components/AnimatedIconCrossfade';
-export * from './components/AnimatedTextWord';
-export * from './components/AnimatedTranslation';
diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.ts
index a2239add0f8..e5bbd31d1d4 100644
--- a/packages/twenty-ui/src/utilities/index.ts
+++ b/packages/twenty-ui/src/utilities/index.ts
@@ -7,15 +7,6 @@
* |___/
*/
-export { AnimatedCircleLoading } from './animation/components/AnimatedCircleLoading';
-export { AnimatedContainer } from './animation/components/AnimatedContainer';
-export { AnimatedEaseIn } from './animation/components/AnimatedEaseIn';
-export { AnimatedEaseInOut } from './animation/components/AnimatedEaseInOut';
-export { AnimatedFadeOut } from './animation/components/AnimatedFadeOut';
-export { AnimatedIconCrossfade } from './animation/components/AnimatedIconCrossfade';
-export { AnimatedRotate } from './animation/components/AnimatedRotate';
-export { AnimatedTextWord } from './animation/components/AnimatedTextWord';
-export { AnimatedTranslation } from './animation/components/AnimatedTranslation';
export { getMainColorNameFromPaletteColorName } from './color/utils/getMainColorNameFromPaletteColorName';
export { parseThemeColor } from './color/utils/parseThemeColor';
export {
@@ -27,7 +18,6 @@ export { REACT_APP_SERVER_BASE_URL } from './config';
export { getOsControlSymbol } from './device/getOsControlSymbol';
export { getOsShortcutSeparator } from './device/getOsShortcutSeparator';
export { getUserDevice } from './device/getUserDevice';
-export { AutogrowWrapper } from './dimensions/components/AutogrowWrapper';
export { useMouseDownNavigation } from './navigation/hooks/useMouseDownNavigation';
export { useResetLocationHash } from './navigation/hooks/useResetLocationHash';
export { isNavigationModifierPressed } from './navigation/isNavigationModifierPressed';
diff --git a/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts b/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts
index 2aa2e162f8c..b3ebc83ffb3 100644
--- a/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts
+++ b/packages/twenty-ui/src/utilities/utils/__tests__/getDisplayValueByUrlType.test.ts
@@ -1,4 +1,4 @@
-import { LinkType } from '@ui/navigation/link/components/SocialLink';
+import { LinkType } from '@ui/navigation/SocialLink/SocialLink';
import { getDisplayValueByUrlType } from '../getDisplayValueByUrlType';