diff --git a/mon-entreprise/source/components/conversation/TextInput.tsx b/mon-entreprise/source/components/conversation/TextInput.tsx
index 1fdfc0f64..7e327e08d 100644
--- a/mon-entreprise/source/components/conversation/TextInput.tsx
+++ b/mon-entreprise/source/components/conversation/TextInput.tsx
@@ -2,30 +2,30 @@ import { Evaluation } from 'publicodes/dist/types/AST/types'
 import { useCallback } from 'react'
 import { debounce } from '../../utils'
 import { InputProps } from './RuleInput'
+import { TextField } from 'DesignSystem/field'
 
 export default function TextInput({
 	onChange,
 	value,
 	id,
+	title,
 	missing,
 	autoFocus,
 }: InputProps & { value: Evaluation<string> }) {
 	const debouncedOnChange = useCallback(debounce(1000, onChange), [])
 	return (
-		<div className="step input">
-			<input
-				autoFocus={autoFocus}
-				className="ui__"
-				type="text"
-				id={id}
-				onChange={({ target }) => {
-					debouncedOnChange(`'${target.value}'`)
-				}}
-				{...{
-					[missing ? 'placeholder' : 'defaultValue']: (value as string) || '',
-				}}
-				autoComplete="off"
-			/>
-		</div>
+		<TextField
+			autoFocus={autoFocus}
+			type="text"
+			id={id}
+			label={title}
+			onChange={({ target }) => {
+				debouncedOnChange(`'${target.value}'`)
+			}}
+			{...{
+				[missing ? 'placeholder' : 'defaultValue']: (value as string) || '',
+			}}
+			autoComplete="off"
+		/>
 	)
 }
diff --git a/mon-entreprise/source/design-system/field/TextField.tsx b/mon-entreprise/source/design-system/field/TextField.tsx
new file mode 100644
index 000000000..83ed2a45c
--- /dev/null
+++ b/mon-entreprise/source/design-system/field/TextField.tsx
@@ -0,0 +1,115 @@
+import { InputHTMLAttributes, useRef } from 'react'
+import styled from 'styled-components'
+import { useTextField, AriaTextFieldOptions } from '@react-aria/textfield'
+
+export default function TextField(props: AriaTextFieldOptions) {
+	const ref = useRef<HTMLInputElement>(null)
+	const { labelProps, inputProps, descriptionProps } = useTextField(
+		{ ...props, inputElementType: 'input' },
+		ref
+	)
+
+	return (
+		<>
+			<StyledInputContainer>
+				<StyledLabel {...labelProps}>{props.label}</StyledLabel>
+				<StyledInput
+					{...(inputProps as InputHTMLAttributes<HTMLInputElement>)}
+					ref={ref}
+				/>
+			</StyledInputContainer>
+			{props.description && (
+				<p {...descriptionProps} style={{ fontSize: 12 }}>
+					{props.description}
+				</p>
+			)}
+		</>
+	)
+}
+
+const StyledInputContainer = styled.div`
+	border-radius: ${({ theme }) => theme.box.borderRadius};
+	border: ${({ theme }) => theme.box.borderWidth} solid
+		${({ theme }) => theme.colors.extended.grey[500]};
+	outline: transparent solid 1px;
+	display: flex;
+	flex-direction: column;
+	transition: outline-color, border-color 0.3s;
+
+	:focus-within {
+		outline-color: ${({ theme }) => theme.colors.bases.primary[600]};
+		border-color: ${({ theme }) => theme.colors.bases.primary[600]};
+	}
+
+	:focus-within label {
+		color: ${({ theme }) => theme.colors.bases.primary[800]};
+	}
+
+	:focus-within label {
+		color: ${({ theme }) => theme.colors.bases.primary[800]};
+	}
+`
+
+const StyledInput = styled.input`
+	font-size: 1rem;
+	line-height: 1.25rem;
+	border: none;
+	background: none;
+	outline: none;
+	padding: 0 ${({ theme }) => theme.spacings.sm}
+		${({ theme }) => theme.spacings.xs};
+`
+
+const StyledLabel = styled.label`
+	font-size: 0.75rem;
+	line-height: 1rem;
+	padding: ${({ theme }) => theme.spacings.xs}
+		${({ theme }) => theme.spacings.sm} 0;
+`
+// /* Type=Input text, Legend=False, Status=Default */
+
+// /* Auto Layout */
+// display: flex;
+// flex-direction: column;
+// align-items: flex-start;
+// padding: 20px 16px;
+
+// position: absolute;
+// width: 360px;
+// height: 64px;
+// right: 1634px;
+// bottom: 1055px;
+
+// /* Base/UR White */
+// background: #FFFFFF;
+// /* Base/UR Grey N°5 */
+// border: 1px solid #6C757D;
+// box-sizing: border-box;
+// border-radius: 6px;
+
+// /* Label */
+
+// position: static;
+// left: 16px;
+// right: 16px;
+// top: 20px;
+// bottom: 20px;
+
+// /* Form/Label_inactive */
+// font-family: Roboto;
+// font-style: normal;
+// font-weight: normal;
+// font-size: 16px;
+// line-height: 24px;
+// /* identical to box height, or 150% */
+// text-align: justify;
+
+// /* Base/UR Grey N°7 */
+// color: #212529;
+
+// /* Inside Auto Layout */
+// flex: none;
+// order: 0;
+// align-self: stretch;
+// flex-grow: 0;
+// margin: 10px 0px;
diff --git a/mon-entreprise/source/design-system/field/index.ts b/mon-entreprise/source/design-system/field/index.ts
new file mode 100644
index 000000000..fb5f57905
--- /dev/null
+++ b/mon-entreprise/source/design-system/field/index.ts
@@ -0,0 +1 @@
+export { default as TextField } from './TextField'
diff --git a/mon-entreprise/source/design-system/index.ts b/mon-entreprise/source/design-system/index.ts
index 642a9f380..80b88756b 100644
--- a/mon-entreprise/source/design-system/index.ts
+++ b/mon-entreprise/source/design-system/index.ts
@@ -1,3 +1,4 @@
 export * as layout from './layout'
