diff --git a/package.json b/package.json
index db4fc8a7fd03..2bbe5f5608b0 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.isobject": "^3.0.2",
     "lodash.kebabcase": "^4.1.1",
+    "lodash.mapvalues": "^4.6.0",
     "lodash.merge": "^4.6.2",
     "lodash.omit": "^4.5.0",
     "lodash.pick": "^4.4.0",
@@ -225,6 +226,7 @@
     "@types/lodash.isequal": "^4.5.7",
     "@types/lodash.isobject": "^3.0.7",
     "@types/lodash.kebabcase": "^4.1.7",
+    "@types/lodash.mapvalues": "^4.6.9",
     "@types/lodash.snakecase": "^4.1.7",
     "@types/lodash.upperfirst": "^4.3.7",
     "@types/luxon": "^3.3.0",
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
index 85d9c603d7a4..97ad87b4e9d6 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
@@ -1,8 +1,11 @@
 import styled from '@emotion/styled';
-import { startOfMonth } from 'date-fns';
+import { format, getYear, startOfMonth } from 'date-fns';
+import mapValues from 'lodash.mapvalues';
 
 import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard';
 import { sortCalendarEventsDesc } from '@/activities/calendar/utils/sortCalendarEvents';
+import { H3Title } from '@/ui/display/typography/components/H3Title';
+import { Section } from '@/ui/layout/section/components/Section';
 import { mockedCalendarEvents } from '~/testing/mock-data/calendar';
 import { groupArrayItemsBy } from '~/utils/array/groupArrayItemsBy';
 import { sortDesc } from '~/utils/sort';
@@ -16,6 +19,10 @@ const StyledContainer = styled.div`
   width: 100%;
 `;
 
