diff --git a/packages/app-builder/src/components/Data/CreateField.tsx b/packages/app-builder/src/components/Data/CreateField.tsx
index 0dfa3ec149..86c0944d84 100644
--- a/packages/app-builder/src/components/Data/CreateField.tsx
+++ b/packages/app-builder/src/components/Data/CreateField.tsx
@@ -100,6 +100,7 @@ function CreateFieldContent({ tableId, closeModal }: { tableId: string; closeMod
   const selectedType = useStore(form.store, (state) => state.values.type);
   const selectedEnum = useStore(form.store, (state) => state.values.isEnum);
   const selectedUnique = useStore(form.store, (state) => state.values.isUnique);
+  const selectedRequired = useStore(form.store, (state) => state.values.required);
 
   return (
     <form
@@ -169,7 +170,7 @@ function CreateFieldContent({ tableId, closeModal }: { tableId: string; closeMod
             >
               {(field) => (
                 <div className="flex flex-1 flex-col gap-2">
-                  <FormLabel name={field.name}>{t('data:create_field.required')}</FormLabel>
+                  <FormLabel name={field.name}>{t('data:create_field.option_required')}</FormLabel>
                   <Select.Default
                     className="w-full overflow-hidden"
                     defaultValue={field.state.value}
@@ -222,6 +223,11 @@ function CreateFieldContent({ tableId, closeModal }: { tableId: string; closeMod
               )}
             </form.Field>
           </div>
+          {selectedRequired === 'required' ? (
+            <span className="text-red-47 text-s">
+              {t('data:create_field.option_required_warning')}
+            </span>
+          ) : null}
           {EnumDataTypes.includes(selectedType) ? (
             <form.Field
               name="isEnum"
diff --git a/packages/app-builder/src/components/Data/EditField.tsx b/packages/app-builder/src/components/Data/EditField.tsx
index 11cf348301..f37fa942a6 100644
--- a/packages/app-builder/src/components/Data/EditField.tsx
+++ b/packages/app-builder/src/components/Data/EditField.tsx
@@ -17,7 +17,12 @@ import { getFieldErrors } from '@app-builder/utils/form';
 import { useForm, useStore } from '@tanstack/react-form';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Button, Checkbox, Modal } from 'ui-design-system';
+import { Button, Checkbox, Modal, Select } from 'ui-design-system';
+
+const REQUIRED_OPTIONS = [
+  { value: 'optional', display: 'data:create_field.option_optional' },
+  { value: 'required', display: 'data:create_field.option_required' },
+] as const;
 
 function disableEditUnique({
   field,
@@ -79,6 +84,7 @@ export function EditField({
       fieldId: inputField.id,
       isEnum: inputField.isEnum,
       isUnique: inputField.unicityConstraint !== 'no_unicity_constraint',
+      required: inputField.nullable ? 'optional' : 'required',
     } as EditFieldPayload,
     onSubmit: ({ value, formApi }) => {
       if (formApi.state.isValid) {
@@ -139,6 +145,36 @@ export function EditField({
                   </div>
                 )}
               </form.Field>
+              <form.Field
+                name="required"
+                validators={{
+                  onChange: editFieldPayloadSchema.shape.required,
+                }}
+              >
+                {(field) => (
+                  <div className="flex flex-col gap-2">
+                    <FormLabel name={field.name}>
+                      {t('data:create_field.option_required')}
+                    </FormLabel>
+                    <Select.Default
+                      className="w-full overflow-hidden"
+                      defaultValue={field.state.value}
+                      onValueChange={(value) => {
+                        field.handleChange(value as 'optional' | 'required');
+                      }}
+                    >
+                      {REQUIRED_OPTIONS.map(({ value, display }) => {
+                        return (
+                          <Select.DefaultItem key={value} value={value}>
+                            {t(display)}
+                          </Select.DefaultItem>
+                        );
+                      })}
+                    </Select.Default>
+                    <FormErrorOrDescription errors={getFieldErrors(field.state.meta.errors)} />
+                  </div>
+                )}
+              </form.Field>
             </div>
             {EnumDataTypes.includes(inputField.dataType) ? (
               <form.Field name="isEnum">
diff --git a/packages/app-builder/src/components/Data/TableDetails.tsx b/packages/app-builder/src/components/Data/TableDetails.tsx
index 9ed10165b3..579cae0aee 100644
--- a/packages/app-builder/src/components/Data/TableDetails.tsx
+++ b/packages/app-builder/src/components/Data/TableDetails.tsx
@@ -211,7 +211,9 @@ function TableDetailFields({ fields, tableModel, dataModel }: TableDetailColumns
         size: 100,
         header: t('data:field_required'),
         cell: ({ getValue }) => {
-          return getValue() ? t('data:nullable') : t('data:required');
+          return getValue()
+            ? t('data:create_field.option_optional')
+            : t('data:create_field.option_required');
         },
       }),
       fieldsColumnHelper.accessor('unicityConstraint', {
@@ -243,18 +245,22 @@ function TableDetailFields({ fields, tableModel, dataModel }: TableDetailColumns
         size: 400,
         cell: ({ cell }) => {
           return (
-            <div className="flex flex-row items-center justify-between gap-1">
-              <FormatDescription description={cell.row.original.description} />
+            <div className="flex flex-row items-center gap-2">
+              <div className="min-w-0 flex-1">
+                <FormatDescription description={cell.row.original.description} />
+              </div>
               {isEditDataModelFieldAvailable ? (
-                <EditField
-                  key={cell.row.original.id}
-                  field={cell.row.original}
-                  linksToThisTable={linksToThisTable}
-                >
-                  <div className="group-hover:text-grey-00 group-hover:bg-grey-98 group-hover:border-grey-50 hover:group-hover:bg-grey-95 active:group-hover:bg-grey-90 relative cursor-pointer rounded-sm border p-2 text-transparent transition-colors ease-in-out">
-                    <Icon icon="edit-square" className="size-6" />
-                  </div>
-                </EditField>
+                <div className="flex-shrink-0">
+                  <EditField
+                    key={cell.row.original.id}
+                    field={cell.row.original}
+                    linksToThisTable={linksToThisTable}
+                  >
+                    <div className="group-hover:text-grey-00 group-hover:bg-grey-98 group-hover:border-grey-50 hover:group-hover:bg-grey-95 active:group-hover:bg-grey-90 relative cursor-pointer rounded-sm border p-2 text-transparent transition-colors ease-in-out">
+                      <Icon icon="edit-square" className="size-6" />
+                    </div>
+                  </EditField>
+                </div>
               ) : null}
             </div>
           );
@@ -354,9 +360,10 @@ function FormatDescription({ description }: { description: string }) {
   return (
     <span
       className={clsx(
-        'relative first-letter:capitalize',
+        'relative first-letter:capitalize truncate block',
         description ? 'text-grey-00' : 'text-grey-80',
       )}
+      title={description || t('data:empty_description')}
     >
       {description || t('data:empty_description')}
     </span>
diff --git a/packages/app-builder/src/locales/ar/data.json b/packages/app-builder/src/locales/ar/data.json
index 5dc6e382f1..d67ab9cead 100644
--- a/packages/app-builder/src/locales/ar/data.json
+++ b/packages/app-builder/src/locales/ar/data.json
@@ -11,7 +11,7 @@
   "create_field.name_reserved_error": "الاسم \"id\" محجوز",
   "create_field.option_optional": "اختياري",
   "create_field.option_required": "متطلب",
-  "create_field.required": "المتطلب",
+  "create_field.option_required_warning": "يرجى الحذر عند إضافة حقل مطلوب على جدول فعال. إذا كنت تقوم بالفعل بإدخال البيانات أو إنشاء قرارات عبر الواجهة، سيفشل ذلك عند إضافة حقل مطلوب. نوصي بإنشاء الحقل أولاً كاختياري، إضافته إلى المصدر، ثم تحديده كمطلوب.",
   "create_field.title": "انشاء حقل جديد",
   "create_field.type": "النوع",
   "create_field.type_bool": "منطقي",
@@ -74,10 +74,8 @@
   "link_name": "الاسم",
   "links_from_table": "روابط من إلى عناصر أخرى من<TableLocale>{{tableName}}</TableLocale>",
   "menu.create_pivot.label": "تجميع القرارات حسب...",
-  "nullable": "يمكن أن يكون الحقل فارغ",
   "parent_field_name": "اسم الحقل للجدول الرئيسي",
   "parent_table": "جدول ذو صله",
-  "required": "متطلب",
   "table_relationship": "العلاقة",
   "unique.col_header": "فريد",
   "upload_data": "رفع البيانات",
diff --git a/packages/app-builder/src/locales/en/data.json b/packages/app-builder/src/locales/en/data.json
index 5f855799ac..a28c648dcc 100644
--- a/packages/app-builder/src/locales/en/data.json
+++ b/packages/app-builder/src/locales/en/data.json
@@ -11,7 +11,7 @@
   "create_field.name_reserved_error": "The name \"id\" is reserved",
   "create_field.option_optional": "Optional",
   "create_field.option_required": "Required",
-  "create_field.required": "Required",
+  "create_field.option_required_warning": "Be careful when adding a required field on an active table. If you are already ingesting data or creating decisions via API, they will fail when you add a required field. We recommend you first create the field as optional, add it to your ingestion pipeline, and then mark it as required.",
   "create_field.title": "Create a new field",
   "create_field.type": "Type",
   "create_field.type_bool": "Boolean",
@@ -74,10 +74,8 @@
   "link_name": "Name",
   "links_from_table": "Links from to other entities from <TableLocale>{{tableName}}</TableLocale>",
   "menu.create_pivot.label": "Group decisions by...",
-  "nullable": "Nullable",
   "parent_field_name": "Parent table field name",
   "parent_table": "Related table",
-  "required": "Required",
   "table_relationship": "Relationship",
   "unique.col_header": "Unique",
   "upload_data": "Upload data",
diff --git a/packages/app-builder/src/locales/fr/data.json b/packages/app-builder/src/locales/fr/data.json
index 4ef9ba91f4..558fc284e0 100644
--- a/packages/app-builder/src/locales/fr/data.json
+++ b/packages/app-builder/src/locales/fr/data.json
@@ -11,7 +11,7 @@
   "create_field.name_reserved_error": "Le nom \"id\" est réservé",
   "create_field.option_optional": "Facultatif",
   "create_field.option_required": "Requis",
-  "create_field.required": "Requis",
+  "create_field.option_required_warning": "Faites attention lors de l'ajout d'un champ requis sur une table déjà utilisée. Si vous ingérez déjà des données ou créez des décisions par API, celles-ci échoueront si vous ajoutez un champ requis. Nous vous recommandons de créer d'abord le champ comme facultatif, de l'ajouter à votre pipeline d'ingestion, puise de le marquer comme requis.",
   "create_field.title": "Créer un nouveau champ",
   "create_field.type": "Type",
   "create_field.type_bool": "Booléen",
@@ -74,10 +74,8 @@
   "link_name": "Nom",
   "links_from_table": "Liens vers d'autres entités de <TableLocale>{{tableName}}</TableLocale>",
   "menu.create_pivot.label": "Regrouper les décisions par...",
-  "nullable": "Nullable",
   "parent_field_name": "Nom du champ de la table parent",
   "parent_table": "Table associée",
-  "required": "Requis",
   "table_relationship": "Relation",
   "unique.col_header": "Unique",
   "upload_data": "Téléverser des données",
diff --git a/packages/app-builder/src/models/data-model.ts b/packages/app-builder/src/models/data-model.ts
index 047f70f078..f2c221066d 100644
--- a/packages/app-builder/src/models/data-model.ts
+++ b/packages/app-builder/src/models/data-model.ts
@@ -247,6 +247,7 @@ export interface UpdateFieldInput {
   description?: string;
   isEnum?: boolean;
   isUnique?: boolean;
+  isNullable?: boolean;
 }
 
 export function adaptUpdateFieldDto(updateFieldInput: UpdateFieldInput): UpdateTableFieldDto {
@@ -254,6 +255,7 @@ export function adaptUpdateFieldDto(updateFieldInput: UpdateFieldInput): UpdateT
     description: updateFieldInput.description,
     is_enum: updateFieldInput.isEnum,
     is_unique: updateFieldInput.isUnique,
+    is_nullable: updateFieldInput.isNullable,
   };
 }
 
diff --git a/packages/app-builder/src/queries/data/edit-field.ts b/packages/app-builder/src/queries/data/edit-field.ts
index 31625a0a69..f48154da84 100644
--- a/packages/app-builder/src/queries/data/edit-field.ts
+++ b/packages/app-builder/src/queries/data/edit-field.ts
@@ -7,6 +7,7 @@ export const editFieldPayloadSchema = z.object({
   fieldId: z.uuid(),
   isEnum: z.boolean(),
   isUnique: z.boolean(),
+  required: z.enum(['optional', 'required']),
 });
 
 export type EditFieldPayload = z.infer<typeof editFieldPayloadSchema>;
diff --git a/packages/app-builder/src/routes/ressources+/data+/editField.tsx b/packages/app-builder/src/routes/ressources+/data+/editField.tsx
index 0137a72640..92df29470a 100644
--- a/packages/app-builder/src/routes/ressources+/data+/editField.tsx
+++ b/packages/app-builder/src/routes/ressources+/data+/editField.tsx
@@ -23,13 +23,14 @@ export async function action({ request }: ActionFunctionArgs) {
   const { success, error, data } = editFieldPayloadSchema.safeParse(raw);
 
   if (!success) return json({ success: 'false', errors: z.treeifyError(error) });
-  const { description, fieldId, isEnum, isUnique } = data;
+  const { description, fieldId, isEnum, isUnique, required } = data;
 
   try {
     await dataModelRepository.patchDataModelField(fieldId, {
       description,
       isEnum,
       isUnique,
+      isNullable: required === 'optional',
     });
 
     return json({ success: 'true', errors: [] });
diff --git a/packages/marble-api/openapis/marblecore-api/data-model.yml b/packages/marble-api/openapis/marblecore-api/data-model.yml
index 90a56f2e5e..7dbb7ca3f0 100644
--- a/packages/marble-api/openapis/marblecore-api/data-model.yml
+++ b/packages/marble-api/openapis/marblecore-api/data-model.yml
@@ -575,6 +575,8 @@ components:
           type: boolean
         is_unique:
           type: boolean
+        is_nullable:
+          type: boolean
     CreateTableLinkBody:
       type: object
       required:
diff --git a/packages/marble-api/src/generated/marblecore-api.ts b/packages/marble-api/src/generated/marblecore-api.ts
index 0b136b995f..c1cd1fd067 100644
--- a/packages/marble-api/src/generated/marblecore-api.ts
+++ b/packages/marble-api/src/generated/marblecore-api.ts
@@ -1020,6 +1020,7 @@ export type UpdateTableFieldDto = {
     description?: string;
     is_enum?: boolean;
     is_unique?: boolean;
+    is_nullable?: boolean;
 };
 export type CreateTableLinkBody = {
     name: string;