diff --git a/packages/twenty-docs/docs/contributor/frontend/best-practices.mdx b/packages/twenty-docs/docs/contributor/frontend/best-practices.mdx
index e946733f3..a4b91b95b 100644
--- a/packages/twenty-docs/docs/contributor/frontend/best-practices.mdx
+++ b/packages/twenty-docs/docs/contributor/frontend/best-practices.mdx
@@ -300,7 +300,7 @@ import {
```tsx
// ✅ Good, utilises the designated aliases
import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';=
+import { ComponentDecorator } from 'twenty-ui';=
```
## Schema Validation
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx
index 82cba4e10..fd5607f3f 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { Calendar } from '@/activities/calendar/components/Calendar';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
diff --git a/packages/twenty-front/src/modules/activities/comment/__stories__/Comment.stories.tsx b/packages/twenty-front/src/modules/activities/comment/__stories__/Comment.stories.tsx
index 876d5a251..a75afeb82 100644
--- a/packages/twenty-front/src/modules/activities/comment/__stories__/Comment.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/comment/__stories__/Comment.stories.tsx
@@ -1,9 +1,9 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
+import { ComponentDecorator } from 'twenty-ui';
import { viewableActivityIdState } from '@/activities/states/viewableActivityIdState';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { ActivityActionBar } from '../../right-drawer/components/ActivityActionBar';
import { Comment } from '../Comment';
diff --git a/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
index f14315bc4..4ba26346f 100644
--- a/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
@@ -24,9 +24,13 @@ const StyledContainer = styled.div`
display: flex;
`;
-const StyledRecordChip = styled(RecordChip)<{ variant: 'default' | 'bold' }>`
- font-weight: ${({ theme, variant }) =>
- variant === 'bold' ? theme.font.weight.medium : theme.font.weight.regular};
+const StyledRecordChip = styled(RecordChip)<{
+ participantChipVariant: 'default' | 'bold';
+}>`
+ font-weight: ${({ theme, participantChipVariant }) =>
+ participantChipVariant === 'bold'
+ ? theme.font.weight.medium
+ : theme.font.weight.regular};
`;
const StyledChip = styled.div`
@@ -63,7 +67,7 @@ export const ParticipantChip = ({
) : (
diff --git a/packages/twenty-front/src/modules/activities/table/components/__stories__/CommentChip.stories.tsx b/packages/twenty-front/src/modules/activities/table/components/__stories__/CommentChip.stories.tsx
index c913a6789..9667af784 100644
--- a/packages/twenty-front/src/modules/activities/table/components/__stories__/CommentChip.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/table/components/__stories__/CommentChip.stories.tsx
@@ -1,7 +1,6 @@
import styled from '@emotion/styled';
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { CommentChip } from '../CommentChip';
diff --git a/packages/twenty-front/src/modules/activities/tasks/__stories__/TaskList.stories.tsx b/packages/twenty-front/src/modules/activities/tasks/__stories__/TaskList.stories.tsx
index ebeaa3f79..0adf89174 100644
--- a/packages/twenty-front/src/modules/activities/tasks/__stories__/TaskList.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/__stories__/TaskList.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { TaskList } from '@/activities/tasks/components/TaskList';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
index f1eaf2aa5..5a1d417bd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
@@ -1,12 +1,12 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { ChipFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ChipFieldDisplay';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
const ChipFieldValueSetterEffect = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx
index b34ecbaf4..73fb54ae3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { FieldContext } from '../../../../contexts/FieldContext';
import { useDateTimeField } from '../../../hooks/useDateTimeField';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
index d296465e6..11cc8d5b6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
@@ -1,10 +1,10 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { useEmailField } from '@/object-record/record-field/meta-types/hooks/useEmailField';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { EmailFieldDisplay } from '../EmailFieldDisplay';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
index db7fe3c57..9d86b6a7c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { FieldContext } from '../../../../contexts/FieldContext';
import { useNumberField } from '../../../hooks/useNumberField';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
index 9e9c85f8d..c656e7805 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
@@ -1,10 +1,10 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { usePhoneField } from '@/object-record/record-field/meta-types/hooks/usePhoneField';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { PhoneFieldDisplay } from '../PhoneFieldDisplay';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
index 328a6533c..6fd793f3a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldMetadataType } from '~/generated/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { FieldContext } from '../../../../contexts/FieldContext';
import { useTextField } from '../../../hooks/useTextField';
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailDuplicatesSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
index b2d517f32..52d7629ad 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
index 19ea41cac..7dbec8145 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
@@ -1,9 +1,9 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
import { mockedCompanyObjectMetadataItem } from '@/object-record/record-field/__mocks__/fieldDefinitions';
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { RecordStoreDecorator } from '~/testing/decorators/RecordStoreDecorator';
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
index 07a32ade6..24a9ca725 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
@@ -1,9 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, userEvent, within } from '@storybook/test';
-import { IconUserCircle } from 'twenty-ui';
+import { ComponentDecorator, IconUserCircle } from 'twenty-ui';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { RelationPickerDecorator } from '~/testing/decorators/RelationPickerDecorator';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
index b6bfdb97a..b7feb02d1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
@@ -1,8 +1,8 @@
import { Decorator, Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
import { SettingsAccountsEmailsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistInput';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
const updateBlockedEmailListJestFn = fn();
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistSection.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistSection.stories.tsx
index e92ad0334..7fa2183aa 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistSection.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistSection.stories.tsx
@@ -1,8 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { SettingsAccountsEmailsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistInput';
import { SettingsAccountsEmailsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistSection';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
const meta: Meta = {
title:
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
index 076d9e529..64abc507a 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
@@ -1,9 +1,9 @@
import { Decorator, Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
import { mockedBlocklist } from '@/settings/accounts/components/__stories__/mockedBlocklist';
import { SettingsAccountsEmailsBlocklistTable } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistTable';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { formatToHumanReadableDate } from '~/utils';
const handleBlockedEmailRemoveJestFn = fn();
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
index 6742eb912..bb173f082 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
@@ -1,9 +1,9 @@
import { Decorator, Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
import { mockedBlocklist } from '@/settings/accounts/components/__stories__/mockedBlocklist';
import { SettingsAccountsEmailsBlocklistTableRow } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistTableRow';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { formatToHumanReadableDate } from '~/utils';
const onRemoveJestFn = fn();
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldFormSection.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldFormSection.stories.tsx
index d7fe37946..f21054032 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldFormSection.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFieldFormSection.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { SettingsObjectFieldFormSection } from '../SettingsObjectFieldFormSection';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
index fe42e3313..84bedd658 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
@@ -1,5 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import { fn } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
import {
mockedCompanyObjectMetadataItem,
@@ -10,7 +11,6 @@ import {
FieldMetadataType,
RelationMetadataType,
} from '~/generated-metadata/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
index 35b6b4320..903383747 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
@@ -1,8 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { SettingsDataModelFieldTypeSelect } from '../SettingsDataModelFieldTypeSelect';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
index d1d9088e8..caa9a6622 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
@@ -1,11 +1,11 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import {
mockedCompanyObjectMetadataItem,
mockedPersonObjectMetadataItem,
} from '@/object-record/record-field/__mocks__/fieldDefinitions';
import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
index 0a5bfde6d..ed4062926 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
@@ -1,7 +1,6 @@
import { Decorator, Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { SettingsObjectInactiveMenuDropDown } from '../SettingsObjectInactiveMenuDropDown';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
index ecd8ab659..75fe343da 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
@@ -1,8 +1,8 @@
import styled from '@emotion/styled';
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { mockedCompanyObjectMetadataItem } from '@/object-record/record-field/__mocks__/fieldDefinitions';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/__stories__/ApiKeyInput.stories.tsx b/packages/twenty-front/src/modules/settings/developers/components/__stories__/ApiKeyInput.stories.tsx
index fc25fa36f..5ecffb5a7 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/__stories__/ApiKeyInput.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/__stories__/ApiKeyInput.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { ApiKeyInput } from '@/settings/developers/components/ApiKeyInput';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
const meta: Meta = {
diff --git a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsApiKeysFieldItemTableRow.stories.tsx b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsApiKeysFieldItemTableRow.stories.tsx
index cc51bbce3..7147522e6 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsApiKeysFieldItemTableRow.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/__stories__/SettingsApiKeysFieldItemTableRow.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { SettingsApiKeysFieldItemTableRow } from '@/settings/developers/components/SettingsApiKeysFieldItemTableRow';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
const meta: Meta = {
title: 'Modules/Settings/Developers/ApiKeys/SettingsApiKeysFieldItemTableRow',
diff --git a/packages/twenty-front/src/modules/ui/display/color/components/__stories__/ColorSample.stories.tsx b/packages/twenty-front/src/modules/ui/display/color/components/__stories__/ColorSample.stories.tsx
index 2514e0f78..e1d9491f1 100644
--- a/packages/twenty-front/src/modules/ui/display/color/components/__stories__/ColorSample.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/color/components/__stories__/ColorSample.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { ColorSample } from '../ColorSample';
diff --git a/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx b/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
index b0077e064..1afa5aa12 100644
--- a/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
@@ -1,13 +1,11 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import {
MAIN_COLOR_NAMES,
ThemeColor,
} from '@/ui/theme/constants/MainColorNames';
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
import { Status } from '../Status';
diff --git a/packages/twenty-front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx b/packages/twenty-front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx
index 1f72762f8..00e62f750 100644
--- a/packages/twenty-front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/tag/components/__stories__/Tag.stories.tsx
@@ -1,13 +1,11 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import {
MAIN_COLOR_NAMES,
ThemeColor,
} from '@/ui/theme/constants/MainColorNames';
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
import { Tag } from '../Tag';
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx
index 4d75c2abe..e48e873b9 100644
--- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H1Title.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import { H1Title, H1TitleFontColor } from '../H1Title';
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx
index 196a1255d..e896bf3e5 100644
--- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H2Title.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { H2Title } from '../H2Title';
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
index 7ea720df9..41254a9f5 100644
--- a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { H3Title } from '../H3Title';
diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx b/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx
index a608f91f7..ee7a22e4c 100644
--- a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import { CircularProgressBar } from '../CircularProgressBar';
diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx b/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx
index f09e26905..bfd7f4287 100644
--- a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import { ProgressBar } from '../ProgressBar';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
index 7dd03a023..112d4ee74 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import {
Button,
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
index 6ebbc6e42..803bbbb7d 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
@@ -1,9 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconCheckbox,
+ IconNotes,
+ IconTimelineEvent,
+} from 'twenty-ui';
import { Button, ButtonAccent, ButtonSize, ButtonVariant } from '../Button';
import { ButtonGroup } from '../ButtonGroup';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ColorPickerButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ColorPickerButton.stories.tsx
index af23f34f2..e12c5d063 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ColorPickerButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ColorPickerButton.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { ColorPickerButton } from '../ColorPickerButton';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
index a2d55b456..5e9272318 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import { FloatingButton, FloatingButtonSize } from '../FloatingButton';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
index 66f1d3d75..e3b8f0e28 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
@@ -1,9 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconCheckbox,
+ IconNotes,
+ IconTimelineEvent,
+} from 'twenty-ui';
import { FloatingButton, FloatingButtonSize } from '../FloatingButton';
import { FloatingButtonGroup } from '../FloatingButtonGroup';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
index 386da63b6..6a0e973b7 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import {
FloatingIconButton,
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
index 2bb3c8fe9..3317f6a06 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
@@ -1,9 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconCheckbox,
+ IconNotes,
+ IconTimelineEvent,
+} from 'twenty-ui';
import { FloatingIconButtonSize } from '../FloatingIconButton';
import { FloatingIconButtonGroup } from '../FloatingIconButtonGroup';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
index 1ea9af451..706335641 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import {
IconButton,
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
index 386ae6b56..f4bc972e8 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
@@ -1,9 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconCheckbox,
+ IconNotes,
+ IconTimelineEvent,
+} from 'twenty-ui';
import {
IconButtonAccent,
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
index c89de5ffa..ddf9de2a2 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import { LightButton, LightButtonAccent } from '../LightButton';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
index 14e605c44..58069b57e 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconSearch,
+} from 'twenty-ui';
import {
LightIconButton,
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
index f146e25d2..631d8258f 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
@@ -1,8 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
-import { IconBrandGoogle } from 'twenty-ui';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator, IconBrandGoogle } from 'twenty-ui';
import { MainButton } from '../MainButton';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
index 8f43ab235..da2d19b82 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
@@ -1,8 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, fn, userEvent, within } from '@storybook/test';
-import { IconArrowRight } from 'twenty-ui';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator, IconArrowRight } from 'twenty-ui';
import { RoundedIconButton } from '../RoundedIconButton';
diff --git a/packages/twenty-front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx b/packages/twenty-front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx
index 77d4e1469..700845eb0 100644
--- a/packages/twenty-front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/color-scheme/components/__stories__/ColorSchemeCard.stories.tsx
@@ -1,7 +1,6 @@
import styled from '@emotion/styled';
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { ColorSchemeCard } from '../ColorSchemeCard';
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/AutosizeTextInput.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/AutosizeTextInput.stories.tsx
index b10577e7b..49945fe68 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/AutosizeTextInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/AutosizeTextInput.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import {
AutosizeTextInput,
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Checkbox.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Checkbox.stories.tsx
index 2cd5bd37e..793ff487d 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Checkbox.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Checkbox.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import {
Checkbox,
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
index 8167a00cb..ac24370a5 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, userEvent, within } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';
import { sleep } from '~/testing/sleep';
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
index 1a9e4fea9..ffe7f48be 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { workspaceLogoUrl } from '~/testing/mock-data/users';
import { ImageInput } from '../ImageInput';
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Radio.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Radio.stories.tsx
index 3bf2f72ed..319e257e5 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Radio.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Radio.stories.tsx
@@ -1,8 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui';
import { LabelPosition, Radio, RadioSize } from '../Radio';
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 4c977c08c..d5ef7dc21 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
@@ -1,8 +1,7 @@
import { useState } from 'react';
import { Meta, StoryObj } from '@storybook/react';
import { userEvent, within } from '@storybook/test';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { Select, SelectProps } from '../Select';
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
index 13f5a0655..425ba4f4d 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
@@ -1,7 +1,6 @@
import { useState } from 'react';
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { TextArea, TextAreaProps } from '../TextArea';
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInput.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInput.stories.tsx
index 74dc2e96b..85442f198 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInput.stories.tsx
@@ -1,7 +1,6 @@
import { useState } from 'react';
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { TextInput, TextInputComponentProps } from '../TextInput';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
index 45cfde400..220a6abc3 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/DatePicker.stories.tsx
@@ -1,7 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, userEvent, within } from '@storybook/test';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { InternalDatePicker } from '../InternalDatePicker';
diff --git a/packages/twenty-front/src/modules/ui/layout/card/components/__stories__/Card.stories.tsx b/packages/twenty-front/src/modules/ui/layout/card/components/__stories__/Card.stories.tsx
index 1c05901a2..dd8e61973 100644
--- a/packages/twenty-front/src/modules/ui/layout/card/components/__stories__/Card.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/card/components/__stories__/Card.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { Card } from '../Card';
import { CardContent } from '../CardContent';
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
index 6c87c8ec3..a6b2cffc0 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
@@ -1,9 +1,8 @@
import { DragDropContext, Droppable } from '@hello-pangea/dnd';
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
+import { ComponentDecorator, IconBell } from 'twenty-ui';
import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { DraggableItem } from '../components/DraggableItem';
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
index 469e0f7e0..071d8a336 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
@@ -1,9 +1,8 @@
import { action } from '@storybook/addon-actions';
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
+import { ComponentDecorator, IconBell } from 'twenty-ui';
import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { DraggableItem } from '../components/DraggableItem';
import { DraggableList } from '../components/DraggableList';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
index 42838fca3..1053583e7 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { DropdownMenuInput } from '../DropdownMenuInput';
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx
index 73e2f27fa..e563f0f0a 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { ConfirmationModal } from '../ConfirmationModal';
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 e96e85a08..d27d09f2b 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
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { Modal } from '../Modal';
import { ModalHotkeyScope } from '../types/ModalHotkeyScope';
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
index 86d426bba..cae661cf3 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconCheckbox,
+} from 'twenty-ui';
import { Tab } from '../Tab';
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
index 4023d1756..7c4c63256 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
@@ -1,9 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
import { expect, within } from '@storybook/test';
-import { IconCheckbox } from 'twenty-ui';
+import { ComponentDecorator, IconCheckbox } from 'twenty-ui';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { TabList } from '../TabList';
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
index 9191af3ee..832c0f589 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { Table } from '../Table';
import { TableCell } from '../TableCell';
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
index 24daaea85..9610eb43b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
@@ -1,8 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
+import { ComponentDecorator } from 'twenty-ui';
import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { actionBarOpenState } from '../../states/actionBarIsOpenState';
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
index 1a7bd1097..a655fc6b6 100644
--- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
import { Breadcrumb } from '../Breadcrumb';
diff --git a/packages/twenty-front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
index ee9eddd2f..2b2f29e5c 100644
--- a/packages/twenty-front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
@@ -1,8 +1,8 @@
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
+import { ComponentDecorator } from 'twenty-ui';
import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { contextMenuIsOpenState } from '../../states/contextMenuIsOpenState';
diff --git a/packages/twenty-front/src/modules/ui/navigation/link/components/__stories__/ActionLink.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/__stories__/ActionLink.stories.tsx
index 6dbb0aea9..522c24c11 100644
--- a/packages/twenty-front/src/modules/ui/navigation/link/components/__stories__/ActionLink.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/__stories__/ActionLink.stories.tsx
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
import { ActionLink } from '@/ui/navigation/link/components/ActionLink.tsx';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator.tsx';
const meta: Meta = {
title: 'UI/navigation/link/ActionLink',
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
index 8a20708e8..a4eb66117 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
@@ -1,10 +1,11 @@
import { action } from '@storybook/addon-actions';
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemAccent } from '../../types/MenuItemAccent';
import { MenuItem } from '../MenuItem';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
index 1f7899d50..802524805 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+import {
+ CatalogDecorator,
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemCommand } from '../MenuItemCommand';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
index 827a52b5b..b7d6dba3b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
@@ -1,13 +1,13 @@
import { action } from '@storybook/addon-actions';
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell, IconMinus } from 'twenty-ui';
-
import {
CatalogDecorator,
CatalogDimension,
CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+ ComponentDecorator,
+ IconBell,
+ IconMinus,
+} from 'twenty-ui';
import { MenuItemAccent } from '../../types/MenuItemAccent';
import { MenuItemDraggable } from '../MenuItemDraggable';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
index b4aaebff7..8bcdc3ec9 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
@@ -1,13 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
import {
CatalogDecorator,
CatalogDimension,
CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemMultiSelect } from '../MenuItemMultiSelect';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
index 53a7bf2be..72c097f6f 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
@@ -1,13 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
import {
CatalogDecorator,
CatalogDimension,
CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemNavigate } from '../MenuItemNavigate';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
index 501156039..21d73d963 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
@@ -1,13 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
import {
CatalogDecorator,
CatalogDimension,
CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemSelect } from '../MenuItemSelect';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx
index 26164369e..015ab7f9e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelectColor.stories.tsx
@@ -1,17 +1,17 @@
import { Meta, StoryObj } from '@storybook/react';
+import {
+ CatalogDecorator,
+ CatalogDimension,
+ CatalogOptions,
+ CatalogStory,
+ ComponentDecorator,
+} from 'twenty-ui';
import { ColorSampleVariant } from '@/ui/display/color/components/ColorSample';
import {
MAIN_COLOR_NAMES,
ThemeColor,
} from '@/ui/theme/constants/MainColorNames';
-import {
- CatalogDecorator,
- CatalogDimension,
- CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
import { MenuItemSelectColor } from '../MenuItemSelectColor';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
index 9c7d05389..c46ef3dfc 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
@@ -1,13 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconBell } from 'twenty-ui';
-
import {
CatalogDecorator,
CatalogDimension,
CatalogOptions,
-} from '~/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { CatalogStory } from '~/testing/types';
+ CatalogStory,
+ ComponentDecorator,
+ IconBell,
+} from 'twenty-ui';
import { MenuItemToggle } from '../MenuItemToggle';
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 30d9d86d7..2dba91b68 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
@@ -1,7 +1,12 @@
import { Meta, StoryObj } from '@storybook/react';
-import { IconCheckbox, IconList, IconSearch, IconSettings } from 'twenty-ui';
+import {
+ ComponentDecorator,
+ IconCheckbox,
+ IconList,
+ IconSearch,
+ IconSettings,
+} from 'twenty-ui';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
import { NavigationBar } from '../NavigationBar';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
index 72c0b5ec0..34de471db 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
@@ -1,6 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { ComponentDecorator } from 'twenty-ui';
import { NavigationDrawerCollapseButton } from '../NavigationDrawerCollapseButton';
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 90fb66e33..f541a91aa 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
@@ -1,11 +1,9 @@
import styled from '@emotion/styled';
import { Meta, StoryObj } from '@storybook/react';
-import { IconSearch } from 'twenty-ui';
+import { CatalogDecorator, CatalogStory, IconSearch } from 'twenty-ui';
-import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
-import { CatalogStory } from '~/testing/types';
import { NavigationDrawerItem } from '../NavigationDrawerItem';
diff --git a/packages/twenty-server/src/modules/calendar/crons/commands/calendar-cron-commands.module.ts b/packages/twenty-server/src/modules/calendar/crons/commands/calendar-cron-commands.module.ts
index 2151e8f13..30df8fe7d 100644
--- a/packages/twenty-server/src/modules/calendar/crons/commands/calendar-cron-commands.module.ts
+++ b/packages/twenty-server/src/modules/calendar/crons/commands/calendar-cron-commands.module.ts
@@ -1,8 +1,5 @@
import { Module } from '@nestjs/common';
-import { GoogleCalendarSyncCommand } from 'src/modules/calendar/commands/google-calendar-sync.command';
-import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
-import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
import { GoogleCalendarSyncCronCommand } from 'src/modules/calendar/crons/commands/google-calendar-sync.cron.command';
@Module({