+const StyledYear = styled.span`
+  color: ${({ theme }) => theme.font.color.light};
+`;
+
 export const Calendar = () => {
   const sortedCalendarEvents = [...mockedCalendarEvents].sort(
     sortCalendarEventsDesc,
@@ -27,18 +34,32 @@ export const Calendar = () => {
   const sortedMonthTimes = Object.keys(calendarEventsByMonthTime)
     .map(Number)
     .sort(sortDesc);
+  const monthTimesByYear = groupArrayItemsBy(sortedMonthTimes, getYear);
+  const lastMonthTimeByYear = mapValues(monthTimesByYear, (monthTimes = []) =>
+    Math.max(...monthTimes),
+  );
 
   return (
     <StyledContainer>
       {sortedMonthTimes.map((monthTime) => {
         const monthCalendarEvents = calendarEventsByMonthTime[monthTime];
+        const year = getYear(monthTime);
+        const isLastMonthOfYear = lastMonthTimeByYear[year] === monthTime;
+        const monthLabel = format(monthTime, 'MMMM');
 
         return (
           !!monthCalendarEvents?.length && (
-            <CalendarMonthCard
-              key={monthTime}
-              calendarEvents={monthCalendarEvents}
-            />
+            <Section key={monthTime}>
+              <H3Title
+                title={
+                  <>
+                    {monthLabel}
+                    {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}
+                  </>
+                }
+              />
+              <CalendarMonthCard calendarEvents={monthCalendarEvents} />
+            </Section>
           )
         );
       })}
diff --git a/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
new file mode 100644
index 000000000000..fe25319198b2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
@@ -0,0 +1,6 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const LABEL_IDENTIFIER_FIELD_METADATA_TYPES = [
+  FieldMetadataType.Number,
+  FieldMetadataType.Text,
+];
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts
new file mode 100644
index 000000000000..e174c2b00489
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export const getActiveFieldMetadataItems = (
+  objectMetadataItem: Pick<ObjectMetadataItem, 'fields'>,
+) =>
+  objectMetadataItem.fields.filter(
+    (fieldMetadataItem) =>
+      fieldMetadataItem.isActive && !fieldMetadataItem.isSystem,
+  );
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts
new file mode 100644
index 000000000000..52f781ccc203
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export const getDisabledFieldMetadataItems = (
+  objectMetadataItem: Pick<ObjectMetadataItem, 'fields'>,
+) =>
+  objectMetadataItem.fields.filter(
+    (fieldMetadataItem) =>
+      !fieldMetadataItem.isActive && !fieldMetadataItem.isSystem,
+  );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
index 5ab4617eddb8..eff716fb142e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
@@ -1,5 +1,5 @@
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
-import { TextInput } from '@/ui/field/input/components/TextInput';
+import { CurrencyInput } from '@/ui/field/input/components/CurrencyInput';
 
 import { FieldInputOverlay } from '../../../../../ui/field/input/components/FieldInputOverlay';
 import { useCurrencyField } from '../../hooks/useCurrencyField';
@@ -79,10 +79,18 @@ export const CurrencyFieldInput = ({
     });
   };
 
+  const handleSelect = (newValue: string) => {
+    setDraftValue({
+      amount: draftValue?.amount ?? '',
+      currencyCode: newValue as CurrencyCode,
+    });
+  };
+
   return (
     <FieldInputOverlay>
-      <TextInput
+      <CurrencyInput
         value={draftValue?.amount?.toString() ?? ''}
+        currencyCode={draftValue?.currencyCode ?? CurrencyCode.USD}
         autoFocus
         placeholder="Currency"
         onClickOutside={handleClickOutside}
@@ -90,8 +98,9 @@ export const CurrencyFieldInput = ({
         onEscape={handleEscape}
         onShiftTab={handleShiftTab}
         onTab={handleTab}
-        hotkeyScope={hotkeyScope}
         onChange={handleChange}
+        onSelect={handleSelect}
+        hotkeyScope={hotkeyScope}
       />
     </FieldInputOverlay>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
index ee11e822cbfa..72c024f7afe9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
@@ -1,4 +1,3 @@
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldInputDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
@@ -31,7 +30,7 @@ export const computeDraftValueFromFieldValue = <FieldValue>({
 
     return {
       amount: fieldValue?.amountMicros ? fieldValue.amountMicros / 1000000 : '',
-      currenyCode: CurrencyCode.USD,
+      currencyCode: fieldValue?.currencyCode ?? '',
     } as unknown as FieldInputDraftValue<FieldValue>;
   }
   if (isFieldRelation(fieldDefinition)) {
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx
new file mode 100644
index 000000000000..9fbc11715a5f
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx
@@ -0,0 +1,11 @@
+import styled from '@emotion/styled';
+
+const StyledTitle = styled.h3`
+  color: ${({ theme }) => theme.font.color.extraLight};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  margin: 0;
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+export { StyledTitle as SettingsDataModelCardTitle };
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
new file mode 100644
index 000000000000..6762b52693cf
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
@@ -0,0 +1,101 @@
+import { useMemo } from 'react';
+import { Controller, useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+import { z } from 'zod';
+
+import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getActiveFieldMetadataItems } from '@/object-metadata/utils/getActiveFieldMetadataItems';
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
+import { IconCircleOff } from '@/ui/display/icon';
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { Select, SelectOption } from '@/ui/input/components/Select';
+
+export const settingsDataModelObjectIdentifiersFormSchema =
+  objectMetadataItemSchema.pick({
+    labelIdentifierFieldMetadataId: true,
+    imageIdentifierFieldMetadataId: true,
+  });
+
+export type SettingsDataModelObjectIdentifiersFormValues = z.infer<
+  typeof settingsDataModelObjectIdentifiersFormSchema
+>;
+
+type SettingsDataModelObjectIdentifiersFormProps = {
+  objectMetadataItem: ObjectMetadataItem;
+};
+
+const StyledContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const SettingsDataModelObjectIdentifiersForm = ({
+  objectMetadataItem,
+}: SettingsDataModelObjectIdentifiersFormProps) => {
+  const { control } =
+    useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
+  const { getIcon } = useIcons();
+
+  const labelIdentifierFieldOptions = useMemo(
+    () =>
+      getActiveFieldMetadataItems(objectMetadataItem)
+        .filter(
+          ({ id, type }) =>
+            LABEL_IDENTIFIER_FIELD_METADATA_TYPES.includes(type) ||
+            objectMetadataItem.labelIdentifierFieldMetadataId === id,
+        )
+        .map<SelectOption<string | null>>((fieldMetadataItem) => ({
+          Icon: getIcon(fieldMetadataItem.icon),
+          label: fieldMetadataItem.label,
+          value: fieldMetadataItem.id,
+        })),
+    [getIcon, objectMetadataItem],
+  );
+  const imageIdentifierFieldOptions: SelectOption<string | null>[] = [];
+
+  const emptyOption: SelectOption<string | null> = {
+    Icon: IconCircleOff,
+    label: 'None',
+    value: null,
+  };
+
+  return (
+    <StyledContainer>
+      {[
+        {
+          label: 'Record label',
+          fieldName: 'labelIdentifierFieldMetadataId' as const,
+          options: labelIdentifierFieldOptions,
+        },
+        {
+          label: 'Record image',
+          fieldName: 'imageIdentifierFieldMetadataId' as const,
+          options: imageIdentifierFieldOptions,
+        },
+      ].map(({ fieldName, label, options }) => (
+        <Controller
+          key={fieldName}
+          name={fieldName}
+          control={control}
+          defaultValue={objectMetadataItem[fieldName]}
+          render={({ field: { onBlur, onChange, value } }) => {
+            return (
+              <Select
+                label={label}
+                disabled={!objectMetadataItem.isCustom || !options.length}
+                fullWidth
+                dropdownId={`${fieldName}-select`}
+                emptyOption={emptyOption}
+                options={options}
+                value={value}
+                onChange={onChange}
+                onBlur={onBlur}
+              />
+            );
+          }}
+        />
+      ))}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
index 31331818c06b..a662aeaae084 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
@@ -1,9 +1,15 @@
+import { useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
 import styled from '@emotion/styled';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
-import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
+import { SettingsDataModelCardTitle } from '@/settings/data-model/components/SettingsDataModelCardTitle';
 import { SettingsDataModelFieldPreviewCard } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
+import {
+  SettingsDataModelObjectIdentifiersForm,
+  SettingsDataModelObjectIdentifiersFormValues,
+} from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
 import { SettingsDataModelObjectSummary } from '@/settings/data-model/objects/SettingsDataModelObjectSummary';
 import { Card } from '@/ui/layout/card/components/Card';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
@@ -16,6 +22,10 @@ const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
   width: 100%;
 `;
 
+const StyledTopCardContent = styled(CardContent)`
+  background-color: ${({ theme }) => theme.background.transparent.lighter};
+`;
+
 const StyledObjectSummaryCard = styled(Card)`
   border-radius: ${({ theme }) => theme.border.radius.md};
   color: ${({ theme }) => theme.font.color.primary};
@@ -29,13 +39,27 @@ const StyledObjectSummaryCardContent = styled(CardContent)`
 export const SettingsDataModelObjectSettingsFormCard = ({
   objectMetadataItem,
 }: SettingsDataModelObjectSettingsFormCardProps) => {
-  const labelIdentifierFieldMetadataItem =
-    getLabelIdentifierFieldMetadataItem(objectMetadataItem);
+  const { watch: watchFormValue } =
+    useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
+
+  const labelIdentifierFieldMetadataIdFormValue = watchFormValue(
+    'labelIdentifierFieldMetadataId',
+  );
+
+  const labelIdentifierFieldMetadataItem = useMemo(
+    () =>
+      getLabelIdentifierFieldMetadataItem({
+        fields: objectMetadataItem.fields,
+        labelIdentifierFieldMetadataId: labelIdentifierFieldMetadataIdFormValue,
+      }),
+    [labelIdentifierFieldMetadataIdFormValue, objectMetadataItem],
+  );
 
   return (
-    <SettingsDataModelPreviewFormCard
-      preview={
-        labelIdentifierFieldMetadataItem ? (
+    <Card fullWidth>
+      <StyledTopCardContent divider>
+        <SettingsDataModelCardTitle>Preview</SettingsDataModelCardTitle>
+        {labelIdentifierFieldMetadataItem ? (
           <StyledFieldPreviewCard
             objectMetadataItem={objectMetadataItem}
             fieldMetadataItem={labelIdentifierFieldMetadataItem}
@@ -49,8 +73,13 @@ export const SettingsDataModelObjectSettingsFormCard = ({
               />
             </StyledObjectSummaryCardContent>
           </StyledObjectSummaryCard>
-        )
-      }
-    />
+        )}
+      </StyledTopCardContent>
+      <CardContent>
+        <SettingsDataModelObjectIdentifiersForm
+          objectMetadataItem={objectMetadataItem}
+        />
+      </CardContent>
+    </Card>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/display/icon/index.ts b/packages/twenty-front/src/modules/ui/display/icon/index.ts
index 8fdb7d5c8738..ae1b058dc92c 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/index.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/index.ts
@@ -36,6 +36,7 @@ export {
   IconChevronsRight,
   IconChevronUp,
   IconCircleDot,
+  IconCircleOff,
   IconClick,
   IconCode,
   IconCoins,
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx
new file mode 100644
index 000000000000..4e8f8dcaae16
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx
@@ -0,0 +1,19 @@
+import { ReactNode } from 'react';
+import styled from '@emotion/styled';
+
+type H3TitleProps = {
+  title: ReactNode;
+  className?: string;
+};
+
+const StyledH3Title = styled.h3`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-size: ${({ theme }) => theme.font.size.lg};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin: 0;
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const H3Title = ({ title, className }: H3TitleProps) => {
+  return <StyledH3Title className={className}>{title}</StyledH3Title>;
+};
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
new file mode 100644
index 000000000000..7ea720df9e08
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
@@ -0,0 +1,22 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+
+import { H3Title } from '../H3Title';
+
+const meta: Meta<typeof H3Title> = {
+  title: 'UI/Display/Typography/Title/H3Title',
+  component: H3Title,
+  decorators: [ComponentDecorator],
+  args: {
+    title: 'H3 title',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof H3Title>;
+
+export const Default: Story = {
+  decorators: [ComponentDecorator],
+};
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
new file mode 100644
index 000000000000..8a72584b5a5c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
@@ -0,0 +1,152 @@
+import { ChangeEvent, useEffect, useMemo, useRef, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
+import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { CurrencyPickerDropdownButton } from '@/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton';
+import { TEXT_INPUT_STYLE } from '@/ui/theme/constants/TextInputStyle';
+
+export const StyledInput = styled.input`
+  margin: 0;
+  ${TEXT_INPUT_STYLE}
+  width: 100%;
+  padding: ${({ theme }) => `${theme.spacing(0)} ${theme.spacing(1)}`};
+`;
+
+const StyledContainer = styled.div`
+  align-items: center;
+
+  border: none;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  box-shadow: ${({ theme }) => theme.boxShadow.strong};
+
+  display: flex;
+  justify-content: center;
+`;
+
+const StyledIcon = styled.div`
+  align-items: center;
+  display: flex;
+
+  & > svg {
+    padding-left: ${({ theme }) => theme.spacing(1)};
+    color: ${({ theme }) => theme.font.color.tertiary};
+    height: ${({ theme }) => theme.icon.size.md}px;
+    width: ${({ theme }) => theme.icon.size.md}px;
+  }
+`;
+
+export type CurrencyInputProps = {
+  placeholder?: string;
+  autoFocus?: boolean;
+  value: string;
+  currencyCode: string;
+  onEnter: (newText: string) => void;
+  onEscape: (newText: string) => void;
+  onTab?: (newText: string) => void;
+  onShiftTab?: (newText: string) => void;
+  onClickOutside: (event: MouseEvent | TouchEvent, inputValue: string) => void;
+  onChange?: (newText: string) => void;
+  onSelect?: (newText: string) => void;
+  hotkeyScope: string;
+};
+
+type Currency = {
+  label: string;
+  value: string;
+  Icon: any;
+};
+
+export const CurrencyInput = ({
+  autoFocus,
+  value,
+  currencyCode,
+  placeholder,
+  onEnter,
+  onEscape,
+  onTab,
+  onShiftTab,
+  onClickOutside,
+  onChange,
+  onSelect,
+  hotkeyScope,
+}: CurrencyInputProps) => {
+  const theme = useTheme();
+
+  const [internalText, setInternalText] = useState(value);
+  const [internalCurrency, setInternalCurrency] = useState<Currency | null>(
+    null,
+  );
+
+  const wrapperRef = useRef<HTMLInputElement>(null);
+
+  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    setInternalText(event.target.value);
+    onChange?.(event.target.value);
+  };
+
+  const handleCurrencyChange = (currency: Currency) => {
+    setInternalCurrency(currency);
+    onSelect?.(currency.value);
+  };
+
+  useRegisterInputEvents({
+    inputRef: wrapperRef,
+    inputValue: internalText,
+    onEnter,
+    onEscape,
+    onClickOutside,
+    onTab,
+    onShiftTab,
+    hotkeyScope,
+  });
+
+  const currencies = useMemo<Currency[]>(
+    () =>
+      Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(
+        ([key, { Icon, label }]) => ({
+          value: key,
+          Icon,
+          label,
+        }),
+      ),
+    [],
+  );
+
+  useEffect(() => {
+    const currency = currencies.find(({ value }) => value === currencyCode);
+    if (currency) {
+      setInternalCurrency(currency);
+    }
+  }, [currencies, currencyCode]);
+
+  useEffect(() => {
+    setInternalText(value);
+  }, [value]);
+
+  const Icon: IconComponent = internalCurrency?.Icon;
+
+  return (
+    <StyledContainer ref={wrapperRef}>
+      <CurrencyPickerDropdownButton
+        valueCode={internalCurrency?.value ?? ''}
+        onChange={handleCurrencyChange}
+        currencies={currencies}
+      />
+      <StyledIcon>
+        {Icon && (
+          <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
+        )}
+      </StyledIcon>
+      <StyledInput
+        autoComplete="off"
+        placeholder={placeholder}
+        onChange={handleChange}
+        autoFocus={autoFocus}
+        value={value}
+      />
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index ab5174b8666b..83fabcd60c64 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -24,9 +24,11 @@ export type SelectProps<Value extends string | number | null> = {
   disabled?: boolean;
   dropdownId: string;
   dropdownWidth?: `${string}px` | 'auto' | number;
+  emptyOption?: SelectOption<Value>;
   fullWidth?: boolean;
   label?: string;
   onChange?: (value: Value) => void;
+  onBlur?: () => void;
   options: SelectOption<Value>[];
   value?: Value;
   withSearchInput?: boolean;
@@ -73,12 +75,14 @@ const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>`
 
 export const Select = <Value extends string | number | null>({
   className,
-  disabled,
+  disabled: disabledFromProps,
   dropdownId,
   dropdownWidth = 176,
+  emptyOption,
   fullWidth,
   label,
   onChange,
+  onBlur,
   options,
   value,
   withSearchInput,
@@ -87,7 +91,9 @@ export const Select = <Value extends string | number | null>({
   const [searchInputValue, setSearchInputValue] = useState('');
 
   const selectedOption =
-    options.find(({ value: key }) => key === value) || options[0];
+    options.find(({ value: key }) => key === value) ||
+    options[0] ||
+    emptyOption;
   const filteredOptions = useMemo(
     () =>
       searchInputValue
@@ -98,28 +104,37 @@ export const Select = <Value extends string | number | null>({
     [options, searchInputValue],
   );
 
+  const isDisabled = disabledFromProps || options.length <= 1;
+
   const { closeDropdown } = useDropdown(dropdownId);
 
   const selectControl = (
-    <StyledControlContainer disabled={disabled}>
+    <StyledControlContainer disabled={isDisabled}>
       <StyledControlLabel>
         {!!selectedOption?.Icon && (
           <selectedOption.Icon
-            color={disabled ? theme.font.color.light : theme.font.color.primary}
+            color={
+              isDisabled ? theme.font.color.light : theme.font.color.primary
+            }
             size={theme.icon.size.md}
             stroke={theme.icon.stroke.sm}
           />
         )}
         {selectedOption?.label}
       </StyledControlLabel>
-      <StyledIconChevronDown disabled={disabled} size={theme.icon.size.md} />
+      <StyledIconChevronDown disabled={isDisabled} size={theme.icon.size.md} />
     </StyledControlContainer>
   );
 
   return (
-    <StyledContainer className={className} fullWidth={fullWidth}>
+    <StyledContainer
+      className={className}
+      fullWidth={fullWidth}
+      tabIndex={0}
+      onBlur={onBlur}
+    >
       {!!label && <StyledLabel>{label}</StyledLabel>}
-      {disabled ? (
+      {isDisabled ? (
         selectControl
       ) : (
         <Dropdown
@@ -148,6 +163,7 @@ export const Select = <Value extends string | number | null>({
                       text={option.label}
                       onClick={() => {
                         onChange?.(option.value);
+                        onBlur?.();
                         closeDropdown();
                       }}
                     />
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
new file mode 100644
index 000000000000..305ca9851da7
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
@@ -0,0 +1,108 @@
+import { useEffect, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { IconChevronDown } from '@/ui/display/icon';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+
+import { CurrencyPickerHotkeyScope } from '../types/CurrencyPickerHotkeyScope';
+
+import { CurrencyPickerDropdownSelect } from './CurrencyPickerDropdownSelect';
+
+type StyledDropdownButtonProps = {
+  isUnfolded: boolean;
+};
+
+export const StyledDropdownButtonContainer = styled.div<StyledDropdownButtonProps>`
+  align-items: center;
+  color: ${({ color }) => color ?? 'none'};
+  cursor: pointer;
+  display: flex;
+  border-right: ${({ theme }) => `1px solid ${theme.border.color.medium}`};
+  height: 32px;
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+  user-select: none;
+  &:hover {
+    filter: brightness(0.95);
+  }
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  justify-content: center;
+
+  svg {
+    align-items: center;
+    display: flex;
+    height: 16px;
+    justify-content: center;
+  }
+`;
+
+export type Currency = {
+  label: string;
+  value: string;
+  Icon: any;
+};
+
+export const CurrencyPickerDropdownButton = ({
+  valueCode,
+  onChange,
+  currencies,
+}: {
+  valueCode: string;
+  onChange: (currency: Currency) => void;
+  currencies: Currency[];
+}) => {
+  const theme = useTheme();
+
+  const [selectedCurrency, setSelectedCurrency] = useState<Currency>();
+
+  const { isDropdownOpen, closeDropdown } = useDropdown(
+    CurrencyPickerHotkeyScope.CurrencyPicker,
+  );
+
+  const handleChange = (currency: Currency) => {
+    onChange(currency);
+    closeDropdown();
+  };
+
+  useEffect(() => {
+    const currency = currencies.find(({ value }) => value === valueCode);
+    if (currency) {
+      setSelectedCurrency(currency);
+    }
+  }, [valueCode, currencies]);
+
+  return (
+    <Dropdown
+      dropdownMenuWidth={200}
+      dropdownId="currncy-picker-dropdown-id"
+      dropdownHotkeyScope={{ scope: CurrencyPickerHotkeyScope.CurrencyPicker }}
+      clickableComponent={
+        <StyledDropdownButtonContainer isUnfolded={isDropdownOpen}>
+          <StyledIconContainer>
+            {selectedCurrency ? selectedCurrency.value : CurrencyCode.USD}
+            <IconChevronDown size={theme.icon.size.sm} />
+          </StyledIconContainer>
+        </StyledDropdownButtonContainer>
+      }
+      dropdownComponents={
+        <CurrencyPickerDropdownSelect
+          currencies={currencies}
+          selectedCurrency={selectedCurrency}
+          onChange={handleChange}
+        />
+      }
+      dropdownPlacement="bottom-start"
+      dropdownOffset={{ x: 0, y: 4 }}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
new file mode 100644
index 000000000000..98f4348f0f97
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
@@ -0,0 +1,71 @@
+import { useMemo, useState } from 'react';
+
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar';
+
+import { Currency } from './CurrencyPickerDropdownButton';
+
+export const CurrencyPickerDropdownSelect = ({
+  currencies,
+  selectedCurrency,
+  onChange,
+}: {
+  currencies: Currency[];
+  selectedCurrency?: Currency;
+  onChange: (currency: Currency) => void;
+}) => {
+  const [searchFilter, setSearchFilter] = useState<string>('');
+
+  const filteredCurrencies = useMemo(
+    () =>
+      currencies.filter(
+        ({ value, label }) =>
+          value
+            .toLocaleLowerCase()
+            .includes(searchFilter.toLocaleLowerCase()) ||
+          label.toLocaleLowerCase().includes(searchFilter.toLocaleLowerCase()),
+      ),
+    [currencies, searchFilter],
+  );
+
+  return (
+    <DropdownMenu width="200px" disableBlur>
+      <DropdownMenuSearchInput
+        value={searchFilter}
+        onChange={(event) => setSearchFilter(event.target.value)}
+        autoFocus
+      />
+      <DropdownMenuSeparator />
+      <DropdownMenuItemsContainer hasMaxHeight>
+        {filteredCurrencies.length === 0 ? (
+          <MenuItem text="No result" />
+        ) : (
+          <>
+            {selectedCurrency && (
+              <MenuItemSelectAvatar
+                key={selectedCurrency.value}
+                selected={true}
+                onClick={() => onChange(selectedCurrency)}
+                text={`${selectedCurrency.label} (${selectedCurrency.value})`}
+              />
+            )}
+            {filteredCurrencies.map((item) =>
+              selectedCurrency?.value === item.value ? null : (
+                <MenuItemSelectAvatar
+                  key={item.value}
+                  selected={selectedCurrency?.value === item.value}
+                  onClick={() => onChange(item)}
+                  text={`${item.label} (${item.value})`}
+                />
+              ),
+            )}
+          </>
+        )}
+      </DropdownMenuItemsContainer>
+    </DropdownMenu>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts b/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts
new file mode 100644
index 000000000000..cfeaebd04a65
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts
@@ -0,0 +1,3 @@
+export enum CurrencyPickerHotkeyScope {
+  CurrencyPicker = 'currency-picker',
+}
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
index 2dc6846bac9b..f8d4b9deefcd 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
@@ -9,7 +9,6 @@ import { ObjectTasks } from '@/activities/tasks/components/ObjectTasks';
 import { Timeline } from '@/activities/timeline/components/Timeline';
 import { TimelineQueryEffect } from '@/activities/timeline/components/TimelineQueryEffect';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import {
   IconCalendarEvent,
@@ -65,11 +64,6 @@ export const ShowPageRightContainer = ({
   const { getActiveTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
   const activeTabId = useRecoilValue(getActiveTabIdState());
 
-  const { objectMetadataItem: targetableObjectMetadataItem } =
-    useObjectMetadataItem({
-      objectNameSingular: targetableObject.targetObjectNameSingular,
-    });
-
   const shouldDisplayCalendarTab = useIsFeatureEnabled('IS_CALENDAR_ENABLED');
   const shouldDisplayEmailsTab =
     (emails &&
@@ -101,7 +95,6 @@ export const ShowPageRightContainer = ({
       title: 'Files',
       Icon: IconPaperclip,
       hide: !notes,
-      disabled: targetableObjectMetadataItem.isCustom,
     },
     {
       id: 'emails',
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
index 59026208dead..14756606eb3e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
@@ -12,7 +12,7 @@ import {
 import { StyledMenuItemSelect } from './MenuItemSelect';
 
 type MenuItemSelectAvatarProps = {
-  avatar: ReactNode;
+  avatar?: ReactNode;
   selected: boolean;
   text: string;
   className?: string;
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
index a227bd65244e..4dc1fd3aa470 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
@@ -75,7 +75,7 @@ export const RecordShowPage = () => {
           labelIdentifierFieldValue?.firstName,
           labelIdentifierFieldValue?.lastName,
         ].join(' ')
-      : labelIdentifierFieldValue;
+      : `${labelIdentifierFieldValue}`;
 
   return (
     <PageContainer>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
index e1090d1f2e8d..e68ec8a27c58 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
@@ -2,10 +2,13 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
+import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
 import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
 import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getActiveFieldMetadataItems } from '@/object-metadata/utils/getActiveFieldMetadataItems';
+import { getDisabledFieldMetadataItems } from '@/object-metadata/utils/getDisabledFieldMetadataItems';
 import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -29,7 +32,6 @@ import { Table } from '@/ui/layout/table/components/Table';
 import { TableHeader } from '@/ui/layout/table/components/TableHeader';
 import { TableSection } from '@/ui/layout/table/components/TableSection';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 const StyledDiv = styled.div`
   display: flex;
@@ -57,11 +59,11 @@ export const SettingsObjectDetail = () => {
 
   if (!activeObjectMetadataItem) return null;
 
-  const activeMetadataFields = activeObjectMetadataItem.fields.filter(
-    (metadataField) => metadataField.isActive && !metadataField.isSystem,
+  const activeMetadataFields = getActiveFieldMetadataItems(
+    activeObjectMetadataItem,
   );
-  const disabledMetadataFields = activeObjectMetadataItem.fields.filter(
-    (metadataField) => !metadataField.isActive && !metadataField.isSystem,
+  const disabledMetadataFields = getDisabledFieldMetadataItems(
+    activeObjectMetadataItem,
   );
 
   const handleDisableObject = async () => {
@@ -128,7 +130,7 @@ export const SettingsObjectDetail = () => {
                   const canBeSetAsLabelIdentifier =
                     activeObjectMetadataItem.isCustom &&
                     !isLabelIdentifier &&
-                    [FieldMetadataType.Text, FieldMetadataType.Number].includes(
+                    LABEL_IDENTIFIER_FIELD_METADATA_TYPES.includes(
                       activeMetadataField.type,
                     );
 
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
index 42c9779ab3ba..c915a1612e21 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
@@ -15,6 +15,7 @@ import {
   SettingsDataModelObjectAboutForm,
   settingsDataModelObjectAboutFormSchema,
 } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
+import { settingsDataModelObjectIdentifiersFormSchema } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
 import { SettingsDataModelObjectSettingsFormCard } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard';
 import { settingsUpdateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
@@ -28,7 +29,10 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
-const objectEditFormSchema = settingsDataModelObjectAboutFormSchema;
+const objectEditFormSchema = z
+  .object({})
+  .merge(settingsDataModelObjectAboutFormSchema)
+  .merge(settingsDataModelObjectIdentifiersFormSchema);
 
 type SettingsDataModelObjectEditFormValues = z.infer<
   typeof objectEditFormSchema
diff --git a/packages/twenty-server/src/integrations/message-queue/jobs.module.ts b/packages/twenty-server/src/integrations/message-queue/jobs.module.ts
index d38b47fab4a2..c3d2442c521a 100644
--- a/packages/twenty-server/src/integrations/message-queue/jobs.module.ts
+++ b/packages/twenty-server/src/integrations/message-queue/jobs.module.ts
@@ -33,6 +33,7 @@ import { UserWorkspaceModule } from 'src/core/user-workspace/user-workspace.modu
 import { StripeModule } from 'src/core/billing/stripe/stripe.module';
 import { Workspace } from 'src/core/workspace/workspace.entity';
 import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
+import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
 
 @Module({
   imports: [
@@ -51,6 +52,7 @@ import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
     ThreadCleanerModule,
     TypeORMModule,
     TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
     UserModule,
     UserWorkspaceModule,
     WorkspaceDataSourceModule,
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
index 191527ad54f4..85828e8db779 100644
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
@@ -397,6 +397,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
                 createdObjectMetadata,
               ),
               referencedTableColumnName: 'id',
+              onDelete: RelationOnDeleteAction.CASCADE,
             },
           ],
         },
diff --git a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts
index 44201a362533..6b98f14c1724 100644
--- a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts
+++ b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts
@@ -26,6 +26,7 @@ import { generateMigrationName } from 'src/metadata/workspace-migration/utils/ge
 import {
   RelationMetadataEntity,
   RelationMetadataType,
+  RelationOnDeleteAction,
 } from './relation-metadata.entity';
 
 @Injectable()
@@ -209,6 +210,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
               isUnique:
                 relationMetadataInput.relationType ===
                 RelationMetadataType.ONE_TO_ONE,
+              onDelete: RelationOnDeleteAction.SET_NULL,
             },
           ],
         },
diff --git a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts b/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts
index 9f5712d3ad12..9d02f2705f4c 100644
--- a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts
+++ b/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
-import { Repository } from 'typeorm';
+import { Repository, In } from 'typeorm';
 
 import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
 
@@ -13,6 +13,7 @@ import {
   GmailPartialSyncJobData,
   GmailPartialSyncJob,
 } from 'src/workspace/messaging/jobs/gmail-partial-sync.job';
+import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
 
 @Injectable()
 export class FetchAllWorkspacesMessagesJob
@@ -23,6 +24,8 @@ export class FetchAllWorkspacesMessagesJob
   constructor(
     @InjectRepository(Workspace, 'core')
     private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(DataSourceEntity, 'metadata')
+    private readonly dataSourceRepository: Repository<DataSourceEntity>,
     @Inject(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
     private readonly connectedAccountService: ConnectedAccountService,
@@ -38,7 +41,17 @@ export class FetchAllWorkspacesMessagesJob
       })
     ).map((workspace) => workspace.id);
 
-    for (const workspaceId of workspaceIds) {
+    const dataSources = await this.dataSourceRepository.find({
+      where: {
+        workspaceId: In(workspaceIds),
+      },
+    });
+
+    const workspaceIdsWithDataSources = new Set(
+      dataSources.map((dataSource) => dataSource.workspaceId),
+    );
+
+    for (const workspaceId of workspaceIdsWithDataSources) {
       await this.fetchWorkspaceMessages(workspaceId);
     }
   }
@@ -55,9 +68,6 @@ export class FetchAllWorkspacesMessagesJob
             workspaceId,
             connectedAccountId: connectedAccount.id,
           },
-          {
-            retryLimit: 2,
-          },
         );
       }
     } catch (error) {
diff --git a/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts b/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts
index b911f6122810..1340236304d8 100644
--- a/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts
+++ b/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts
@@ -56,9 +56,6 @@ export class GmailPartialSyncCommand extends CommandRunner {
           workspaceId,
           connectedAccountId: connectedAccount.id,
         },
-        {
-          retryLimit: 2,
-        },
       );
     }
   }
diff --git a/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts b/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts
index bde65dc2a15d..a88ef5db67f5 100644
--- a/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts
+++ b/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts
@@ -187,8 +187,6 @@ export class FetchMessagesByBatchesService {
     const formattedResponse = Promise.all(
       parsedResponses.map(async (message: GmailMessageParsedResponse) => {
         if (message.error) {
-          console.log('Error', message.error);
-
           errors.push(message.error);
 
           return;
diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
index fae82f7afbdd..7ce6419fdf3e 100644
--- a/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
+++ b/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
@@ -213,9 +213,25 @@ export class GmailPartialSyncService {
     }
 
     if (errors.length) {
-      throw new Error(
-        `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId} during partial-sync`,
+      this.logger.error(
+        `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId} during partial-sync: ${JSON.stringify(
+          errors,
+          null,
+          2,
+        )}`,
       );
+      const errorsCanBeIgnored = errors.every((error) => error.code === 404);
+      const errorsShouldBeRetried = errors.some((error) => error.code === 429);
+
+      if (errorsShouldBeRetried) {
+        return;
+      }
+
+      if (!errorsCanBeIgnored) {
+        throw new Error(
+          `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId} during partial-sync`,
+        );
+      }
     }
     startTime = Date.now();
 
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts b/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
index 393fde818753..1e3b4b1d2603 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
+++ b/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
@@ -4,7 +4,7 @@ export const convertOnDeleteActionToOnDelete = (
   onDeleteAction: RelationOnDeleteAction | undefined,
 ): 'CASCADE' | 'SET NULL' | 'RESTRICT' | 'NO ACTION' | undefined => {
   if (!onDeleteAction) {
-    return;
+    return 'SET NULL';
   }
 
   switch (onDeleteAction) {
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata.ts
new file mode 100644
index 000000000000..d22382d987e3
--- /dev/null
+++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata.ts
@@ -0,0 +1,47 @@
+import { FeatureFlagKeys } from 'src/core/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/workspace/workspace-sync-metadata/decorators/gate.decorator';
+import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/calendar-event.object-metadata';
+
+@ObjectMetadata({
+  namePlural: 'calendarChannelEventAssociations',
+  labelSingular: 'Calendar Channel Event Association',
+  labelPlural: 'Calendar Channel Event Associations',
+  description: 'Calendar Channel Event Associations',
+  icon: 'IconCalendar',
+})
+@IsSystem()
+@Gate({
+  featureFlag: FeatureFlagKeys.IsCalendarEnabled,
+})
+export class CalendarChannelEventAssociationObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Channel ID',
+    description: 'Channel ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarChannelId',
+  })
+  calendarChannel: CalendarEventObjectMetadata;
+
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Event ID',
+    description: 'Event ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarEventId',
+  })
+  calendarEvent: CalendarEventObjectMetadata;
+
+  @FieldMetadata({
+    type: FieldMetadataType.TEXT,
+    label: 'Event external ID',
+    description: 'Event external ID',
+    icon: 'IconCalendar',
+  })
+  eventExternalId: string;
+}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel.object-metadata.ts
index 267844cc57af..b30e06332c6c 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel.object-metadata.ts
+++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-channel.object-metadata.ts
@@ -1,3 +1,7 @@
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/metadata/relation-metadata/relation-metadata.entity';
 import { FeatureFlagKeys } from 'src/core/feature-flag/feature-flag.entity';
 import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
 import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
@@ -6,6 +10,8 @@ import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-sy
 import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
 import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata';
+import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
 
 export enum CalendarChannelVisibility {
   METADATA = 'METADATA',
@@ -90,4 +96,17 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
     icon: 'IconReload',
   })
   syncCursor: string;
+
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Channel Event Associations',
+    description: 'Calendar Channel Event Associations',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  calendarChannelEventAssociations: CalendarChannelEventAssociationObjectMetadata[];
 }
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-event.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-event.object-metadata.ts
index 7aa7e7af5868..02857e619a1e 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-event.object-metadata.ts
+++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/calendar-event.object-metadata.ts
@@ -10,6 +10,7 @@ import { Gate } from 'src/workspace/workspace-sync-metadata/decorators/gate.deco
 import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
 import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
 import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata';
 import { CalendarEventAttendeeObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/calendar-event-attendee.object-metadata';
 
 @ObjectMetadata({
@@ -128,6 +129,23 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
   })
   recurringEventExternalId: string;
 
+  @FieldMetadata({
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Channel Event Associations',
+    description: 'Calendar Channel Event Associations',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+    inverseSideFieldKey: 'calendarEvent',
+  })
+  @Gate({
+    featureFlag: 'IS_CALENDAR_ENABLED',
+  })
+  calendarChannelEventAssociations: CalendarChannelEventAssociationObjectMetadata[];
+
   @FieldMetadata({
     type: FieldMetadataType.RELATION,
     label: 'Event Attendees',
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts
index 6c476298d476..988b1a22af66 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts
+++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts
@@ -24,6 +24,7 @@ import { ViewSortObjectMetadata } from 'src/workspace/workspace-sync-metadata/st
 import { ViewObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata';
 import { WebhookObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/webhook.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/calendar-channel-event-association.object-metadata';
 
 export const standardObjectMetadataDefinitions = [
   ActivityTargetObjectMetadata,
@@ -51,5 +52,6 @@ export const standardObjectMetadataDefinitions = [
   MessageChannelMessageAssociationObjectMetadata,
   CalendarEventObjectMetadata,
   CalendarChannelObjectMetadata,
+  CalendarChannelEventAssociationObjectMetadata,
   CalendarEventAttendeeObjectMetadata,
 ];
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts
index 1b892b8978ee..09155cba437f 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts
+++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts
@@ -191,7 +191,6 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
   @RelationMetadata({
     type: RelationMetadataType.ONE_TO_MANY,
     inverseSideTarget: () => CalendarEventAttendeeObjectMetadata,
-    inverseSideFieldKey: 'person',
   })
   @Gate({
     featureFlag: 'IS_CALENDAR_ENABLED',
diff --git a/yarn.lock b/yarn.lock
index ab8d79d58bb9..ae19e6a131fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15677,6 +15677,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.mapvalues@npm:^4.6.9":
+  version: 4.6.9
+  resolution: "@types/lodash.mapvalues@npm:4.6.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: 09216965c2c64854c8c765f38f436333e931b98638a0b9d996bda7b6d538593a4cfe53cad7415d50593be48d76798763b97dc2d7925ab200dce1fa5b630ed3b4
+  languageName: node
+  linkType: hard
+
 "@types/lodash.merge@npm:^4.6.7":
   version: 4.6.9
   resolution: "@types/lodash.merge@npm:4.6.9"
@@ -44587,6 +44596,7 @@ __metadata:
     "@types/lodash.isequal": "npm:^4.5.7"
     "@types/lodash.isobject": "npm:^3.0.7"
     "@types/lodash.kebabcase": "npm:^4.1.7"
+    "@types/lodash.mapvalues": "npm:^4.6.9"
     "@types/lodash.merge": "npm:^4.6.7"
     "@types/lodash.pick": "npm:^4.3.7"
     "@types/lodash.snakecase": "npm:^4.1.7"
@@ -44685,6 +44695,7 @@ __metadata:
     lodash.isequal: "npm:^4.5.0"
     lodash.isobject: "npm:^3.0.2"
     lodash.kebabcase: "npm:^4.1.1"
+    lodash.mapvalues: "npm:^4.6.0"
     lodash.merge: "npm:^4.6.2"
     lodash.omit: "npm:^4.5.0"
     lodash.pick: "npm:^4.4.0"