diff --git a/apps/builder/src/components/inputs/CodeEditor.tsx b/apps/builder/src/components/inputs/CodeEditor.tsx
index 100b22aff..ece01021b 100644
--- a/apps/builder/src/components/inputs/CodeEditor.tsx
+++ b/apps/builder/src/components/inputs/CodeEditor.tsx
@@ -11,6 +11,7 @@ import {
 } from "@chakra-ui/react";
 import { env } from "@typebot.io/env";
 import { isDefined } from "@typebot.io/lib/utils";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import {
   type LanguageName,
@@ -24,7 +25,6 @@ import { useEffect, useRef, useState } from "react";
 import { useDebouncedCallback } from "use-debounce";
 import { VariablesButton } from "@/features/variables/components/VariablesButton";
 import { CopyButton } from "../CopyButton";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 type Props = {
   label?: string;
diff --git a/apps/builder/src/components/inputs/NumberInput.tsx b/apps/builder/src/components/inputs/NumberInput.tsx
index 01f2daa39..9ba77ae8e 100644
--- a/apps/builder/src/components/inputs/NumberInput.tsx
+++ b/apps/builder/src/components/inputs/NumberInput.tsx
@@ -13,12 +13,12 @@ import {
   Text,
 } from "@chakra-ui/react";
 import { env } from "@typebot.io/env";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable, VariableString } from "@typebot.io/variables/schemas";
 import type { ReactNode } from "react";
 import { useEffect, useState } from "react";
 import { useDebouncedCallback } from "use-debounce";
 import { VariablesButton } from "@/features/variables/components/VariablesButton";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 type Value<HasVariable> = HasVariable extends true | undefined
   ? number | VariableString
diff --git a/apps/builder/src/components/inputs/SwitchWithLabel.tsx b/apps/builder/src/components/inputs/SwitchWithLabel.tsx
index e34b7f142..1318be7db 100644
--- a/apps/builder/src/components/inputs/SwitchWithLabel.tsx
+++ b/apps/builder/src/components/inputs/SwitchWithLabel.tsx
@@ -7,8 +7,8 @@ import {
   type SwitchProps,
 } from "@chakra-ui/react";
 import { isDefined } from "@typebot.io/lib/utils";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { useEffect, useState } from "react";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 export type SwitchWithLabelProps = {
   label: string;
diff --git a/apps/builder/src/components/inputs/TextInput.tsx b/apps/builder/src/components/inputs/TextInput.tsx
index 76ab5c951..9f5fbefaf 100644
--- a/apps/builder/src/components/inputs/TextInput.tsx
+++ b/apps/builder/src/components/inputs/TextInput.tsx
@@ -8,6 +8,7 @@ import {
   Stack,
 } from "@chakra-ui/react";
 import { env } from "@typebot.io/env";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import type React from "react";
 import type { ReactNode } from "react";
@@ -22,7 +23,6 @@ import { useDebouncedCallback } from "use-debounce";
 import { VariablesButton } from "@/features/variables/components/VariablesButton";
 import { injectVariableInText } from "@/features/variables/helpers/injectVariableInTextInput";
 import { focusInput } from "@/helpers/focusInput";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 export type TextInputProps = {
   forceDebounce?: boolean;
diff --git a/apps/builder/src/components/inputs/Textarea.tsx b/apps/builder/src/components/inputs/Textarea.tsx
index 6be6cbcd2..5103efbbd 100644
--- a/apps/builder/src/components/inputs/Textarea.tsx
+++ b/apps/builder/src/components/inputs/Textarea.tsx
@@ -8,6 +8,7 @@ import {
   type TextareaProps,
 } from "@chakra-ui/react";
 import { env } from "@typebot.io/env";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import type React from "react";
 import type { ReactNode } from "react";
@@ -16,7 +17,6 @@ import { useDebouncedCallback } from "use-debounce";
 import { VariablesButton } from "@/features/variables/components/VariablesButton";
 import { injectVariableInText } from "@/features/variables/helpers/injectVariableInTextInput";
 import { focusInput } from "@/helpers/focusInput";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 type Props = {
   id?: string;
diff --git a/apps/builder/src/components/inputs/VariableSearchInput.tsx b/apps/builder/src/components/inputs/VariableSearchInput.tsx
index baed08827..cbb249901 100644
--- a/apps/builder/src/components/inputs/VariableSearchInput.tsx
+++ b/apps/builder/src/components/inputs/VariableSearchInput.tsx
@@ -15,6 +15,7 @@ import { createId } from "@paralleldrive/cuid2";
 import { useTranslate } from "@tolgee/react";
 import { byId, isDefined, isNotDefined } from "@typebot.io/lib/utils";
 import { Button } from "@typebot.io/ui/components/Button";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { Popover } from "@typebot.io/ui/components/Popover";
 import { EditIcon } from "@typebot.io/ui/icons/EditIcon";
 import { TrashIcon } from "@typebot.io/ui/icons/TrashIcon";
@@ -26,7 +27,6 @@ import { useRef, useState } from "react";
 import { PlusIcon } from "@/components/icons";
 import { useTypebot } from "@/features/editor/providers/TypebotProvider";
 import { useOpenControls } from "@/hooks/useOpenControls";
-import { MoreInfoTooltip } from "../MoreInfoTooltip";
 
 type Props = {
   initialVariableId: string | undefined;
diff --git a/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx b/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
index 756dd8914..060885b26 100644
--- a/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
+++ b/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
@@ -14,8 +14,8 @@ import { prices } from "@typebot.io/billing/constants";
 import { formatPrice } from "@typebot.io/billing/helpers/formatPrice";
 import { Plan } from "@typebot.io/prisma/enum";
 import { Button } from "@typebot.io/ui/components/Button";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { Tooltip } from "@typebot.io/ui/components/Tooltip";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { ChatsProTiersDialog } from "./ChatsProTiersDialog";
 import { FeaturesList } from "./FeaturesList";
 
diff --git a/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx b/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
index e9a0b986c..767bd35a1 100644
--- a/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
+++ b/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
@@ -11,7 +11,7 @@ import { prices } from "@typebot.io/billing/constants";
 import { formatPrice } from "@typebot.io/billing/helpers/formatPrice";
 import { Plan } from "@typebot.io/prisma/enum";
 import { Button } from "@typebot.io/ui/components/Button";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { FeaturesList } from "./FeaturesList";
 
 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 1b7fbee40..52a6a8506 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockSettings.tsx
@@ -2,11 +2,11 @@ import { FormControl, FormLabel, Stack } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import { defaultChoiceInputOptions } from "@typebot.io/blocks-inputs/choice/constants";
 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 { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
 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 aaf3958e3..1c9f3bd05 100644
--- a/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputSettings.tsx
@@ -14,13 +14,13 @@ import {
 } from "@typebot.io/blocks-inputs/file/constants";
 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 { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { TagsInput } from "@/components/TagsInput";
 
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 7e318b0e9..d31fc4f05 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/CreateStripeCredentialsDialog.tsx
@@ -5,10 +5,10 @@ import type { StripeCredentials } from "@typebot.io/credentials/schemas";
 import { isNotEmpty } from "@typebot.io/lib/utils";
 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 type React from "react";
 import { useState } from "react";
 import { TextInput } from "@/components/inputs";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 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/UpdateStripeCredentialsDialogBody.tsx b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
index 901020f51..a7aa32b2e 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsDialogBody.tsx
@@ -5,9 +5,9 @@ import type { StripeCredentials } from "@typebot.io/credentials/schemas";
 import { isNotEmpty } from "@typebot.io/lib/utils";
 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 { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 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/textInput/components/TextInputSettings.tsx b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
index 817ca82bb..f26a9fafb 100644
--- a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
@@ -5,12 +5,12 @@ import { defaultTextInputOptions } from "@typebot.io/blocks-inputs/text/constant
 import type { TextInputBlock } from "@typebot.io/blocks-inputs/text/schema";
 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 { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
index 7c5e0a189..261a69e92 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
@@ -1,6 +1,6 @@
 import { HStack, Input } from "@chakra-ui/react";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import type { Sheet } from "../types";
 
 type Props = {
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 fbab532c0..3ec8d541b 100644
--- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
@@ -16,13 +16,13 @@ import { defaultSendEmailOptions } from "@typebot.io/blocks-integrations/sendEma
 import type { SendEmailBlock } from "@typebot.io/blocks-integrations/sendEmail/schema";
 import { env } from "@typebot.io/env";
 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 { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { isFreePlan } from "@/features/billing/helpers/isFreePlan";
 import { CredentialsDropdown } from "@/features/credentials/components/CredentialsDropdown";
 import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
diff --git a/apps/builder/src/features/customDomains/components/DomainStatusIcon.tsx b/apps/builder/src/features/customDomains/components/DomainStatusIcon.tsx
index f0f7fbd4a..2666310dc 100644
--- a/apps/builder/src/features/customDomains/components/DomainStatusIcon.tsx
+++ b/apps/builder/src/features/customDomains/components/DomainStatusIcon.tsx
@@ -1,7 +1,7 @@
 import { useDisclosure } from "@chakra-ui/react";
 import { useQuery } from "@tanstack/react-query";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { XCircleIcon } from "@/components/icons";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { trpc } from "@/lib/queryClient";
 import { CustomDomainConfigDialog } from "./CustomDomainConfigDialog";
 
diff --git a/apps/builder/src/features/events/components/InvalidReplyEventSettings.tsx b/apps/builder/src/features/events/components/InvalidReplyEventSettings.tsx
index 2420d9b74..7acfbbb69 100644
--- a/apps/builder/src/features/events/components/InvalidReplyEventSettings.tsx
+++ b/apps/builder/src/features/events/components/InvalidReplyEventSettings.tsx
@@ -9,9 +9,9 @@ import {
 } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import type { InvalidReplyEvent } from "@typebot.io/events/schemas";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 
 export const InvalidReplyEventSettings = ({
   options,
diff --git a/apps/builder/src/features/events/components/ReplyEventSettings.tsx b/apps/builder/src/features/events/components/ReplyEventSettings.tsx
index c528ba3ff..4d70695ce 100644
--- a/apps/builder/src/features/events/components/ReplyEventSettings.tsx
+++ b/apps/builder/src/features/events/components/ReplyEventSettings.tsx
@@ -9,9 +9,9 @@ import {
 } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
 import type { ReplyEvent } from "@typebot.io/events/schemas";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { Variable } from "@typebot.io/variables/schemas";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 
 export const ReplyEventSettings = ({
   options,
diff --git a/apps/builder/src/features/forge/components/ForgeAutocompleteInput.tsx b/apps/builder/src/features/forge/components/ForgeAutocompleteInput.tsx
index 44b4db439..47c017d7e 100644
--- a/apps/builder/src/features/forge/components/ForgeAutocompleteInput.tsx
+++ b/apps/builder/src/features/forge/components/ForgeAutocompleteInput.tsx
@@ -1,5 +1,6 @@
 import type { ForgedBlockDefinition } from "@typebot.io/forge-repository/definitions";
 import type { ForgedBlock } from "@typebot.io/forge-repository/schemas";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { cx } from "@typebot.io/ui/lib/cva";
 import { type ReactNode, useEffect, useRef } from "react";
 import {
@@ -9,7 +10,6 @@ import {
 } from "@/components/collections";
 import { Combobox } from "@/components/combobox";
 import { Field } from "@/components/field";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { Portal } from "@/components/Portal";
 import { VariablesButton } from "@/features/variables/components/VariablesButton";
 import { useDebounce } from "@/hooks/useDebounce";
diff --git a/apps/builder/src/features/forge/components/ForgeSelectInput.tsx b/apps/builder/src/features/forge/components/ForgeSelectInput.tsx
index 89b72a998..d05cf6833 100644
--- a/apps/builder/src/features/forge/components/ForgeSelectInput.tsx
+++ b/apps/builder/src/features/forge/components/ForgeSelectInput.tsx
@@ -7,9 +7,9 @@ import {
 } from "@chakra-ui/react";
 import type { ForgedBlockDefinition } from "@typebot.io/forge-repository/definitions";
 import type { ForgedBlock } from "@typebot.io/forge-repository/schemas";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { ReactNode } from "react";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { useSelectItemsQuery } from "../hooks/useSelectItemsQuery";
 
 type Props = {
diff --git a/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx b/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
index c9985b8db..97d5fe51d 100644
--- a/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
+++ b/apps/builder/src/features/forge/components/zodLayouts/ZodFieldLayout.tsx
@@ -3,6 +3,7 @@ import { evaluateIsHidden } from "@typebot.io/forge/helpers/evaluateIsHidden";
 import type { ForgedBlockDefinition } from "@typebot.io/forge-repository/definitions";
 import type { ForgedBlock } from "@typebot.io/forge-repository/schemas";
 import { Field } from "@typebot.io/ui/components/Field";
+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";
@@ -11,7 +12,6 @@ import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { CodeEditor } from "@/components/inputs/CodeEditor";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
 import { VariableSearchInput } from "@/components/inputs/VariableSearchInput";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { PrimitiveList } from "@/components/PrimitiveList";
 import { TableList } from "@/components/TableList";
 import { TagsInput } from "@/components/TagsInput";
diff --git a/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx b/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
index f68d934cc..8198238d3 100644
--- a/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
+++ b/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
@@ -19,9 +19,9 @@ import {
   rememberUserStorages,
 } from "@typebot.io/settings/constants";
 import type { Settings, SystemMessages } from "@typebot.io/settings/schemas";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
 import { SwitchWithLabel } from "@/components/inputs/SwitchWithLabel";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { SystemMessagesForm } from "./SystemMessagesForm";
 
diff --git a/apps/builder/src/features/settings/components/MetadataForm.tsx b/apps/builder/src/features/settings/components/MetadataForm.tsx
index f2c4f438d..da745a99c 100644
--- a/apps/builder/src/features/settings/components/MetadataForm.tsx
+++ b/apps/builder/src/features/settings/components/MetadataForm.tsx
@@ -3,12 +3,12 @@ import { useTranslate } from "@tolgee/react";
 import { env } from "@typebot.io/env";
 import { defaultSettings } from "@typebot.io/settings/constants";
 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 { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { useOpenControls } from "@/hooks/useOpenControls";
 
 type Props = {
diff --git a/apps/builder/src/features/settings/components/SecurityForm.tsx b/apps/builder/src/features/settings/components/SecurityForm.tsx
index b55d374bf..7023456a5 100644
--- a/apps/builder/src/features/settings/components/SecurityForm.tsx
+++ b/apps/builder/src/features/settings/components/SecurityForm.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@tolgee/react";
 import { env } from "@typebot.io/env";
 import { isDefined } from "@typebot.io/lib/utils";
 import type { Settings } from "@typebot.io/settings/schemas";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { TagsInput } from "@/components/TagsInput";
 
 type Props = {
diff --git a/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx b/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
index 07f93f490..8bccf23d7 100644
--- a/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
+++ b/apps/builder/src/features/theme/components/general/ProgressBarForm.tsx
@@ -12,10 +12,10 @@ import {
 import type { ProgressBar } from "@typebot.io/theme/schemas";
 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 { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 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 955b813d1..2a3400418 100644
--- a/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx
+++ b/apps/builder/src/features/user/components/GroupTitlesAutoGenForm.tsx
@@ -3,12 +3,12 @@ import type { BlockV6 } from "@typebot.io/blocks-core/schemas/schema";
 import type { Credentials } from "@typebot.io/credentials/schemas";
 import { forgedBlocks } from "@typebot.io/forge-repository/definitions";
 import { Field } from "@typebot.io/ui/components/Field";
+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 { BasicSelect } from "@/components/inputs/BasicSelect";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 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/user/components/UserPreferencesForm.tsx b/apps/builder/src/features/user/components/UserPreferencesForm.tsx
index eb0a84d53..b523cef8b 100644
--- a/apps/builder/src/features/user/components/UserPreferencesForm.tsx
+++ b/apps/builder/src/features/user/components/UserPreferencesForm.tsx
@@ -1,11 +1,11 @@
 import { Heading, HStack, Stack } from "@chakra-ui/react";
 import { useTolgee, useTranslate } from "@tolgee/react";
 import { GraphNavigation } from "@typebot.io/prisma/enum";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import type { GroupTitlesAutoGeneration } from "@typebot.io/user/schemas";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 import { BasicSelect } from "@/components/inputs/BasicSelect";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { SwitchWithRelatedSettings } from "@/components/SwitchWithRelatedSettings";
 import { VideoOnboardingPopover } from "@/features/onboarding/components/VideoOnboardingPopover";
 import { setLocaleInCookies } from "../helpers/setLocaleInCookies";
diff --git a/apps/landing-page/src/components/MoreInfoTooltip.tsx b/apps/landing-page/src/components/MoreInfoTooltip.tsx
deleted file mode 100644
index 9f7e24953..000000000
--- a/apps/landing-page/src/components/MoreInfoTooltip.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Portal } from "@ark-ui/react/portal";
-import { Tooltip } from "@ark-ui/react/tooltip";
-import { HelpCircleIcon } from "@typebot.io/ui/icons/CircleHelpIcon";
-
-type Props = {
-  children: React.ReactNode;
-};
-export const MoreInfoTooltip = ({ children }: Props) => {
-  return (
-    <Tooltip.Root openDelay={0} closeDelay={0}>
-      <Tooltip.Trigger>
-        <HelpCircleIcon className="size-4 inline-flex" />
-      </Tooltip.Trigger>
-      <Portal>
-        <Tooltip.Positioner>
-          <Tooltip.Content className="bg-gray-1 p-4 border border-gray-6 shadow-md max-w-sm rounded-md text-sm data-[state=open]:motion-opacity-in-0 data-[state=open]:motion-translate-y-in-[-5px] motion-duration-300">
-            {children}
-          </Tooltip.Content>
-        </Tooltip.Positioner>
-      </Portal>
-    </Tooltip.Root>
-  );
-};
diff --git a/apps/landing-page/src/features/pricing/PlanComparisonsTables.tsx b/apps/landing-page/src/features/pricing/PlanComparisonsTables.tsx
index 39ace0a41..4f65d28a1 100644
--- a/apps/landing-page/src/features/pricing/PlanComparisonsTables.tsx
+++ b/apps/landing-page/src/features/pricing/PlanComparisonsTables.tsx
@@ -2,10 +2,10 @@ import { chatsLimits, seatsLimits } from "@typebot.io/billing/constants";
 import { formatPrice } from "@typebot.io/billing/helpers/formatPrice";
 import { parseNumberWithCommas } from "@typebot.io/lib/utils";
 import { Button } from "@typebot.io/ui/components/Button";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { InfinityIcon } from "@typebot.io/ui/icons/InfinityIcon";
 import { TickIcon } from "@typebot.io/ui/icons/TickIcon";
 import { cn } from "@typebot.io/ui/lib/cn";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import {
   Table,
   TableBody,
diff --git a/apps/landing-page/src/features/pricing/pro-plan-card.tsx b/apps/landing-page/src/features/pricing/pro-plan-card.tsx
index 0de938237..f75bb3240 100644
--- a/apps/landing-page/src/features/pricing/pro-plan-card.tsx
+++ b/apps/landing-page/src/features/pricing/pro-plan-card.tsx
@@ -6,8 +6,8 @@ import {
 import { formatPrice } from "@typebot.io/billing/helpers/formatPrice";
 import { Plan } from "@typebot.io/prisma/enum";
 import { Button } from "@typebot.io/ui/components/Button";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { CtaButtonLink } from "@/components/link";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { registerUrl } from "@/constants";
 import {
   PerkListItem,
diff --git a/apps/landing-page/src/features/pricing/starter-plan-card.tsx b/apps/landing-page/src/features/pricing/starter-plan-card.tsx
index d03b75861..946852204 100644
--- a/apps/landing-page/src/features/pricing/starter-plan-card.tsx
+++ b/apps/landing-page/src/features/pricing/starter-plan-card.tsx
@@ -5,8 +5,8 @@ import {
 } from "@typebot.io/billing/constants";
 import { formatPrice } from "@typebot.io/billing/helpers/formatPrice";
 import { Plan } from "@typebot.io/prisma/enum";
+import { MoreInfoTooltip } from "@typebot.io/ui/components/MoreInfoTooltip";
 import { CtaButtonLink } from "@/components/link";
-import { MoreInfoTooltip } from "@/components/MoreInfoTooltip";
 import { registerUrl } from "@/constants";
 import {
   PerkListItem,
diff --git a/packages/credentials/src/decryptAndRefreshCredentials.ts b/packages/credentials/src/decryptAndRefreshCredentials.ts
index 72a0c996f..576868d0c 100644
--- a/packages/credentials/src/decryptAndRefreshCredentials.ts
+++ b/packages/credentials/src/decryptAndRefreshCredentials.ts
@@ -1,4 +1,3 @@
-import { env } from "@typebot.io/env";
 import { forgedBlocks } from "@typebot.io/forge-repository/definitions";
 import { parseUnknownError } from "@typebot.io/lib/parseUnknownError";
 import prisma from "@typebot.io/prisma";
diff --git a/apps/builder/src/components/MoreInfoTooltip.tsx b/packages/ui/src/components/MoreInfoTooltip.tsx
similarity index 100%
rename from apps/builder/src/components/MoreInfoTooltip.tsx
rename to packages/ui/src/components/MoreInfoTooltip.tsx