diff --git a/packages/design-system/src/components/Form/index.ts b/packages/design-system/src/components/Form/index.ts
index 70c9259841..004128749a 100644
--- a/packages/design-system/src/components/Form/index.ts
+++ b/packages/design-system/src/components/Form/index.ts
@@ -1,3 +1,4 @@
+import { ToggleSwitch, UncontrolledToggleSwitch } from './ToggleSwitch';
import Buttons from './Buttons';
import Datalist from './Field/Datalist';
import Input from './Field/Input';
@@ -34,6 +35,7 @@ export const FormComponent = Form as typeof Form & {
Week: typeof Input.Week;
Buttons: typeof Buttons;
Input: typeof Input;
+ ToggleSwitch: typeof ToggleSwitch;
};
FormComponent.Row = Row;
@@ -61,6 +63,7 @@ FormComponent.Time = Input.Time;
FormComponent.Url = Input.Url;
FormComponent.Week = Input.Week;
FormComponent.Input = Input;
+FormComponent.ToggleSwitch = ToggleSwitch;
FormComponent.Buttons = Buttons;
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index 5a93068de9..c0dbb62350 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -181,4 +181,3 @@ export type { PopoverProps, PopoverTriggerProps, TooltipPlacement };
export * from './components/Form/ToggleSwitch';
export * from './components/Form/Checkbox';
-export * from './components/Form/ToggleSwitch';
diff --git a/packages/design-system/src/stories/form/Checkbox/Checkbox.stories.mdx b/packages/design-system/src/stories/form/Checkbox/Checkbox.mdx
similarity index 96%
rename from packages/design-system/src/stories/form/Checkbox/Checkbox.stories.mdx
rename to packages/design-system/src/stories/form/Checkbox/Checkbox.mdx
index cf7166425e..f8095c7434 100644
--- a/packages/design-system/src/stories/form/Checkbox/Checkbox.stories.mdx
+++ b/packages/design-system/src/stories/form/Checkbox/Checkbox.mdx
@@ -1,7 +1,7 @@
import { Controls, Canvas, Meta, Story } from '@storybook/blocks';
import { FigmaImage, Use } from '@talend/storybook-docs';
-import * as Stories from './Input.Checkbox.stories';
-import { Status } from '../../../Status.block';
+import * as Stories from './Checkbox.stories';
+import { Status } from '../../Status.block';
diff --git a/packages/design-system/src/stories/form/Field/Input/Input.Checkbox.mdx b/packages/design-system/src/stories/form/Field/Input/Input.Checkbox.mdx
index b0ef012afd..912ffeb147 100644
--- a/packages/design-system/src/stories/form/Field/Input/Input.Checkbox.mdx
+++ b/packages/design-system/src/stories/form/Field/Input/Input.Checkbox.mdx
@@ -2,7 +2,6 @@ import { Controls, Canvas, Meta, Story } from '@storybook/blocks';
import { FigmaImage, Use } from '@talend/storybook-docs';
import * as Stories from './Input.Checkbox.stories';
import { Status } from '../../../Status.block';
-import { Form } from '../../../';
diff --git a/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.mdx b/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.mdx
deleted file mode 100644
index 2c3798794b..0000000000
--- a/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.mdx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Canvas, Meta, Story } from '@storybook/blocks';
-import { FigmaImage, Use } from '@talend/storybook-docs';
-import { Status } from '../../../Status.block';
-
-import * as Stories from './ToggleSwitch.stories';
-
-
-
-
-# ToggleSwitch
-
-ToggleSwitches are a quick way to view and switch between two states or on-off state instantly.
-
-## Zoning
-
-
-
-## Style
-
-
-
-## States
-
-
-
-### Inline
-
-
-
-### Long content
-
-
-
-## Content
-
-Labels for switches should give users a strong indication of what they are selecting. Start the label with a verb and say clearly what will happen when the switch is turned on.
-
-
-
-## Interactions
-
-- The label must always be clickable to enable or disable.
-
-### Controlled switch
-
-
-
-## Usage
-
-
-
-## Accessibility
-
-Press TABS to focus on a switch.
-
-Press SPACE to toggle the switch between selected and not selected.
diff --git a/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.stories.tsx b/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.stories.tsx
deleted file mode 100644
index ebdc17d970..0000000000
--- a/packages/design-system/src/stories/form/Field/Input/Input.ToggleSwitch.stories.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import { useState } from 'react';
-import { ButtonPrimary, Form, InlineMessageInformation, StackVertical } from '../../../../';
-import { useForm } from 'react-hook-form';
-
-export default {
- title: 'Form/Fields/ToggleSwitch',
- component: Form.ToggleSwitch,
-};
-
-export const ToggleSwitchStates = () => (
-
-
-
-
-
-
-
-
-);
-
-export const ToggleSwitchInline = () => (
- <>
-
-
-
- >
-);
-
-export const ToggleSwitchWithLongLabel = () => (
-
-
-
-);
-
-type Inputs = {
- 'option-a'?: boolean;
- 'option-b'?: boolean;
- 'option-c'?: boolean;
- 'option-d'?: boolean;
- 'option-e'?: boolean;
- 'option-f'?: boolean;
-};
-
-export const ToggleSwitchControlled = () => {
- const { register, watch } = useForm();
- const optionA = watch('option-a');
- return (
-
-
- {}}
- />
-
-
- {}} type="submit">
- Submit
-
-
-
- );
-};
-
-export const ToggleSwitchReactHooksForm = () => {
- const { register, handleSubmit } = useForm();
- const [formData, setFormData] = useState();
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
- {}} type="submit">
- Submit
-
-
-
- );
-};
diff --git a/packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.stories.mdx b/packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.mdx
similarity index 97%
rename from packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.stories.mdx
rename to packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.mdx
index cb3f465ee6..ede264711d 100644
--- a/packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.stories.mdx
+++ b/packages/design-system/src/stories/form/ToggleSwitch/ToggleSwitch.mdx
@@ -1,5 +1,5 @@
import { Canvas, Meta, Story } from '@storybook/addon-docs';
-import { FigmaImage, Use } from '~docs';
+import { FigmaImage, Use } from '@talend/storybook-docs';
import { Form, ToggleSwitch } from '@talend/design-system';
import * as Stories from './ToggleSwitch.stories';
diff --git a/packages/design-system/src/stories/messaging/Tooltip.mdx b/packages/design-system/src/stories/messaging/Tooltip.mdx
index 5f700e3a19..5103942c69 100644
--- a/packages/design-system/src/stories/messaging/Tooltip.mdx
+++ b/packages/design-system/src/stories/messaging/Tooltip.mdx
@@ -4,7 +4,7 @@ import { FigmaImage, Use } from '@talend/storybook-docs';
import { Tooltip } from '../../';
import { Status } from '../Status.block';
-import * as Stories from '@talend/design-system/src/components/Tooltip/Tooltip.stories';
+import * as Stories from './Tooltip.stories';
diff --git a/packages/stepper/src/stories/Stepper.stories.mdx b/packages/stepper/src/stories/Stepper.mdx
similarity index 100%
rename from packages/stepper/src/stories/Stepper.stories.mdx
rename to packages/stepper/src/stories/Stepper.mdx
diff --git a/packages/storybook-docs/src/components/Trial/Trials.stories.mdx b/packages/storybook-docs/src/components/Trial/Trials.mdx
similarity index 100%
rename from packages/storybook-docs/src/components/Trial/Trials.stories.mdx
rename to packages/storybook-docs/src/components/Trial/Trials.mdx