diff --git a/components/TextField/TextField.stories.tsx b/components/TextField/TextField.stories.tsx
index f1bb4078..8bacfbdb 100644
--- a/components/TextField/TextField.stories.tsx
+++ b/components/TextField/TextField.stories.tsx
@@ -2,8 +2,12 @@ import React from 'react';
 import { ComponentStory, ComponentMeta } from '@storybook/react';
 
 import { Flex } from '../Flex';
+import { Label } from '../Label';
+import { Text } from '../Text';
+import { Popover, PopoverTrigger, PopoverContent } from '../Popover';
 import { TextField, TextFieldProps, TextFieldVariants } from './TextField';
-import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
+import { MagnifyingGlassIcon, InfoCircledIcon } from '@radix-ui/react-icons';
+import { styled } from '../../stitches.config';
 import { modifyVariantsForStory } from '../../utils/modifyVariantsForStory';
 import ignoreArgType from '../../utils/ignoreArgType';
 
@@ -97,4 +101,58 @@ DisplayClearable.args = {
   id: 'displayclearable',
   clearable: true,
 };
-ignoreArgType('id', DisplayClearable);
\ No newline at end of file
+ignoreArgType('id', DisplayClearable);
+
+export const LabelComponent: ComponentStory<typeof TextFieldForStory> = ({ id, ...args }) => (
+  <Flex direction="column" gap={2}>
+    <TextFieldForStory
+      id={`${id}-basic`}
+      {...args}
+    />
+    <TextFieldForStory
+      id={`${id}-invalid`}
+      state="invalid"
+      {...args}
+    />
+    <TextFieldForStory
+      id={`${id}-disabled`}
+      value="disabled"
+      disabled
+      {...args}
+    />
+
+  </Flex>
+)
+
+const StyledInfoCircledIcon = styled(InfoCircledIcon, {
+  ml: '$2',
+  '@hover': {
+    '&:hover': {
+      cursor: 'pointer'
+    }
+  }
+});
+
+const label = (props) => (
+  <Label {...props}>
+    <Flex align="center">
+      Field Label
+      <Popover>
+        <PopoverTrigger asChild>
+          <StyledInfoCircledIcon />
+        </PopoverTrigger>
+        <PopoverContent css={{ p: '$3' }}>
+          <Text as="p" css={{ color: 'currentColor' }}>
+            More information
+          </Text>
+        </PopoverContent>
+      </Popover>
+    </Flex>
+  </Label >
+)
+
+LabelComponent.args = {
+  id: 'labelcomponent',
+  label: label,
+}
+ignoreArgType('id', LabelComponent);
\ No newline at end of file
diff --git a/components/TextField/TextField.tsx b/components/TextField/TextField.tsx
index de936494..45f030e4 100644
--- a/components/TextField/TextField.tsx
+++ b/components/TextField/TextField.tsx
@@ -13,10 +13,16 @@ import {
 } from '@radix-ui/react-icons';
 
 // TYPES
+export interface TextFieldLabelProps {
+  variant: 'red' | 'subtle' | 'contrast' | 'default'
+  disabled?: boolean
+  invalid?: boolean
+  htmlFor?: string
+}
 export type TextFieldProps = InputProps & {
   type?: string;
   clearable?: boolean;
-  label?: string;
+  label?: string | ((props: TextFieldLabelProps) => JSX.Element);
 };
 
 export type TextFieldVariants = InputVariants;
@@ -60,7 +66,7 @@ const StyledCrossCircledIcon = styled(CrossCircledIcon, {
 
 export const TextField = React.forwardRef<React.ElementRef<typeof Input>, TextFieldProps>(
   (
-    { state, clearable, label, id, type, disabled, readOnly, onBlur, onFocus, css, ...props },
+    { state, clearable, label: LabelOrComponent, id, type, disabled, readOnly, onBlur, onFocus, css, ...props },
     forwardedRef
   ) => {
     const inputRef = React.useRef<InputHandle | null>(null);
@@ -85,6 +91,25 @@ export const TextField = React.forwardRef<React.ElementRef<typeof Input>, TextFi
       return 'default';
     }, [invalid, disabled, inputHasFocus]);
 
+    const LabelNode = React.useMemo(
+      () => {
+        if (LabelOrComponent === undefined || LabelOrComponent === null) {
+          return null;
+        }
+        if (typeof LabelOrComponent === 'string') {
+          return (
+            <Label variant={labelVariant} disabled={disabled} invalid={invalid} htmlFor={id}>
+              {LabelOrComponent}
+            </Label>
+          );
+        }
+        return (
+          <LabelOrComponent variant={labelVariant} disabled={disabled} invalid={invalid} htmlFor={id} />
+        );
+      },
+      [LabelOrComponent, labelVariant, disabled, invalid, id],
+    );
+
     const isPasswordType = React.useMemo(() => type === 'password', [type]);
 
     const typeOrInnerType = React.useMemo(() => (isPasswordType ? innerType : type), [
@@ -154,11 +179,7 @@ export const TextField = React.forwardRef<React.ElementRef<typeof Input>, TextFi
 
     return (
       <Box css={css}>
-        {label && (
-          <Label variant={labelVariant} disabled={disabled} invalid={invalid} htmlFor={id}>
-            {label}
-          </Label>
-        )}
+        {LabelNode}
         <Input
           id={id}
           ref={inputRef}
diff --git a/components/Tooltip/Tooltip.stories.tsx b/components/Tooltip/Tooltip.stories.tsx
index 8fe7a74d..005480d1 100644
--- a/components/Tooltip/Tooltip.stories.tsx
+++ b/components/Tooltip/Tooltip.stories.tsx
@@ -6,10 +6,7 @@ import { modifyVariantsForStory } from '../../utils/modifyVariantsForStory';
 import { Text } from '../Text';
 import { Container } from '../Container';
 import { Flex } from '../Flex';
-import { Button } from '../Button';
 import { Box } from '../Box';
-import { Bubble } from '../Bubble';
-import { TextField } from '../TextField';
 import { CrossCircledIcon, ExclamationTriangleIcon } from '@radix-ui/react-icons';
 import { styled } from '../../stitches.config';