diff --git a/apps/builder/src/components/ImageUploadContent/GiphyPicker.tsx b/apps/builder/src/components/ImageUploadContent/GiphyPicker.tsx
index 08ccf74d1..46a224963 100644
--- a/apps/builder/src/components/ImageUploadContent/GiphyPicker.tsx
+++ b/apps/builder/src/components/ImageUploadContent/GiphyPicker.tsx
@@ -3,7 +3,7 @@ import { GiphyFetch } from "@giphy/js-fetch-api";
 import { Grid } from "@giphy/react-components";
 import { env } from "@typebot.io/env";
 import { useState } from "react";
-import { TextInput } from "../inputs";
+import { TextInput } from "../inputs/TextInput";
 import { GiphyLogo } from "../logos/GiphyLogo";
 
 type GiphySearchFormProps = {
diff --git a/apps/builder/src/components/ImageUploadContent/IconPicker.tsx b/apps/builder/src/components/ImageUploadContent/IconPicker.tsx
index 37584e36d..b6dcc685a 100644
--- a/apps/builder/src/components/ImageUploadContent/IconPicker.tsx
+++ b/apps/builder/src/components/ImageUploadContent/IconPicker.tsx
@@ -10,7 +10,7 @@ import { useTranslate } from "@tolgee/react";
 import { Button } from "@typebot.io/ui/components/Button";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { ColorPicker } from "../ColorPicker";
-import { TextInput } from "../inputs";
+import { TextInput } from "../inputs/TextInput";
 import { iconNames } from "./iconNames";
 
 const batchSize = 200;
diff --git a/apps/builder/src/components/ImageUploadContent/UnsplashPicker.tsx b/apps/builder/src/components/ImageUploadContent/UnsplashPicker.tsx
index a4b12dfd6..f77972b2e 100644
--- a/apps/builder/src/components/ImageUploadContent/UnsplashPicker.tsx
+++ b/apps/builder/src/components/ImageUploadContent/UnsplashPicker.tsx
@@ -18,7 +18,7 @@ import { isDefined } from "@typebot.io/lib/utils";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { createApi } from "unsplash-js";
 import type { Basic as UnsplashPhoto } from "unsplash-js/dist/methods/photos/types";
-import { TextInput } from "../inputs";
+import { TextInput } from "../inputs/TextInput";
 import { UnsplashLogo } from "../logos/UnsplashLogo";
 import { TextLink } from "../TextLink";
 
diff --git a/apps/builder/src/components/VideoUploadContent/PexelsPicker.tsx b/apps/builder/src/components/VideoUploadContent/PexelsPicker.tsx
index 4fa794e61..a048795d4 100644
--- a/apps/builder/src/components/VideoUploadContent/PexelsPicker.tsx
+++ b/apps/builder/src/components/VideoUploadContent/PexelsPicker.tsx
@@ -21,8 +21,8 @@ import {
   type Videos,
 } from "pexels";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { TextInput } from "../inputs";
 import { BasicSelect } from "../inputs/BasicSelect";
+import { TextInput } from "../inputs/TextInput";
 import { PexelsLogo } from "../logos/PexelsLogo";
 import { TextLink } from "../TextLink";
 
diff --git a/apps/builder/src/components/VideoUploadContent/VideoLinkEmbedContent.tsx b/apps/builder/src/components/VideoUploadContent/VideoLinkEmbedContent.tsx
index 03b5c5e15..4067c7acb 100644
--- a/apps/builder/src/components/VideoUploadContent/VideoLinkEmbedContent.tsx
+++ b/apps/builder/src/components/VideoUploadContent/VideoLinkEmbedContent.tsx
@@ -2,7 +2,7 @@ import { Stack, Text } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import { defaultVideoBubbleContent } from "@typebot.io/blocks-bubbles/video/constants";
 import type { VideoBubbleBlock } from "@typebot.io/blocks-bubbles/video/schema";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { SwitchWithLabel } from "../inputs/SwitchWithLabel";
 
 export const VideoLinkEmbedContent = ({
diff --git a/apps/builder/src/components/inputs/index.tsx b/apps/builder/src/components/inputs/index.tsx
deleted file mode 100644
index 40074196b..000000000
--- a/apps/builder/src/components/inputs/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export { NumberInput } from "./NumberInput";
-export { Textarea } from "./Textarea";
-export { TextInput } from "./TextInput";
diff --git a/apps/builder/src/features/billing/components/PreCheckoutDialog.tsx b/apps/builder/src/features/billing/components/PreCheckoutDialog.tsx
index 24aff1952..e86525b4c 100644
--- a/apps/builder/src/features/billing/components/PreCheckoutDialog.tsx
+++ b/apps/builder/src/features/billing/components/PreCheckoutDialog.tsx
@@ -8,8 +8,8 @@ import { Dialog } from "@typebot.io/ui/components/Dialog";
 import { useRouter } from "next/router";
 import type { FormEvent } from "react";
 import React, { useState } from "react";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import { trpc } from "@/lib/queryClient";
 
 export type PreCheckoutDialogProps = {
diff --git a/apps/builder/src/features/blocks/bubbles/audio/components/AudioBubbleForm.tsx b/apps/builder/src/features/blocks/bubbles/audio/components/AudioBubbleForm.tsx
index 1d5c32ebd..498ea3c9f 100644
--- a/apps/builder/src/features/blocks/bubbles/audio/components/AudioBubbleForm.tsx
+++ b/apps/builder/src/features/blocks/bubbles/audio/components/AudioBubbleForm.tsx
@@ -5,8 +5,8 @@ import type { AudioBubbleBlock } from "@typebot.io/blocks-bubbles/audio/schema";
 import { Button } from "@typebot.io/ui/components/Button";
 import { useState } from "react";
 import { UploadButton } from "@/components/ImageUploadContent/UploadButton";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { FilePathUploadProps } from "@/features/upload/api/generateUploadUrl";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/bubbles/embed/components/EmbedBubbleSettings.tsx b/apps/builder/src/features/blocks/bubbles/embed/components/EmbedBubbleSettings.tsx
index 802288b5d..547876ad4 100644
--- a/apps/builder/src/features/blocks/bubbles/embed/components/EmbedBubbleSettings.tsx
+++ b/apps/builder/src/features/blocks/bubbles/embed/components/EmbedBubbleSettings.tsx
@@ -4,7 +4,8 @@ import { defaultEmbedBubbleContent } from "@typebot.io/blocks-bubbles/embed/cons
 import type { EmbedBubbleBlock } from "@typebot.io/blocks-bubbles/embed/schema";
 import { sanitizeUrl } from "@typebot.io/lib/utils";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { NumberInput, TextInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/blocks/bubbles/image/components/ImageBubbleSettings.tsx b/apps/builder/src/features/blocks/bubbles/image/components/ImageBubbleSettings.tsx
index 4b3efde16..db4ff1001 100644
--- a/apps/builder/src/features/blocks/bubbles/image/components/ImageBubbleSettings.tsx
+++ b/apps/builder/src/features/blocks/bubbles/image/components/ImageBubbleSettings.tsx
@@ -5,8 +5,8 @@ import type { ImageBubbleBlock } from "@typebot.io/blocks-bubbles/image/schema";
 import { isDefined, isNotEmpty } from "@typebot.io/lib/utils";
 import { useState } from "react";
 import { ImageUploadContent } from "@/components/ImageUploadContent";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { FilePathUploadProps } from "@/features/upload/api/generateUploadUrl";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx
index 52a6a8506..bf0a9cdfb 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx
@@ -4,8 +4,8 @@ import { defaultChoiceInputOptions } from "@typebot.io/blocks-inputs/choice/cons
 import type { ChoiceInputBlock } from "@typebot.io/blocks-inputs/choice/schema";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemSettings.tsx b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemSettings.tsx
index ae4191635..bb0663f2e 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemSettings.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import type { ButtonItem } from "@typebot.io/blocks-inputs/choice/schema";
 import { LogicalOperator } from "@typebot.io/conditions/constants";
 import type { Condition } from "@typebot.io/conditions/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { ConditionForm } from "@/features/blocks/logic/condition/components/ConditionForm";
 
diff --git a/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx b/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
index e90cdbeb8..43d8c5d92 100644
--- a/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
@@ -3,8 +3,8 @@ import { useTranslate } from "@tolgee/react";
 import { defaultDateInputOptions } from "@typebot.io/blocks-inputs/date/constants";
 import type { DateInputBlock } from "@typebot.io/blocks-inputs/date/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
index b37cca988..0a9e7cfb1 100644
--- a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import { defaultEmailInputOptions } from "@typebot.io/blocks-inputs/email/constants";
 import type { EmailInputBlock } from "@typebot.io/blocks-inputs/email/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx b/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx
index 1c9f3bd05..3be9736e6 100644
--- a/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx
@@ -16,10 +16,10 @@ import type { FileInputBlock } from "@typebot.io/blocks-inputs/file/schema";
 import { Field } from "@typebot.io/ui/components/Field";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { TagsInput } from "@/components/TagsInput";
diff --git a/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx b/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
index 80bd54150..f8b57f358 100644
--- a/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
@@ -26,8 +26,9 @@ import {
 } from "@typebot.io/blocks-inputs/number/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
 import { useEffect } from "react";
-import { NumberInput, TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { currencies } from "../../payment/currencies";
 
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx b/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx
index d31fc4f05..0a00de803 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx
@@ -8,7 +8,7 @@ import { Dialog } from "@typebot.io/ui/components/Dialog";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type React from "react";
 import { useState } from "react";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { TextLink } from "@/components/TextLink";
 import { useUser } from "@/features/user/hooks/useUser";
 import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentAddressSettings.tsx b/apps/builder/src/features/blocks/inputs/payment/components/PaymentAddressSettings.tsx
index df591212c..c3c2d81b4 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/PaymentAddressSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/PaymentAddressSettings.tsx
@@ -8,7 +8,7 @@ import {
 } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import type { PaymentAddress } from "@typebot.io/blocks-inputs/payment/schema";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   address: PaymentAddress;
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx b/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
index 652a0c5c2..0c4d1a156 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
@@ -19,8 +19,8 @@ import type {
   PaymentInputBlock,
 } from "@typebot.io/blocks-inputs/payment/schema";
 import { useMemo } from "react";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
 import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
 import { currencies } from "../currencies";
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
index a7aa32b2e..1c63062c7 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
@@ -7,7 +7,7 @@ import { Button } from "@typebot.io/ui/components/Button";
 import { Dialog } from "@typebot.io/ui/components/Dialog";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { useEffect, useState } from "react";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { TextLink } from "@/components/TextLink";
 import { useUser } from "@/features/user/hooks/useUser";
 import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
diff --git a/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx b/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
index 069f6c5b2..6528ca9e2 100644
--- a/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import { defaultPhoneInputOptions } from "@typebot.io/blocks-inputs/phone/constants";
 import type { PhoneNumberInputBlock } from "@typebot.io/blocks-inputs/phone/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { CountryCodeSelect } from "./CountryCodeSelect";
 
diff --git a/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceItemSettings.tsx b/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceItemSettings.tsx
index 22d937097..4e0a8a31a 100644
--- a/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceItemSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceItemSettings.tsx
@@ -6,7 +6,8 @@ import type { Condition } from "@typebot.io/conditions/schemas";
 import { Button } from "@typebot.io/ui/components/Button";
 import { Popover } from "@typebot.io/ui/components/Popover";
 import { ImageUploadContent } from "@/components/ImageUploadContent";
-import { Textarea, TextInput } from "@/components/inputs";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { ConditionForm } from "@/features/blocks/logic/condition/components/ConditionForm";
 import { useOpenControls } from "@/hooks/useOpenControls";
diff --git a/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceSettings.tsx b/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceSettings.tsx
index 54248215b..eccb6d1a1 100644
--- a/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/pictureChoice/components/PictureChoiceSettings.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import { defaultPictureChoiceOptions } from "@typebot.io/blocks-inputs/pictureChoice/constants";
 import type { PictureChoiceBlock } from "@typebot.io/blocks-inputs/pictureChoice/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
index 8cade5571..8e409932a 100644
--- a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
@@ -3,9 +3,10 @@ import { useTranslate } from "@tolgee/react";
 import { defaultRatingInputOptions } from "@typebot.io/blocks-inputs/rating/constants";
 import type { RatingInputBlock } from "@typebot.io/blocks-inputs/rating/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { NumberInput, TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
index f26a9fafb..c6143d2f3 100644
--- a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
@@ -7,9 +7,9 @@ import { inputModeOptions } from "@typebot.io/blocks-inputs/text/schema";
 import { Field } from "@typebot.io/ui/components/Field";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx b/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
index 777bbafa0..f4486c3cc 100644
--- a/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import { defaultUrlInputOptions } from "@typebot.io/blocks-inputs/url/constants";
 import type { UrlInputBlock } from "@typebot.io/blocks-inputs/url/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
index ce2d1e287..979decbb6 100644
--- a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
@@ -11,8 +11,8 @@ import {
   defaultChatwootOptions,
 } from "@typebot.io/blocks-integrations/chatwoot/constants";
 import type { ChatwootBlock } from "@typebot.io/blocks-integrations/chatwoot/schema";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   options: ChatwootBlock["options"];
diff --git a/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsSettings.tsx b/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsSettings.tsx
index dc63a7054..590391b25 100644
--- a/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsSettings.tsx
@@ -8,7 +8,8 @@ import {
   Stack,
 } from "@chakra-ui/react";
 import type { GoogleAnalyticsBlock } from "@typebot.io/blocks-integrations/googleAnalytics/schema";
-import { NumberInput, TextInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   options?: GoogleAnalyticsBlock["options"];
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx
index aa1ab1002..dd1e48930 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx
@@ -1,7 +1,7 @@
 import { Stack } from "@chakra-ui/react";
 import type { Cell } from "@typebot.io/blocks-integrations/googleSheets/schema";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { TableListItemProps } from "@/components/TableList";
 
 export const CellWithValueStack = ({
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx
index 18ea350eb..2a63865ca 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx
@@ -1,8 +1,8 @@
 import { Stack } from "@chakra-ui/react";
 import type { RowsFilterComparison } from "@typebot.io/blocks-integrations/googleSheets/schema";
 import { ComparisonOperators } from "@typebot.io/conditions/constants";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { TableListItemProps } from "@/components/TableList";
 
 export const RowsFilterComparisonItem = ({
diff --git a/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestAdvancedConfigForm.tsx b/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestAdvancedConfigForm.tsx
index a93a1e1c3..124e29342 100644
--- a/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestAdvancedConfigForm.tsx
+++ b/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestAdvancedConfigForm.tsx
@@ -24,9 +24,9 @@ import type {
 } from "@typebot.io/blocks-integrations/httpRequest/schema";
 import { Button } from "@typebot.io/ui/components/Button";
 import { useMemo, useState } from "react";
-import { NumberInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
 import { TableList, type TableListItemProps } from "@/components/TableList";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
diff --git a/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestSettings.tsx b/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestSettings.tsx
index 97483237f..d96fdfd65 100644
--- a/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/httpRequest/components/HttpRequestSettings.tsx
@@ -4,7 +4,7 @@ import type {
   HttpRequestBlock,
 } from "@typebot.io/blocks-integrations/httpRequest/schema";
 import { useRef } from "react";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { HttpRequestAdvancedConfigForm } from "./HttpRequestAdvancedConfigForm";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/integrations/httpRequest/components/KeyValueInputs.tsx b/apps/builder/src/features/blocks/integrations/httpRequest/components/KeyValueInputs.tsx
index 787c482c7..7c7c6c47b 100644
--- a/apps/builder/src/features/blocks/integrations/httpRequest/components/KeyValueInputs.tsx
+++ b/apps/builder/src/features/blocks/integrations/httpRequest/components/KeyValueInputs.tsx
@@ -1,6 +1,6 @@
 import { Stack } from "@chakra-ui/react";
 import type { KeyValue } from "@typebot.io/blocks-integrations/httpRequest/schema";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { TableListItemProps } from "@/components/TableList";
 
 export const QueryParamsInputs = (props: TableListItemProps<KeyValue>) => (
diff --git a/apps/builder/src/features/blocks/integrations/httpRequest/components/VariableForTestInputs.tsx b/apps/builder/src/features/blocks/integrations/httpRequest/components/VariableForTestInputs.tsx
index 005b7bb36..e7721d2c3 100644
--- a/apps/builder/src/features/blocks/integrations/httpRequest/components/VariableForTestInputs.tsx
+++ b/apps/builder/src/features/blocks/integrations/httpRequest/components/VariableForTestInputs.tsx
@@ -1,7 +1,7 @@
 import { FormControl, FormLabel, Stack } from "@chakra-ui/react";
 import type { VariableForTest } from "@typebot.io/blocks-integrations/httpRequest/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import type { TableListItemProps } from "@/components/TableList";
 
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx b/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
index e119cf735..b44d86cd2 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
@@ -18,8 +18,8 @@ import type {
   CreateSpeechOpenAIOptions,
   OpenAIBlock,
 } from "@typebot.io/blocks-integrations/openai/schema";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
 import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
 import { OpenAICreateSpeechSettings } from "./audio/OpenAICreateSpeechSettings";
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/audio/OpenAICreateSpeechSettings.tsx b/apps/builder/src/features/blocks/integrations/openai/components/audio/OpenAICreateSpeechSettings.tsx
index d86f7b079..43b3ee73b 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/audio/OpenAICreateSpeechSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/audio/OpenAICreateSpeechSettings.tsx
@@ -2,8 +2,8 @@ import { FormControl, FormLabel, Stack, Text } from "@chakra-ui/react";
 import { openAIVoices } from "@typebot.io/blocks-integrations/openai/constants";
 import type { CreateSpeechOpenAIOptions } from "@typebot.io/blocks-integrations/openai/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { Textarea } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { Textarea } from "@/components/inputs/Textarea";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { TextLink } from "@/components/TextLink";
 import { ModelsDropdown } from "../ModelsDropdown";
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/ChatCompletionMessageItem.tsx b/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/ChatCompletionMessageItem.tsx
index b853e1532..80c5dfe02 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/ChatCompletionMessageItem.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/ChatCompletionMessageItem.tsx
@@ -6,8 +6,8 @@ import {
 } from "@typebot.io/blocks-integrations/openai/constants";
 import type { ChatCompletionOpenAIOptions } from "@typebot.io/blocks-integrations/openai/schema";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { Textarea } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { Textarea } from "@/components/inputs/Textarea";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import type { TableListItemProps } from "@/components/TableList";
 
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/OpenAIChatCompletionSettings.tsx b/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/OpenAIChatCompletionSettings.tsx
index 6489f08a4..c8464696f 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/OpenAIChatCompletionSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/createChatCompletion/OpenAIChatCompletionSettings.tsx
@@ -8,7 +8,7 @@ import {
   Text,
 } from "@chakra-ui/react";
 import type { ChatCompletionOpenAIOptions } from "@typebot.io/blocks-integrations/openai/schema";
-import { NumberInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { TableList } from "@/components/TableList";
 import { TextLink } from "@/components/TextLink";
 import { ModelsDropdown } from "../ModelsDropdown";
diff --git a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
index 3d0d00074..8e57ccaef 100644
--- a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
@@ -4,7 +4,7 @@ import type { PabblyConnectBlock } from "@typebot.io/blocks-integrations/pabblyC
 import { useRef } from "react";
 import { ButtonLink } from "@/components/ButtonLink";
 import { ExternalLinkIcon } from "@/components/icons";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { HttpRequestAdvancedConfigForm } from "../../httpRequest/components/HttpRequestAdvancedConfigForm";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/integrations/pixel/components/PixelSettings.tsx b/apps/builder/src/features/blocks/integrations/pixel/components/PixelSettings.tsx
index c752c384f..55a5a195c 100644
--- a/apps/builder/src/features/blocks/integrations/pixel/components/PixelSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/pixel/components/PixelSettings.tsx
@@ -6,10 +6,10 @@ import {
 } from "@typebot.io/blocks-integrations/pixel/constants";
 import type { PixelBlock } from "@typebot.io/blocks-integrations/pixel/schema";
 import { isDefined, isEmpty } from "@typebot.io/lib/utils";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { TableList } from "@/components/TableList";
 import { TextLink } from "@/components/TextLink";
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
index 3ec8d541b..fc4b1d9a9 100644
--- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
@@ -19,9 +19,10 @@ import { isNotEmpty } from "@typebot.io/lib/utils";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import type { Workspace } from "@typebot.io/workspaces/schemas";
-import { Textarea, TextInput } from "@/components/inputs";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { isFreePlan } from "@/features/billing/helpers/isFreePlan";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
diff --git a/apps/builder/src/features/blocks/logic/abTest/components/AbTestSettings.tsx b/apps/builder/src/features/blocks/logic/abTest/components/AbTestSettings.tsx
index 74e73717e..641ff31ae 100644
--- a/apps/builder/src/features/blocks/logic/abTest/components/AbTestSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/abTest/components/AbTestSettings.tsx
@@ -2,7 +2,7 @@ import { Stack } from "@chakra-ui/react";
 import { defaultAbTestOptions } from "@typebot.io/blocks-logic/abTest/constants";
 import type { AbTestBlock } from "@typebot.io/blocks-logic/abTest/schema";
 import { isDefined } from "@typebot.io/lib/utils";
-import { NumberInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
 
 type Props = {
   options: AbTestBlock["options"];
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx b/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
index 17bce36a0..5ea156468 100644
--- a/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
+++ b/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
@@ -3,8 +3,8 @@ import { useTranslate } from "@tolgee/react";
 import { ComparisonOperators } from "@typebot.io/conditions/constants";
 import type { Comparison } from "@typebot.io/conditions/schemas";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import type { TableListItemProps } from "@/components/TableList";
 
diff --git a/apps/builder/src/features/blocks/logic/redirect/components/RedirectSettings.tsx b/apps/builder/src/features/blocks/logic/redirect/components/RedirectSettings.tsx
index 0be75b5f1..bda135fa8 100644
--- a/apps/builder/src/features/blocks/logic/redirect/components/RedirectSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/redirect/components/RedirectSettings.tsx
@@ -1,8 +1,8 @@
 import { Stack } from "@chakra-ui/react";
 import { defaultRedirectOptions } from "@typebot.io/blocks-logic/redirect/constants";
 import type { RedirectBlock } from "@typebot.io/blocks-logic/redirect/schema";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   options: RedirectBlock["options"];
diff --git a/apps/builder/src/features/blocks/logic/script/components/ScriptSettings.tsx b/apps/builder/src/features/blocks/logic/script/components/ScriptSettings.tsx
index ed842490a..c21f482d0 100644
--- a/apps/builder/src/features/blocks/logic/script/components/ScriptSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/script/components/ScriptSettings.tsx
@@ -1,9 +1,9 @@
 import { Stack } from "@chakra-ui/react";
 import { defaultScriptOptions } from "@typebot.io/blocks-logic/script/constants";
 import type { ScriptBlock } from "@typebot.io/blocks-logic/script/schema";
-import { TextInput } from "@/components/inputs";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   options: ScriptBlock["options"];
diff --git a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
index badb46084..e9ed72140 100644
--- a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableSettings.tsx
@@ -18,11 +18,12 @@ import type { SetVariableBlock } from "@typebot.io/blocks-logic/setVariable/sche
 import { timeZones } from "@typebot.io/lib/timeZones";
 import { isDefined } from "@typebot.io/lib/utils";
 import type { Variable } from "@typebot.io/variables/schemas";
-import { Textarea, TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { RadioButtons } from "@/components/inputs/RadioButtons";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { WhatsAppLogo } from "@/components/logos/WhatsAppLogo";
 import { useTypebot } from "@/features/editor/providers/TypebotProvider";
diff --git a/apps/builder/src/features/blocks/logic/wait/components/WaitSettings.tsx b/apps/builder/src/features/blocks/logic/wait/components/WaitSettings.tsx
index 7a03b3714..aa8f03a3b 100644
--- a/apps/builder/src/features/blocks/logic/wait/components/WaitSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/wait/components/WaitSettings.tsx
@@ -8,8 +8,8 @@ import {
 } from "@chakra-ui/react";
 import { defaultWaitOptions } from "@typebot.io/blocks-logic/wait/constants";
 import type { WaitBlock } from "@typebot.io/blocks-logic/wait/schema";
-import { TextInput } from "@/components/inputs";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   options: WaitBlock["options"];
diff --git a/apps/builder/src/features/events/components/CommandEventSettings.tsx b/apps/builder/src/features/events/components/CommandEventSettings.tsx
index 5dbcac098..b9b214d81 100644
--- a/apps/builder/src/features/events/components/CommandEventSettings.tsx
+++ b/apps/builder/src/features/events/components/CommandEventSettings.tsx
@@ -1,7 +1,7 @@
 import { Stack } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import type { CommandEvent } from "@typebot.io/events/schemas";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 
 export const CommandEventSettings = ({
   options,
diff --git a/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx b/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
index a56333d32..ea982a250 100644
--- a/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
+++ b/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
@@ -7,11 +7,13 @@ import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { ZodLayoutMetadata } from "@typebot.io/zod";
 import Markdown, { type Components } from "react-markdown";
 import type { ZodTypeAny, z } from "zod";
-import { NumberInput, Textarea, TextInput } from "@/components/inputs";
 import { BasicAutocompleteInputWithVariableButton } from "@/components/inputs/BasicAutocompleteInput";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
 import { PrimitiveList } from "@/components/PrimitiveList";
 import { TableList } from "@/components/TableList";
diff --git a/apps/builder/src/features/preview/components/WhatsAppPreviewInstructions.tsx b/apps/builder/src/features/preview/components/WhatsAppPreviewInstructions.tsx
index 317c62db0..5edacdce3 100644
--- a/apps/builder/src/features/preview/components/WhatsAppPreviewInstructions.tsx
+++ b/apps/builder/src/features/preview/components/WhatsAppPreviewInstructions.tsx
@@ -13,7 +13,7 @@ import { Button } from "@typebot.io/ui/components/Button";
 import { type FormEvent, useState } from "react";
 import { ButtonLink } from "@/components/ButtonLink";
 import { BuoyIcon, ExternalLinkIcon } from "@/components/icons";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { useEditor } from "@/features/editor/providers/EditorProvider";
 import { useTypebot } from "@/features/editor/providers/TypebotProvider";
 import { trpc } from "@/lib/queryClient";
diff --git a/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppComparisonItem.tsx b/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppComparisonItem.tsx
index 4f72269d0..d0d78489f 100644
--- a/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppComparisonItem.tsx
+++ b/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppComparisonItem.tsx
@@ -1,8 +1,8 @@
 import { HStack, Text } from "@chakra-ui/react";
 import { ComparisonOperators } from "@typebot.io/conditions/constants";
 import type { WhatsAppComparison } from "@typebot.io/whatsapp/schemas";
-import { TextInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { TextInput } from "@/components/inputs/TextInput";
 import type { TableListItemProps } from "@/components/TableList";
 
 export const WhatsAppComparisonItem = ({
diff --git a/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppDeployDialog.tsx b/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppDeployDialog.tsx
index c3dab55ed..1bb52a8c6 100644
--- a/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppDeployDialog.tsx
+++ b/apps/builder/src/features/publish/components/deploy/dialogs/whatsApp/WhatsAppDeployDialog.tsx
@@ -19,8 +19,8 @@ import { isDefined } from "@typebot.io/lib/utils";
 import { defaultSessionExpiryTimeout } from "@typebot.io/settings/constants";
 import { Dialog } from "@typebot.io/ui/components/Dialog";
 import { AlertInfo } from "@/components/AlertInfo";
-import { NumberInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { TableList } from "@/components/TableList";
diff --git a/apps/builder/src/features/publish/components/deploy/settings/BubbleSettings/PreviewMessageSettings.tsx b/apps/builder/src/features/publish/components/deploy/settings/BubbleSettings/PreviewMessageSettings.tsx
index 335872234..89802b411 100644
--- a/apps/builder/src/features/publish/components/deploy/settings/BubbleSettings/PreviewMessageSettings.tsx
+++ b/apps/builder/src/features/publish/components/deploy/settings/BubbleSettings/PreviewMessageSettings.tsx
@@ -9,7 +9,7 @@ import {
 import type { PreviewMessageParams } from "@typebot.io/js";
 import { isDefined } from "@typebot.io/lib/utils";
 import { useState } from "react";
-import { NumberInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
 
 type Props = {
   defaultAvatar: string;
diff --git a/apps/builder/src/features/publish/components/deploy/settings/PopupSettings.tsx b/apps/builder/src/features/publish/components/deploy/settings/PopupSettings.tsx
index 7a5ea40e0..7254b44ca 100644
--- a/apps/builder/src/features/publish/components/deploy/settings/PopupSettings.tsx
+++ b/apps/builder/src/features/publish/components/deploy/settings/PopupSettings.tsx
@@ -9,7 +9,7 @@ import {
 import type { PopupProps } from "@typebot.io/js";
 import { isDefined } from "@typebot.io/lib/utils";
 import { useEffect, useState } from "react";
-import { NumberInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
 
 type Props = {
   onUpdateSettings: (windowSettings: Pick<PopupProps, "autoShowDelay">) => void;
diff --git a/apps/builder/src/features/settings/components/MetadataForm.tsx b/apps/builder/src/features/settings/components/MetadataForm.tsx
index da745a99c..b8f6b6ddd 100644
--- a/apps/builder/src/features/settings/components/MetadataForm.tsx
+++ b/apps/builder/src/features/settings/components/MetadataForm.tsx
@@ -6,9 +6,10 @@ import type { Settings } from "@typebot.io/settings/schemas";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { Popover } from "@typebot.io/ui/components/Popover";
 import { ImageUploadContent } from "@/components/ImageUploadContent";
-import { Textarea, TextInput } from "@/components/inputs";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 import { useOpenControls } from "@/hooks/useOpenControls";
 
 type Props = {
diff --git a/apps/builder/src/features/settings/components/SystemMessagesForm.tsx b/apps/builder/src/features/settings/components/SystemMessagesForm.tsx
index b622f4e4b..56efc6b45 100644
--- a/apps/builder/src/features/settings/components/SystemMessagesForm.tsx
+++ b/apps/builder/src/features/settings/components/SystemMessagesForm.tsx
@@ -2,7 +2,8 @@ import { Stack } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import { defaultSystemMessages } from "@typebot.io/settings/constants";
 import type { SystemMessages } from "@typebot.io/settings/schemas";
-import { Textarea, TextInput } from "@/components/inputs";
+import { Textarea } from "@/components/inputs/Textarea";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   systemMessages?: SystemMessages;
diff --git a/apps/builder/src/features/settings/components/TypingEmulationForm.tsx b/apps/builder/src/features/settings/components/TypingEmulationForm.tsx
index c3f647629..098c51734 100644
--- a/apps/builder/src/features/settings/components/TypingEmulationForm.tsx
+++ b/apps/builder/src/features/settings/components/TypingEmulationForm.tsx
@@ -6,7 +6,7 @@ import {
   maxTypingEmulationMaxDelay,
 } from "@typebot.io/settings/constants";
 import type { Settings } from "@typebot.io/settings/schemas";
-import { NumberInput } from "@/components/inputs";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
diff --git a/apps/builder/src/features/theme/components/SaveThemeDialog.tsx b/apps/builder/src/features/theme/components/SaveThemeDialog.tsx
index 5660c3eac..0ccbb066e 100644
--- a/apps/builder/src/features/theme/components/SaveThemeDialog.tsx
+++ b/apps/builder/src/features/theme/components/SaveThemeDialog.tsx
@@ -5,7 +5,7 @@ import type { ThemeTemplate } from "@typebot.io/theme/schemas";
 import { Button } from "@typebot.io/ui/components/Button";
 import { Dialog } from "@typebot.io/ui/components/Dialog";
 import { type FormEvent, useRef, useState } from "react";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { queryClient, trpc } from "@/lib/queryClient";
 
 type Props = {
diff --git a/apps/builder/src/features/theme/components/chat/ChatContainerForm.tsx b/apps/builder/src/features/theme/components/chat/ChatContainerForm.tsx
index 602cf79b6..f9e3e8f86 100644
--- a/apps/builder/src/features/theme/components/chat/ChatContainerForm.tsx
+++ b/apps/builder/src/features/theme/components/chat/ChatContainerForm.tsx
@@ -10,8 +10,8 @@ import {
 import { isChatContainerLight } from "@typebot.io/theme/helpers/isChatContainerLight";
 import type { ChatTheme, GeneralTheme } from "@typebot.io/theme/schemas";
 import { colors } from "@typebot.io/ui/colors";
-import { NumberInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { ContainerThemeForm } from "./ContainerThemeForm";
 
 type Props = {
diff --git a/apps/builder/src/features/theme/components/chat/ContainerThemeForm.tsx b/apps/builder/src/features/theme/components/chat/ContainerThemeForm.tsx
index 835824bee..2917f9457 100644
--- a/apps/builder/src/features/theme/components/chat/ContainerThemeForm.tsx
+++ b/apps/builder/src/features/theme/components/chat/ContainerThemeForm.tsx
@@ -20,8 +20,8 @@ import type {
   ContainerTheme,
   InputTheme,
 } from "@typebot.io/theme/schemas";
-import { NumberInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { ColorPicker } from "../../../../components/ColorPicker";
 
 type Props<T extends ((placeholder: string) => void) | undefined> = {
diff --git a/apps/builder/src/features/theme/components/general/CustomFontForm.tsx b/apps/builder/src/features/theme/components/general/CustomFontForm.tsx
index 084e63cf8..8c65a5a68 100644
--- a/apps/builder/src/features/theme/components/general/CustomFontForm.tsx
+++ b/apps/builder/src/features/theme/components/general/CustomFontForm.tsx
@@ -1,7 +1,7 @@
 import { Stack } from "@chakra-ui/react";
 import type { CustomFont } from "@typebot.io/theme/schemas";
-import { TextInput } from "@/components/inputs";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
+import { TextInput } from "@/components/inputs/TextInput";
 
 type Props = {
   font: CustomFont;
diff --git a/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx b/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
index 8bccf23d7..4091fefbd 100644
--- a/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
+++ b/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
@@ -14,8 +14,8 @@ import type { TypebotV6 } from "@typebot.io/typebot/schemas/typebot";
 import { Field } from "@typebot.io/ui/components/Field";
 import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { ColorPicker } from "@/components/ColorPicker";
-import { NumberInput } from "@/components/inputs";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { NumberInput } from "@/components/inputs/NumberInput";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
 type Props = {
diff --git a/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx b/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx
index 040263bd8..b495c4d44 100644
--- a/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx
+++ b/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx
@@ -7,9 +7,9 @@ import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { defaultGroupTitleGenPrompt } from "@typebot.io/user/constants";
 import type { GroupTitlesAutoGeneration } from "@typebot.io/user/schemas";
 import { useState } from "react";
-import { Textarea } from "@/components/inputs";
 import { BasicAutocompleteInput } from "@/components/inputs/BasicAutocompleteInput";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
+import { Textarea } from "@/components/inputs/Textarea";
 import { CredentialsCreateDialog } from "@/features/credentials/components/CredentialsCreateDialog";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
 import { BlockIcon } from "@/features/editor/components/BlockIcon";
diff --git a/apps/builder/src/features/workspace/components/WorkspaceSettingsForm.tsx b/apps/builder/src/features/workspace/components/WorkspaceSettingsForm.tsx
index fc8e6dc06..8f3520291 100644
--- a/apps/builder/src/features/workspace/components/WorkspaceSettingsForm.tsx
+++ b/apps/builder/src/features/workspace/components/WorkspaceSettingsForm.tsx
@@ -16,7 +16,7 @@ import { ConfirmDialog } from "@/components/ConfirmDialog";
 import { CopyButton } from "@/components/CopyButton";
 import { EditableEmojiOrImageIcon } from "@/components/EditableEmojiOrImageIcon";
 import { HardDriveIcon } from "@/components/icons";
-import { TextInput } from "@/components/inputs";
+import { TextInput } from "@/components/inputs/TextInput";
 import { useWorkspace } from "../WorkspaceProvider";
 
 export const WorkspaceSettingsForm = ({ onClose }: { onClose: () => void }) => {