diff --git a/.changeset/new-bottles-tap.md b/.changeset/new-bottles-tap.md
new file mode 100644
index 000000000..21758c1d6
--- /dev/null
+++ b/.changeset/new-bottles-tap.md
@@ -0,0 +1,5 @@
+---
+'@monite/sdk-react': minor
+---
+
+feat(DEV-13687) Argon changes during invoice creation
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx
index 0bf0bed62..e3864f14a 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx
@@ -65,7 +65,7 @@ const CreateReceivablesBase = ({
     isLoading: isEntityLoading,
     isNonCompliantFlow,
   } = useMyEntity();
-
+  const fallbackCurrency = 'USD';
   const methods = useForm<CreateReceivablesFormProps>({
     resolver: yupResolver(
       getCreateInvoiceValidationSchema(
@@ -236,33 +236,31 @@ const CreateReceivablesBase = ({
             onSubmit={handleSubmit(handleCreateReceivable)}
             style={{ marginBottom: theme.spacing(7) }}
           >
+            <Box>
+              <Typography
+                variant="h1"
+                sx={{ mb: 2 }}
+                data-testid={ActiveInvoiceTitleTestId.ActiveInvoiceTitleTestId}
+              >
+                {t(i18n)`Invoice`}{' '}
+                <Typography component="span" variant="h1" color="textSecondary">
+                  #{INVOICE_DOCUMENT_AUTO_ID}
+                </Typography>
+              </Typography>
+            </Box>
             <Stack direction="column" spacing={7}>
               <BillToSection disabled={createReceivable.isPending} />
-              <Box>
-                <Typography
-                  variant="h1"
-                  sx={{ mb: 2 }}
-                  data-testid={
-                    ActiveInvoiceTitleTestId.ActiveInvoiceTitleTestId
-                  }
-                >
-                  {t(i18n)`Invoice`}{' '}
-                  <Typography
-                    component="span"
-                    variant="h1"
-                    color="textSecondary"
-                  >
-                    #{INVOICE_DOCUMENT_AUTO_ID}
-                  </Typography>
-                </Typography>
-                <EntitySection disabled={createReceivable.isPending} />
-              </Box>
               <ItemsSection
-                defaultCurrency={settings?.currency?.default}
+                defaultCurrency={
+                  settings?.currency?.default || fallbackCurrency
+                }
                 actualCurrency={actualCurrency}
                 onCurrencyChanged={setActualCurrency}
                 isNonVatSupported={isNonVatSupported}
               />
+              <Box>
+                <EntitySection disabled={createReceivable.isPending} />
+              </Box>
               <ReminderSection
                 disabled={createReceivable.isPending}
                 onUpdateOverdueReminder={onEditOverdueReminder}
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption.tsx
index 152386df3..6c91240d8 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption.tsx
@@ -15,7 +15,7 @@ export function CountryInvoiceOption({ code }: CountryOptionProps) {
   return (
     <img
       css={css`
-        margin-right: ${theme.spacing(1)};
+        margin: 0 ${theme.spacing(1)};
       `}
       loading="lazy"
       width="25"
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx
index e04829f9d..ef05713c6 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx
@@ -2,28 +2,23 @@ import {
   Dispatch,
   SetStateAction,
   useCallback,
+  useEffect,
   useMemo,
   useState,
 } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { usePrevious } from 'react-use';
 
 import { components } from '@/api';
-import {
-  getCounterpartName,
-  getIndividualName,
-} from '@/components/counterparts/helpers';
+import { getCounterpartName } from '@/components/counterparts/helpers';
 import { CountryInvoiceOption } from '@/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption';
 import { CreateCounterpartDialog } from '@/components/receivables/InvoiceDetails/CreateReceivable/sections/components/CreateCounterpartDialog';
 import { useRootElements } from '@/core/context/RootElementsProvider';
 import {
   useCounterpartAddresses,
   useCounterpartById,
-  useCounterpartContactList,
   useCounterpartList,
   useCounterpartVatList,
 } from '@/core/queries';
-import { getAPIErrorMessage } from '@/core/utils/getAPIErrorMessage';
 import { t } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import AddIcon from '@mui/icons-material/Add';
@@ -83,11 +78,6 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
 
   const counterpartId = watch('counterpart_id');
 
-  const {
-    data: counterpartContacts,
-    error: contactPersonError,
-    isLoading: isContactPersonsLoading,
-  } = useCounterpartContactList(counterpartId);
   const { data: counterpartVats, isLoading: isCounterpartVatsLoading } =
     useCounterpartVatList(counterpartId);
   const { data: counterpart, isLoading: isCounterpartLoading } =
@@ -102,14 +92,33 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
 
   const [isCreateCounterpartOpened, setIsCreateCounterpartOpened] =
     useState<boolean>(false);
-  const defaultContactName = counterpartContacts?.find(
-    (contact) => contact.is_default
-  );
-
-  const contactPersonDisplayableError =
-    usePrevious(contactPersonError) ?? contactPersonError;
+  const [isShippingAddressShown, setIsShippingAddressShown] =
+    useState<boolean>(false);
 
   const className = 'Monite-CreateReceivable-CustomerSection';
+  const isHiddenForUS =
+    !_isCounterpartAddressesLoading &&
+    Array.isArray(counterpartAddresses?.data) &&
+    counterpartAddresses.data.length > 0 &&
+    counterpartAddresses.data[0]?.country === 'US';
+  const isAddressFormDisabled =
+    isCounterpartAddressesLoading ||
+    !counterpartId ||
+    disabled ||
+    counterpartAddresses?.data.length === 1;
+
+  useEffect(() => {
+    if (counterpartAddresses && counterpartAddresses.data.length === 1) {
+      setValue('default_shipping_address_id', counterpartAddresses.data[0].id);
+      setValue('default_billing_address_id', counterpartAddresses.data[0].id);
+    }
+  }, [counterpartAddresses, setValue]);
+
+  useEffect(() => {
+    if (counterpartVats && counterpartVats.data.length === 1) {
+      setValue('counterpart_vat_id_id', counterpartVats.data[0].id);
+    }
+  }, [counterpartVats, setValue]);
 
   return (
     <Stack spacing={2} className={className}>
@@ -126,40 +135,6 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
       />
       {counterpartId && (
         <>
-          <Box>
-            <TextField
-              disabled
-              fullWidth
-              variant="standard"
-              label={t(i18n)`Contact person`}
-              value={
-                defaultContactName ? getIndividualName(defaultContactName) : ''
-              }
-              InputProps={{
-                startAdornment:
-                  counterpartId && isContactPersonsLoading ? (
-                    <CircularProgress size={20} />
-                  ) : null,
-              }}
-            />
-            <Collapse in={Boolean(contactPersonError)}>
-              <FormHelperText>
-                {contactPersonDisplayableError &&
-                  getAPIErrorMessage(i18n, contactPersonDisplayableError)}
-              </FormHelperText>
-            </Collapse>
-            <Collapse
-              in={
-                !contactPersonError &&
-                !isContactPersonsLoading &&
-                counterpartContacts?.length === 0
-              }
-            >
-              <FormHelperText>{t(
-                i18n
-              )`No contact persons available`}</FormHelperText>
-            </Collapse>
-          </Box>
           <Controller
             name="counterpart_vat_id_id"
             control={control}
@@ -170,9 +145,10 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
                 disabled={
                   isCounterpartVatsLoading ||
                   !counterpartVats?.data ||
-                  counterpartVats?.data.length === 0 ||
+                  counterpartVats?.data.length < 2 ||
                   disabled
                 }
+                hidden={isHiddenForUS}
                 error={Boolean(error)}
               >
                 <InputLabel htmlFor={field.name}>{t(i18n)`VAT ID`}</InputLabel>
@@ -205,6 +181,7 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
               variant="standard"
               label={t(i18n)`TAX ID`}
               value={counterpart?.tax_id ?? ''}
+              hidden={isHiddenForUS}
               InputProps={{
                 startAdornment: isCounterpartLoading ? (
                   <CircularProgress size={20} />
@@ -224,11 +201,13 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
                 ),
               }}
             />
-            <Collapse
-              in={counterpart && !counterpart.tax_id && !isCounterpartLoading}
-            >
-              <FormHelperText>{t(i18n)`No TAX ID available`}</FormHelperText>
-            </Collapse>
+            {!isHiddenForUS && (
+              <Collapse
+                in={counterpart && !counterpart.tax_id && !isCounterpartLoading}
+              >
+                <FormHelperText>{t(i18n)`No TAX ID available`}</FormHelperText>
+              </Collapse>
+            )}
           </Box>
           <Controller
             name="default_billing_address_id"
@@ -239,9 +218,7 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
                 fullWidth
                 required
                 error={Boolean(error)}
-                disabled={
-                  isCounterpartAddressesLoading || !counterpartId || disabled
-                }
+                disabled={isAddressFormDisabled}
               >
                 <InputLabel id={field.name}>{t(
                   i18n
@@ -267,57 +244,69 @@ export const CustomerSection = ({ disabled }: SectionGeneralProps) => {
               </FormControl>
             )}
           />
-          <Controller
-            name="default_shipping_address_id"
-            control={control}
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                variant="standard"
-                fullWidth
-                error={Boolean(error)}
-                disabled={
-                  isCounterpartAddressesLoading || !counterpartId || disabled
-                }
-              >
-                <InputLabel htmlFor={field.name}>{t(
-                  i18n
-                )`Shipping address`}</InputLabel>
-                <Select
-                  {...field}
-                  id={field.name}
-                  labelId={field.name}
-                  MenuProps={{ container: root }}
-                  label={t(i18n)`Shipping address`}
-                  startAdornment={
-                    isCounterpartAddressesLoading ? (
-                      <CircularProgress size={20} />
-                    ) : null
-                  }
-                  endAdornment={
-                    <IconButton
-                      sx={{
-                        visibility: field.value ? 'visible' : 'hidden ',
-                        mr: 2,
-                      }}
-                      size="small"
-                      onClick={(event) => {
-                        event.preventDefault();
-                        setValue('default_shipping_address_id', '');
-                      }}
-                    >
-                      <ClearIcon fontSize="small" />
-                    </IconButton>
-                  }
+          {!isShippingAddressShown && (
+            <Button
+              sx={{ alignSelf: 'baseline' }}
+              startIcon={<AddIcon />}
+              onClick={() => setIsShippingAddressShown(true)}
+            >
+              {t(i18n)`Shipping address`}
+            </Button>
+          )}
+          {isShippingAddressShown && (
+            <Controller
+              name="default_shipping_address_id"
+              control={control}
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  variant="standard"
+                  fullWidth
+                  error={Boolean(error)}
+                  disabled={isAddressFormDisabled}
                 >
-                  {counterpartAddresses?.data.map((address) => (
-                    <MenuItem key={address.id} value={address.id}>
-                      <CounterpartAddressView address={address} />
-                    </MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
-            )}
-          />
+                  <InputLabel htmlFor={field.name}>{t(
+                    i18n
+                  )`Shipping address`}</InputLabel>
+                  <Select
+                    {...field}
+                    id={field.name}
+                    labelId={field.name}
+                    MenuProps={{ container: root }}
+                    label={t(i18n)`Shipping address`}
+                    startAdornment={
+                      isCounterpartAddressesLoading ? (
+                        <CircularProgress size={20} />
+                      ) : null
+                    }
+                    endAdornment={
+                      counterpartAddresses &&
+                      counterpartAddresses?.data.length > 1 && (
+                        <IconButton
+                          sx={{
+                            visibility: field.value ? 'visible' : 'hidden ',
+                            mr: 2,
+                          }}
+                          size="small"
+                          onClick={(event) => {
+                            event.preventDefault();
+                            setValue('default_shipping_address_id', '');
+                          }}
+                        >
+                          <ClearIcon fontSize="small" />
+                        </IconButton>
+                      )
+                    }
+                  >
+                    {counterpartAddresses?.data.map((address) => (
+                      <MenuItem key={address.id} value={address.id}>
+                        <CounterpartAddressView address={address} />
+                      </MenuItem>
+                    ))}
+                  </Select>
+                </FormControl>
+              )}
+            />
+          )}
         </>
       )}
     </Stack>
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx
index 0005a214e..788775019 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx
@@ -3,7 +3,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 import { CreateReceivablesFormProps } from '@/components/receivables/InvoiceDetails/CreateReceivable/validation';
 import { t } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { Box, FormControl, TextField } from '@mui/material';
+import { Box, FormControl, TextField, Typography } from '@mui/material';
 
 import type { SectionGeneralProps } from './Section.types';
 
@@ -21,7 +21,17 @@ export const EntitySection = ({ disabled }: EntitySectionProps) => {
   const { control } = useFormContext<CreateReceivablesFormProps>();
 
   return (
-    <Box>
+    <Box
+      sx={{ borderBottom: '1px solid', borderBottomColor: 'divider' }}
+      pb={10}
+    >
+      <Typography
+        variant="caption"
+        color="textSecondary"
+        sx={{ lineHeight: 2 }}
+      >
+        {t(i18n)`Memo`}
+      </Typography>
       <Controller
         name="memo"
         control={control}
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx
index c9ac903aa..5c9ebd78b 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx
@@ -432,9 +432,7 @@ export const ItemsSection = ({
           justifyContent: 'flex-end',
           borderRadius: 0,
           border: 0,
-          borderBottom: '1px solid',
-          borderBottomColor: 'divider',
-          paddingBottom: 6,
+          paddingBottom: 4,
         }}
       >
         <CardContent sx={{ maxWidth: '560px', width: '100%' }}>
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx
index dd727a4d4..f56838368 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx
@@ -7,7 +7,8 @@ import { useRootElements } from '@/core/context/RootElementsProvider';
 import { t } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { LockOutlined } from '@mui/icons-material';
-import { FormControlLabel, Checkbox, Box, Typography } from '@mui/material';
+import AddIcon from '@mui/icons-material/Add';
+import { Button, Box, Typography } from '@mui/material';
 import { DatePicker } from '@mui/x-date-pickers';
 
 import { PaymentSection } from '../../PaymentSection';
@@ -15,7 +16,7 @@ import { SectionGeneralProps } from '../../Section.types';
 
 export const FullfillmentSummary = ({ disabled }: SectionGeneralProps) => {
   const { i18n } = useLingui();
-  const { control, resetField, setValue, watch } =
+  const { control, resetField, watch } =
     useFormContext<CreateReceivablesFormProps>();
 
   const { api, locale } = useMoniteContext();
@@ -27,8 +28,7 @@ export const FullfillmentSummary = ({ disabled }: SectionGeneralProps) => {
 
   const dateTime = i18n.date(new Date(), locale.dateTimeFormat);
 
-  const [isSameAsInvoiceDateChecked, setIsSameAsInvoiceDateChecked] =
-    useState<boolean>(false);
+  const [isFieldShown, setIsFieldShown] = useState<boolean>(false);
 
   const paymentTermsId = watch('payment_terms_id');
 
@@ -38,114 +38,115 @@ export const FullfillmentSummary = ({ disabled }: SectionGeneralProps) => {
 
   return (
     <>
-      <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
-        <Box>
-          <Typography variant="body2" color="textSecondary" fontWeight={500}>
+      <Box
+        sx={{
+          display: 'flex',
+          flexDirection: 'row',
+          justifyContent: 'space-between',
+        }}
+      >
+        <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+          <Typography
+            variant="body2"
+            color="textSecondary"
+            mb={0.5}
+            fontWeight={500}
+          >
             {t(i18n)`Issue date`}
           </Typography>
-          <Box sx={{ display: 'flex', gap: 1, alignItems: 'center' }}>
+          <Box>
             <Typography variant="body2" color="textSecondary">
               {dateTime}
             </Typography>
-            <LockOutlined sx={{ color: 'divider', width: '16px' }} />
-            <Typography variant="body2" color="textSecondary">
+            <Typography
+              variant="body2"
+              color="textSecondary"
+              sx={{ display: 'flex', alignItems: 'center', gap: '5px' }}
+            >
+              <LockOutlined sx={{ color: 'divider', width: '16px' }} />
               {t(i18n)`Set on issuance`}
             </Typography>
           </Box>
         </Box>
-        <Box>
-          <Typography variant="body2" color="textSecondary" fontWeight={500}>
+        <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+          <Typography
+            variant="body2"
+            color="textSecondary"
+            mb={0.5}
+            fontWeight={500}
+          >
             {t(i18n)`Due date`}
           </Typography>
-          <Box sx={{ display: 'flex', gap: 1, alignItems: 'center' }}>
+          <Box>
             <Typography variant="body2" color="textSecondary">
               {t(i18n)`${selectedPaymentTerm?.name ?? 'Not selected'}`}
             </Typography>
-            <LockOutlined sx={{ color: 'divider', width: '16px' }} />
-            <Typography variant="body2" color="textSecondary">
+
+            <Typography
+              variant="body2"
+              color="textSecondary"
+              sx={{ display: 'flex', alignItems: 'center', gap: '5px' }}
+            >
+              <LockOutlined sx={{ color: 'divider', width: '16px' }} />
               {t(i18n)`Set by payment term`}
             </Typography>
           </Box>
         </Box>
       </Box>
       <Box mt={2}>
-        <Controller
-          name="fulfillment_date"
-          control={control}
-          render={({ field, fieldState: { error } }) => (
-            <>
-              <DatePicker
-                {...field}
-                minDate={new Date()}
-                disabled={disabled}
-                onChange={(date) => {
-                  const today = new Date();
-
-                  if (today.toDateString() === date?.toDateString()) {
-                    setIsSameAsInvoiceDateChecked(true);
-                  } else {
-                    setIsSameAsInvoiceDateChecked(false);
-                  }
-
-                  field.onChange(date);
-                }}
-                label={t(i18n)`Fulfillment date`}
-                slotProps={{
-                  popper: {
-                    container: root,
-                  },
-                  dialog: {
-                    container: root,
-                  },
-                  actionBar: {
-                    actions: ['today'],
-                  },
-                  textField: {
-                    fullWidth: true,
-                    helperText: error?.message,
-                  },
-                  field: {
-                    clearable: true,
-                    onClear: () => {
-                      resetField(field.name);
-                      setIsSameAsInvoiceDateChecked(false);
-                    },
-                  },
-                }}
-                views={['year', 'month', 'day']}
-              />
-              <FormControlLabel
-                control={
-                  <Checkbox
-                    size="small"
-                    checked={isSameAsInvoiceDateChecked}
-                    onChange={(event) => {
-                      const checked = event.target.checked;
-
-                      if (checked) {
-                        setValue(field.name, new Date(), {
-                          shouldValidate: true,
-                        });
-                      } else {
-                        resetField(field.name);
-                      }
-
-                      setIsSameAsInvoiceDateChecked(checked);
-                    }}
-                  />
-                }
-                label={t(i18n)`Same as invoice date`}
-              />
-            </>
-          )}
-        />
-        <Box sx={{ mt: 1 }}>
+        <Box sx={{ mt: 1, mb: 2 }}>
           <PaymentSection
             disabled={disabled}
             paymentTerms={paymentTerms}
             isLoading={isPaymentTermsLoading}
           />
         </Box>
+        {!isFieldShown && (
+          <Button startIcon={<AddIcon />} onClick={() => setIsFieldShown(true)}>
+            {t(i18n)`Fulfillment date`}
+          </Button>
+        )}
+        {isFieldShown && (
+          <Controller
+            name="fulfillment_date"
+            control={control}
+            render={({ field, fieldState: { error } }) => (
+              <>
+                <DatePicker
+                  {...field}
+                  minDate={new Date()}
+                  disabled={disabled}
+                  onChange={(date) => {
+                    field.onChange(date);
+                  }}
+                  label={t(i18n)`Fulfillment date`}
+                  slotProps={{
+                    popper: {
+                      container: root,
+                    },
+                    dialog: {
+                      container: root,
+                    },
+                    actionBar: {
+                      actions: ['today'],
+                    },
+                    textField: {
+                      fullWidth: true,
+                      helperText: error?.message,
+                    },
+                    field: {
+                      clearable: true,
+                      onClear: () => {
+                        resetField(field.name);
+                      },
+                    },
+                  }}
+                  views={['year', 'month', 'day']}
+                />
+              </>
+            )}
+          />
+        )}
       </Box>
     </>
   );
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx
index 8cdc86fab..470a01478 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx
@@ -1,3 +1,4 @@
+import { useEffect } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
 import { CountryInvoiceOption } from '@/components/receivables/InvoiceDetails/CreateReceivable/components/CountryInvoiceOption';
@@ -21,7 +22,7 @@ import {
 
 export const YourVatDetailsForm = ({ disabled }: { disabled: boolean }) => {
   const { i18n } = useLingui();
-  const { control } = useFormContext<CreateReceivablesFormProps>();
+  const { control, setValue } = useFormContext<CreateReceivablesFormProps>();
 
   const { root } = useRootElements();
 
@@ -46,6 +47,15 @@ export const YourVatDetailsForm = ({ disabled }: { disabled: boolean }) => {
       entityVatIds.data.length === 0
     );
 
+  const isHiddenForUS =
+    entity?.address.country && entity?.address.country === 'US';
+
+  useEffect(() => {
+    if (entityVatIds && entityVatIds.data.length === 1) {
+      setValue('entity_vat_id_id', entityVatIds.data[0].id);
+    }
+  }, [entityVatIds, setValue]);
+
   return (
     <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
       {showEntityVatIdField && (
@@ -56,8 +66,13 @@ export const YourVatDetailsForm = ({ disabled }: { disabled: boolean }) => {
             <FormControl
               variant="standard"
               fullWidth
-              required={!isNonCompliantFlow}
-              disabled={isEntityVatIdsLoading || disabled}
+              required={!isNonCompliantFlow && !isHiddenForUS}
+              hidden={isHiddenForUS}
+              disabled={
+                isEntityVatIdsLoading ||
+                disabled ||
+                entityVatIds?.data.length === 1
+              }
               error={Boolean(error)}
             >
               <InputLabel id={field.name}>{t(i18n)`Your VAT ID`}</InputLabel>
@@ -88,6 +103,7 @@ export const YourVatDetailsForm = ({ disabled }: { disabled: boolean }) => {
       <TextField
         disabled
         fullWidth
+        hidden={isHiddenForUS}
         variant="standard"
         label={t(i18n)`Your Tax ID`}
         value={entity?.tax_id ?? ''}
@@ -99,9 +115,11 @@ export const YourVatDetailsForm = ({ disabled }: { disabled: boolean }) => {
           ) : null,
         }}
       />
-      <Collapse in={Boolean(!entity?.tax_id) && !isEntityLoading}>
-        <FormHelperText>{t(i18n)`No Tax ID available`}</FormHelperText>
-      </Collapse>
+      {!isHiddenForUS && (
+        <Collapse in={Boolean(!entity?.tax_id) && !isEntityLoading}>
+          <FormHelperText>{t(i18n)`No Tax ID available`}</FormHelperText>
+        </Collapse>
+      )}
     </Box>
   );
 };
diff --git a/packages/sdk-react/src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/EditInvoiceDetails.tsx b/packages/sdk-react/src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/EditInvoiceDetails.tsx
index dc8513fe9..61337a747 100644
--- a/packages/sdk-react/src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/EditInvoiceDetails.tsx
+++ b/packages/sdk-react/src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/EditInvoiceDetails.tsx
@@ -264,12 +264,12 @@ const EditInvoiceDetailsContent = ({
                   #{invoice.document_id ?? INVOICE_DOCUMENT_AUTO_ID}
                 </Typography>
               </Typography>
-              <EntitySection disabled={isLoading} hidden={['purchase_order']} />
               <ItemsSection
                 isNonVatSupported={isNonVatSupported}
                 actualCurrency={actualCurrency}
                 onCurrencyChanged={setActualCurrency}
               />
+              <EntitySection disabled={isLoading} hidden={['purchase_order']} />
               <ReminderSection
                 disabled={isLoading}
                 onUpdateOverdueReminder={onEditOverdueReminder}
diff --git a/packages/sdk-react/src/core/i18n/locales/en/messages.po b/packages/sdk-react/src/core/i18n/locales/en/messages.po
index 138d52665..cf86a459f 100644
--- a/packages/sdk-react/src/core/i18n/locales/en/messages.po
+++ b/packages/sdk-react/src/core/i18n/locales/en/messages.po
@@ -69,7 +69,7 @@ msgstr "{0, select, credit_note {Credit Note has been sent} invoice {Invoice has
 #: src/components/onboarding/OnboardingPersonsReview/OnboardingAddressView/OnboardingAddressView.tsx:20
 #: src/components/receivables/Financing/FinanceFaq/FinanceFaqDetails.tsx:58
 #: src/components/receivables/Financing/FinanceFaq/FinanceFaqDetails.tsx:62
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:62
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:82
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/InvoiceRecurrenceCancelModal.tsx:89
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/ReceivableRecurrence/InvoiceRecurrenceDetails.tsx:37
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/ReceivableRecurrence/InvoiceRecurrenceDetails.tsx:46
@@ -1060,8 +1060,8 @@ msgstr "Bill to"
 msgid "Billiard/Pool Establishments"
 msgstr "Billiard/Pool Establishments"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:246
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:252
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:223
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:229
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:133
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:186
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewCustomerSection.tsx:83
@@ -1722,7 +1722,6 @@ msgstr "Contact information"
 
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:261
 #: src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.test.tsx:97
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:134
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewCustomerSection.tsx:65
 msgid "Contact person"
 msgstr "Contact person"
@@ -2039,7 +2038,7 @@ msgstr "Create new"
 msgid "Create New"
 msgstr "Create New"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:401
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:390
 msgid "Create new counterpart"
 msgstr "Create new counterpart"
 
@@ -2178,7 +2177,7 @@ msgstr "Current status"
 #: src/components/counterparts/CounterpartStatusChip/CounterpartStatusChip.tsx:72
 #: src/components/receivables/CreditNotesTable/CreditNotesTable.tsx:160
 #: src/components/receivables/Financing/FinanceTab/FinancedInvoicesTable/FinancedInvoicesTable.tsx:143
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:409
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:398
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/OverviewTabPanel.tsx:140
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewCustomerSection.tsx:56
 #: src/components/receivables/InvoicesTable/InvoicesTable.tsx:252
@@ -2270,7 +2269,7 @@ msgstr "days before discount date 2"
 msgid "days before due date"
 msgstr "days before due date"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx:38
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx:48
 msgid "Dear client, as discussed, please find attached our invoice:"
 msgstr "Dear client, as discussed, please find attached our invoice:"
 
@@ -2596,7 +2595,7 @@ msgstr "Dry Cleaners"
 #: src/components/payables/PayableDetails/PayableDetailsForm/PayableDetailsForm.tsx:602
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:311
 #: src/components/payables/PayablesTable/Filters/Filters.tsx:81
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:58
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:78
 #: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/ReminderForm/BeforeDueDateReminderForm.tsx:235
 #: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/ReminderForm/BeforeDueDateReminderForm.tsx:420
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/reminderCardTermsHelpers.tsx:45
@@ -3282,7 +3281,8 @@ msgstr "Front of your identity document"
 msgid "Fuel Dealers (Non Automotive)"
 msgstr "Fuel Dealers (Non Automotive)"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:92
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:106
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:122
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:128
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:181
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewDetailsSection.tsx:30
@@ -3765,7 +3765,7 @@ msgstr "Invalid issuance"
 #: src/components/receivables/CreditNotesTable/CreditNotesTable.tsx:215
 #: src/components/receivables/CreditNotesTable/CreditNotesTable.tsx:283
 #: src/components/receivables/Financing/FinanceTab/FinancedInvoicesTable/FinancedInvoicesTable.tsx:272
-#: src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx:249
+#: src/components/receivables/InvoiceDetails/CreateReceivable/CreateReceivables.tsx:245
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/EditInvoiceDetails.tsx:262
 #: src/components/receivables/InvoicesTable/InvoicesTable.tsx:331
 #: src/components/receivables/InvoicesTable/InvoicesTable.tsx:333
@@ -3920,7 +3920,7 @@ msgstr "Issue at"
 #: src/components/payables/PayableDetails/PayableDetailsForm/PayableDetailsForm.tsx:571
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:292
 #: src/components/receivables/CreditNotesTable/CreditNotesTable.tsx:154
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:44
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:55
 #: src/components/receivables/InvoicesTable/InvoicesTable.tsx:270
 msgid "Issue date"
 msgstr "Issue date"
@@ -4436,6 +4436,7 @@ msgstr "Medical, Dental, Ophthalmic, and Hospital Equipment and Supplies"
 msgid "Membership Organizations"
 msgstr "Membership Organizations"
 
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/EntitySection.tsx:33
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:141
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:194
 msgid "Memo"
@@ -4811,8 +4812,8 @@ msgid "No conditions"
 msgstr "No conditions"
 
 #: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:158
-msgid "No contact persons available"
-msgstr "No contact persons available"
+#~ msgid "No contact persons available"
+#~ msgstr "No contact persons available"
 
 #: src/components/counterparts/CounterpartsTable/CounterpartsTable.tsx:357
 msgid "No Counterparts"
@@ -4896,11 +4897,11 @@ msgstr "No Tags"
 msgid "No tags found"
 msgstr "No tags found"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:103
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:120
 msgid "No Tax ID available"
 msgstr "No Tax ID available"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:230
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:208
 msgid "No TAX ID available"
 msgstr "No TAX ID available"
 
@@ -6130,8 +6131,8 @@ msgid "Sales and Service Tax (Malaysia)"
 msgstr "Sales and Service Tax (Malaysia)"
 
 #: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:137
-msgid "Same as invoice date"
-msgstr "Same as invoice date"
+#~ msgid "Same as invoice date"
+#~ msgstr "Same as invoice date"
 
 #: src/core/utils/countries.ts:206
 msgid "Samoa"
@@ -6233,7 +6234,7 @@ msgstr "Security number"
 msgid "See all"
 msgstr "See all"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:410
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:399
 msgid "Select counterpart"
 msgstr "Select counterpart"
 
@@ -6296,7 +6297,7 @@ msgstr "Services"
 msgid "Set a recurrence period to issue invoices automatically"
 msgstr "Set a recurrence period to issue invoices automatically"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:66
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:91
 msgid "Set by payment term"
 msgstr "Set by payment term"
 
@@ -6304,7 +6305,7 @@ msgstr "Set by payment term"
 #~ msgid "Set by payment terms"
 #~ msgstr "Set by payment terms"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:52
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/FullfillmentSummary.tsx:67
 msgid "Set on issuance"
 msgstr "Set on issuance"
 
@@ -6334,8 +6335,9 @@ msgstr "Seychelles"
 msgid "Seychellois Rupee"
 msgstr "Seychellois Rupee"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:282
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:290
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:253
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:267
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:275
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:135
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:188
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewCustomerSection.tsx:88
@@ -6564,7 +6566,7 @@ msgstr "Submit invoice"
 
 #: src/components/payables/PayableDetails/PayableDetailsForm/PayableDetailsForm.tsx:688
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:467
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:443
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:441
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewItemsSection.tsx:158
 #: src/components/receivables/InvoiceDetails/InvoiceTotal/InvoiceTotal.tsx:31
 msgid "Subtotal"
@@ -6694,8 +6696,8 @@ msgstr "Tax"
 msgid "Tax ID"
 msgstr "Tax ID"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:206
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:221
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:182
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:198
 msgid "TAX ID"
 msgstr "TAX ID"
 
@@ -6745,7 +6747,7 @@ msgstr "Tax Registration Number (UAE)"
 #~ msgid "Taxes"
 #~ msgstr "Taxes"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:449
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:447
 msgid "Taxes total"
 msgstr "Taxes total"
 
@@ -7004,7 +7006,7 @@ msgstr "Tongan Paʻanga"
 #: src/components/payables/PayableDetails/PayableDetailsForm/PayableDetailsForm.tsx:717
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:326
 #: src/components/payables/PayableDetails/PayableDetailsInfo/PayableDetailsInfo.tsx:494
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:456
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/ItemsSection.tsx:454
 #: src/components/receivables/InvoiceDetails/ExistingInvoiceDetails/components/sections/PreviewItemsSection.tsx:173
 #: src/components/receivables/InvoiceDetails/InvoiceItems/InvoiceItems.tsx:38
 #: src/components/receivables/InvoiceDetails/InvoiceTotal/InvoiceTotal.tsx:25
@@ -7552,8 +7554,8 @@ msgstr "VAT has been deleted."
 msgid "Vat ID"
 msgstr "Vat ID"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:178
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:182
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:154
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/CustomerSection.tsx:158
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:120
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:123
 #: src/components/receivables/InvoiceDetails/CreateReceivable/validation.ts:173
@@ -7873,7 +7875,7 @@ msgstr "You don’t have permissions to view this page.<0/>Contact your system a
 msgid "Your remaining limit is the amount available to you for financing additional invoices"
 msgstr "Your remaining limit is the amount available to you for financing additional invoices"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:92
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:108
 msgid "Your Tax ID"
 msgstr "Your Tax ID"
 
@@ -7885,8 +7887,8 @@ msgstr "Your Tax ID"
 msgid "Your tax information"
 msgstr "Your tax information"
 
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:63
-#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:67
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:78
+#: src/components/receivables/InvoiceDetails/CreateReceivable/sections/components/Billing/YourVatDetailsForm.tsx:82
 msgid "Your VAT ID"
 msgstr "Your VAT ID"
 
diff --git a/packages/sdk-react/src/core/theme/mui-monite/components/formControl.ts b/packages/sdk-react/src/core/theme/mui-monite/components/formControl.ts
index c1d6f4827..8fdb72aed 100644
--- a/packages/sdk-react/src/core/theme/mui-monite/components/formControl.ts
+++ b/packages/sdk-react/src/core/theme/mui-monite/components/formControl.ts
@@ -13,9 +13,15 @@ export const getFormControlStyles = (
   return {
     styleOverrides: {
       root: {
+        '&[hidden]': {
+          display: 'none',
+          visibility: 'hidden',
+          opacity: 0,
+        },
         '& .MuiInputBase-root': {
           minHeight: '48px',
           backgroundColor: palette.neutral['95'],
+          border: `1px solid transparent`,
           borderRadius: moniteTheme.borderRadius * 2,
 
           '.MuiSelect-icon': {
@@ -24,7 +30,7 @@ export const getFormControlStyles = (
 
           '&.Mui-focused': {
             backgroundColor: palette.neutral['80'],
-            border: `1px solid ${palette.primary.main}`,
+            borderColor: `${palette.primary.main}`,
             boxShadow: `0 0 0 4px ${chroma(palette.primary.main)
               .alpha(0.24)
               .hex()}`,