+export * as field from './field'
 
 export { GlobalStyle } from './global-style'
diff --git a/mon-entreprise/source/design-system/styled.d.ts b/mon-entreprise/source/design-system/styled.d.ts
index 0fc41e6ef..a99a03eb9 100644
--- a/mon-entreprise/source/design-system/styled.d.ts
+++ b/mon-entreprise/source/design-system/styled.d.ts
@@ -75,7 +75,6 @@ declare module 'styled-components' {
 		box: {
 			borderRadius: Metric
 			borderWidth: Metric
-			borderWidthLarge: Metric
 		}
 	}
 }
diff --git a/mon-entreprise/source/design-system/theme.ts b/mon-entreprise/source/design-system/theme.ts
index 8ac285d30..f510db5da 100644
--- a/mon-entreprise/source/design-system/theme.ts
+++ b/mon-entreprise/source/design-system/theme.ts
@@ -147,6 +147,5 @@ export const theme: DefaultTheme = {
 	box: {
 		borderRadius: '6px',
 		borderWidth: '1px',
-		borderWidthLarge: '2px',
 	},
 }
diff --git a/mon-entreprise/source/pages/Gérer/DemandeMobilite/index.tsx b/mon-entreprise/source/pages/Gérer/DemandeMobilite/index.tsx
index 86b48b2e8..2d709d7fa 100644
--- a/mon-entreprise/source/pages/Gérer/DemandeMobilite/index.tsx
+++ b/mon-entreprise/source/pages/Gérer/DemandeMobilite/index.tsx
@@ -181,7 +181,7 @@ function FormulairePublicodes() {
 						) : (
 							<>
 								<label htmlFor={dottedName}>
-									{question ? (
+									{question && (
 										<span
 											css={`
 												margin-top: 0.6rem;
@@ -189,8 +189,6 @@ function FormulairePublicodes() {
 										>
 											{question}
 										</span>
-									) : (
-										<small>{title}</small>
 									)}{' '}
 								</label>
 								{description && (