diff --git a/.talismanrc b/.talismanrc
index 9eac1d1eb..6c1f86114 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -13,5 +13,6 @@ scopeconfig:
 - scope: node
 allowed_patterns:
 - keyof
+- \[key\]
 - key=
 version: "1.0"
diff --git a/frontend/package.json b/frontend/package.json
index 8f3bdbb29..50d1ba00a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -62,6 +62,7 @@
     "react-use": "^17.5.1",
     "redux": "^5.0.1",
     "ts-essentials": "^10.0.2",
+    "ts-pattern": "^5.4.0",
     "uuid": "^9.0.1",
     "web-vitals": "^1.1.2",
     "whatwg-fetch": "^3.6.20",
diff --git a/frontend/src/components/Aside/Aside.tsx b/frontend/src/components/Aside/Aside.tsx
index 07678a364..f464abe29 100644
--- a/frontend/src/components/Aside/Aside.tsx
+++ b/frontend/src/components/Aside/Aside.tsx
@@ -20,6 +20,7 @@ function Aside(props: AsideProps) {
   const expand = props.expand ?? false;
   const component = (
     <aside
+      aria-hidden={!expand}
       className={classNames(styles.aside, {
         [styles.collapsed]: !expand
       })}
diff --git a/frontend/src/components/Draft/DraftBody.tsx b/frontend/src/components/Draft/DraftBody.tsx
index bdab2961c..4e3e8a786 100644
--- a/frontend/src/components/Draft/DraftBody.tsx
+++ b/frontend/src/components/Draft/DraftBody.tsx
@@ -4,6 +4,7 @@ import RichEditor from '../RichEditor/RichEditor';
 import AppTextInput from '../_app/AppTextInput/AppTextInput';
 import { Col, Container, Row } from '../_dsfr';
 import AppLink from '../_app/AppLink/AppLink';
+import Typography from '@mui/material/Typography';
 
 interface Props {
   form: ReturnType<typeof useForm>;
@@ -21,9 +22,9 @@ function DraftBody(props: Readonly<Props>) {
   return (
     <Container as="article" className={styles.article} fluid>
       <Row className="fr-mb-2w justify-space-between">
-        <h6 id="draft-body-label" className="fr-mb-0">
+        <Typography id="draft-body-label" component="h4" variant="h6">
           Contenu de votre courrier
-        </h6>
+        </Typography>
         <AppLink
           isSimple
           target="_blank"
@@ -42,7 +43,7 @@ function DraftBody(props: Readonly<Props>) {
             onChange={(event) =>
               props.onChange({
                 subject: event.target.value,
-                body: props.body,
+                body: props.body
               })
             }
           />
@@ -55,7 +56,7 @@ function DraftBody(props: Readonly<Props>) {
           onChange={(content) =>
             props.onChange({
               subject: props.subject,
-              body: content,
+              body: content
             })
           }
         />
diff --git a/frontend/src/components/Draft/DraftMailInfo.tsx b/frontend/src/components/Draft/DraftMailInfo.tsx
index 445b9783e..3d2df1133 100644
--- a/frontend/src/components/Draft/DraftMailInfo.tsx
+++ b/frontend/src/components/Draft/DraftMailInfo.tsx
@@ -5,13 +5,14 @@ import styles from './draft.module.scss';
 import AppTextInput from '../_app/AppTextInput/AppTextInput';
 import { useForm } from '../../hooks/useForm';
 import { DATE_REGEXP_OPTIONNAL } from '../../utils/dateUtils';
+import Typography from '@mui/material/Typography';
 
 export const writtenSchema = object({
   writtenAt: string().matches(
     DATE_REGEXP_OPTIONNAL,
-    'Veuillez renseigner une date au format yyyy-mm-dd',
+    'Veuillez renseigner une date au format yyyy-mm-dd'
   ),
-  writtenFrom: string(),
+  writtenFrom: string()
 });
 
 export interface Written {
@@ -32,14 +33,16 @@ function DraftMailInfo(props: Readonly<Props>) {
       props.onChange({
         at: props.writtenAt,
         from: props.writtenFrom,
-        [key]: e.target.value,
+        [key]: e.target.value
       });
     };
   }
 
   return (
     <article className={styles.article}>
-      <h6>Informations sur le courrier</h6>
+      <Typography component="h4" variant="h6" mb={2}>
+        Informations sur le courrier
+      </Typography>
       <AppTextInput
         inputForm={props.form}
         inputKey="writtenAt"
diff --git a/frontend/src/components/Draft/DraftSender.tsx b/frontend/src/components/Draft/DraftSender.tsx
index db819fded..15ac3028a 100644
--- a/frontend/src/components/Draft/DraftSender.tsx
+++ b/frontend/src/components/Draft/DraftSender.tsx
@@ -6,6 +6,7 @@ import { Sender, SenderPayload } from '../../models/Sender';
 import styles from './draft.module.scss';
 import AppTextInput from '../_app/AppTextInput/AppTextInput';
 import { Col, Container, Row } from '../_dsfr';
+import Typography from '@mui/material/Typography';
 
 export const senderSchema = object({
   name: string().trim(),
@@ -46,7 +47,9 @@ function DraftSender(props: Readonly<Props>) {
 
   return (
     <Container as="article" className={styles.article}>
-      <h6>Coordonnées de l’expéditeur</h6>
+      <Typography component="h4" variant="h6" mb={2}>
+        Coordonnées de l’expéditeur
+      </Typography>
       <AppTextInput
         inputForm={props.form}
         inputKey="sender.name"
diff --git a/frontend/src/components/Draft/DraftSenderLogo.tsx b/frontend/src/components/Draft/DraftSenderLogo.tsx
index 7888cb202..367462462 100644
--- a/frontend/src/components/Draft/DraftSenderLogo.tsx
+++ b/frontend/src/components/Draft/DraftSenderLogo.tsx
@@ -4,6 +4,7 @@ import styles from './draft.module.scss';
 import { FileUploadDTO } from '@zerologementvacant/models';
 import classNames from 'classnames';
 import LogoViewer from './LogoViewer';
+import Typography from '@mui/material/Typography';
 
 interface Props {
   className?: string;
@@ -24,10 +25,12 @@ function DraftSenderLogo(props: Readonly<Props>) {
 
   function deleteLogo(id: string, index: number) {
     return (): void => {
-      const newFiles = [...files].filter(file => file?.id !== id);
+      const newFiles = [...files].filter((file) => file?.id !== id);
       props.onChange(newFiles);
-      const elem = document.getElementById(`fileUploadLogo${index}-input`) as HTMLInputElement;
-      if(elem !== null) {
+      const elem = document.getElementById(
+        `fileUploadLogo${index}-input`
+      ) as HTMLInputElement;
+      if (elem !== null) {
         elem.value = '';
       }
     };
@@ -41,15 +44,32 @@ function DraftSenderLogo(props: Readonly<Props>) {
     >
       <Row>
         <FileUpload
-          id='fileUploadLogo0'
-          label={<h6 className="fr-mb-2w">Logos de l’expéditeur</h6>}
+          id="fileUploadLogo0"
+          label={
+            <Typography component="h4" variant="h6" mb={2}>
+              Logos de l’expéditeur
+            </Typography>
+          }
           onUpload={onUpload(0)}
         />
-        <LogoViewer index={0} logo={props.value[0]} onDelete={deleteLogo(props.value[0]?.id, 0)} />
+        <LogoViewer
+          index={0}
+          logo={props.value[0]}
+          onDelete={deleteLogo(props.value[0]?.id, 0)}
+        />
       </Row>
       <Row spacing="mb-2w">
-        <FileUpload id='fileUploadLogo1' hint="" label={null} onUpload={onUpload(1)} />
-        <LogoViewer index={1} logo={props.value[1]} onDelete={deleteLogo(props.value[1]?.id, 1)} />
+        <FileUpload
+          id="fileUploadLogo1"
+          hint=""
+          label={null}
+          onUpload={onUpload(1)}
+        />
+        <LogoViewer
+          index={1}
+          logo={props.value[1]}
+          onDelete={deleteLogo(props.value[1]?.id, 1)}
+        />
       </Row>
     </Container>
   );
diff --git a/frontend/src/components/Draft/DraftSignature.tsx b/frontend/src/components/Draft/DraftSignature.tsx
index c8ca9bd78..7c23cfb38 100644
--- a/frontend/src/components/Draft/DraftSignature.tsx
+++ b/frontend/src/components/Draft/DraftSignature.tsx
@@ -9,11 +9,12 @@ import { Col, Container, Row } from '../_dsfr';
 import FileUpload from '../FileUpload/FileUpload';
 import { FileUploadDTO } from '@zerologementvacant/models';
 import LogoViewer from './LogoViewer';
+import Typography from '@mui/material/Typography';
 
 export const signatureSchema = object({
   signatoryFirstName: string().optional().nullable(),
   signatoryLastName: string().optional().nullable(),
-  signatoryRole: string().optional().nullable(),
+  signatoryRole: string().optional().nullable()
 });
 
 interface Props {
@@ -32,7 +33,7 @@ function DraftSignature(props: Readonly<Props>) {
       if (props.value) {
         props.onChange({
           ...props.value,
-          [key]: e.target.value,
+          [key]: e.target.value
         });
       }
     };
@@ -41,22 +42,26 @@ function DraftSignature(props: Readonly<Props>) {
   function onFileUpload(file: FileUploadDTO) {
     props.onChange({
       ...props.value,
-      signatoryFile: file,
+      signatoryFile: file
     });
   }
 
   function deleteFile() {
     props.value.signatoryFile = null;
     props.onChange(props.value);
-    const elem = document.getElementById(`fileUploadSignature-input`) as HTMLInputElement;
-    if(elem !== null) {
+    const elem = document.getElementById(
+      `fileUploadSignature-input`
+    ) as HTMLInputElement;
+    if (elem !== null) {
       elem.value = '';
     }
   }
 
   return (
     <Container as="article" className={styles.article}>
-      <h6>Signature de l’expéditeur</h6>
+      <Typography component="h4" variant="h6" mb={2}>
+        Signature de l’expéditeur
+      </Typography>
       <Row className={styles.row} gutters>
         <Col n="6">
           <AppTextInput
@@ -86,7 +91,11 @@ function DraftSignature(props: Readonly<Props>) {
       />
       <FileUpload id="fileUploadSignature" onUpload={onFileUpload} />
 
-      <LogoViewer index={0} logo={props.value.signatoryFile as FileUploadDTO} onDelete={deleteFile} />
+      <LogoViewer
+        index={0}
+        logo={props.value.signatoryFile as FileUploadDTO}
+        onDelete={deleteFile}
+      />
     </Container>
   );
 }
diff --git a/frontend/src/components/HousingDetails/HousingDetailsSubCardProperties.tsx b/frontend/src/components/HousingDetails/HousingDetailsSubCardProperties.tsx
index 8b3f7e754..3e97e75da 100644
--- a/frontend/src/components/HousingDetails/HousingDetailsSubCardProperties.tsx
+++ b/frontend/src/components/HousingDetails/HousingDetailsSubCardProperties.tsx
@@ -1,5 +1,5 @@
 import { Text } from '../_dsfr';
-import { Housing, OwnershipKindLabels } from '../../models/Housing';
+import { formatOwnershipKind, Housing } from '../../models/Housing';
 import { cadastralClassificationOptions } from '../../models/HousingFilters';
 import HousingDetailsSubCard from './HousingDetailsSubCard';
 
@@ -21,7 +21,7 @@ function HousingDetailsSubCardProperties({ housing }: Props) {
           Type de propriété
         </Text>
         <Text spacing="mb-1w">
-          {OwnershipKindLabels[housing.ownershipKind]}
+          {formatOwnershipKind(housing.ownershipKind)}
         </Text>
       </div>
       <div>
@@ -49,7 +49,7 @@ function HousingDetailsSubCardProperties({ housing }: Props) {
         <Text spacing="mb-1w">
           {
             cadastralClassificationOptions.find(
-              (_) => _.value === String(housing.cadastralClassification),
+              (_) => _.value === String(housing.cadastralClassification)
             )?.label
           }
         </Text>
diff --git a/frontend/src/components/OwnerEditionSideMenu/OwnerEditionSideMenu.tsx b/frontend/src/components/OwnerEditionSideMenu/OwnerEditionSideMenu.tsx
index 93a83dca8..6bfa4cb97 100644
--- a/frontend/src/components/OwnerEditionSideMenu/OwnerEditionSideMenu.tsx
+++ b/frontend/src/components/OwnerEditionSideMenu/OwnerEditionSideMenu.tsx
@@ -69,6 +69,19 @@ function OwnerEditionSideMenu(props: Props) {
     toastId: 'owner-edition'
   });
 
+  if (!active) {
+    return (
+      <Button
+        className={props.className}
+        priority="tertiary"
+        size="small"
+        onClick={open}
+      >
+        Éditer l’adresse
+      </Button>
+    );
+  }
+
   return (
     <>
       <Button
diff --git a/frontend/src/models/Housing.tsx b/frontend/src/models/Housing.tsx
index c923623c0..19e717206 100644
--- a/frontend/src/models/Housing.tsx
+++ b/frontend/src/models/Housing.tsx
@@ -1,10 +1,13 @@
 import { differenceInDays, format } from 'date-fns';
+import { match, Pattern } from 'ts-pattern';
 
 import {
   EnergyConsumption,
   HousingDTO,
   HousingKind,
   HousingStatus,
+  INTERNAL_CO_CONDOMINIUM_VALUES,
+  INTERNAL_MONO_CONDOMINIUM_VALUES,
   Occupancy
 } from '@zerologementvacant/models';
 import { Owner, toOwnerDTO } from './Owner';
@@ -38,7 +41,7 @@ export interface Housing {
   uncomfortable: boolean;
   cadastralClassification: number;
   taxed: boolean;
-  ownershipKind: OwnershipKinds;
+  ownershipKind: string;
   buildingHousingCount?: number;
   buildingVacancyRate: number;
   dataFileYears: string[];
@@ -128,22 +131,16 @@ export function byAddress(h1: Housing, h2: Housing): Compare {
   return byCity;
 }
 
-export const hasGeoPerimeters = (housing: Housing) =>
-  housing.geoPerimeters &&
-  housing.geoPerimeters.filter((_) => _ !== null).length > 0;
-
-export enum OwnershipKinds {
-  Single = 'single',
-  CoOwnership = 'co',
-  Other = 'other'
+export function formatOwnershipKind(kind: string | null): string {
+  return match(kind)
+    .with(
+      Pattern.union(null, ...INTERNAL_MONO_CONDOMINIUM_VALUES),
+      () => 'Monopropriété'
+    )
+    .with(Pattern.union(...INTERNAL_CO_CONDOMINIUM_VALUES), () => 'Copropriété')
+    .otherwise(() => 'Autre');
 }
 
-export const OwnershipKindLabels = {
-  [OwnershipKinds.Single]: 'Monopropriété',
-  [OwnershipKinds.CoOwnership]: 'Copropriété',
-  [OwnershipKinds.Other]: 'Autre'
-};
-
 export type HousingSortable = Pick<
   Housing,
   'rawAddress' | 'owner' | 'occupancy' | 'status'
diff --git a/frontend/src/models/HousingFilters.tsx b/frontend/src/models/HousingFilters.tsx
index 3a7daa3e6..509785e58 100644
--- a/frontend/src/models/HousingFilters.tsx
+++ b/frontend/src/models/HousingFilters.tsx
@@ -19,11 +19,7 @@ import {
 } from '@zerologementvacant/models';
 import { OptionTreeElement, SelectOption } from './SelectOption';
 import { HousingStates } from './HousingState';
-import {
-  OCCUPANCY_LABELS,
-  OwnershipKindLabels,
-  OwnershipKinds
-} from './Housing';
+import { OCCUPANCY_LABELS } from './Housing';
 import { LocalityKindLabels, LocalityKinds } from './Locality';
 import EnergyConsumptionOption from '../components/_app/AppMultiSelect/EnergyConsumptionOption';
 
@@ -228,16 +224,16 @@ export const taxedOptions: SelectOption[] = [
 
 export const ownershipKindsOptions: SelectOption<OwnershipKind>[] = [
   {
-    value: OwnershipKinds.Single,
-    label: OwnershipKindLabels[OwnershipKinds.Single]
+    value: 'single',
+    label: 'Monopropriété'
   },
   {
-    value: OwnershipKinds.CoOwnership,
-    label: OwnershipKindLabels[OwnershipKinds.CoOwnership]
+    value: 'co',
+    label: 'Copropriété'
   },
   {
-    value: OwnershipKinds.Other,
-    label: OwnershipKindLabels[OwnershipKinds.Other],
+    value: 'other',
+    label: 'Autre',
     badgeLabel: 'Autre type de propriété'
   }
 ];
diff --git a/frontend/test/fixtures.test.ts b/frontend/test/fixtures.test.ts
index d51c14f52..47ac8b7c6 100644
--- a/frontend/test/fixtures.test.ts
+++ b/frontend/test/fixtures.test.ts
@@ -4,7 +4,7 @@ import randomstring from 'randomstring';
 
 import { Owner } from '../src/models/Owner';
 import { Address } from '../src/models/Address';
-import { Housing, OccupancyKind, OwnershipKinds } from '../src/models/Housing';
+import { Housing, OccupancyKind } from '../src/models/Housing';
 import { AuthUser, User } from '../src/models/User';
 import { SignupLink } from '../src/models/SignupLink';
 import { Prospect } from '../src/models/Prospect';
@@ -103,7 +103,7 @@ export function genHousing(): Housing {
     uncomfortable: false,
     cadastralClassification: genNumber(1),
     taxed: false,
-    ownershipKind: OwnershipKinds.Single,
+    ownershipKind: 'single',
     buildingVacancyRate: genNumber(2),
     status: HousingStatus.NEVER_CONTACTED,
     source: null,
diff --git a/packages/models/src/OwnershipKind.ts b/packages/models/src/OwnershipKind.ts
index f7cf7346c..b8df80aa4 100644
--- a/packages/models/src/OwnershipKind.ts
+++ b/packages/models/src/OwnershipKind.ts
@@ -1,3 +1,11 @@
 export const OWNERSHIP_KIND_VALUES = ['single', 'co', 'other'] as const;
 
 export type OwnershipKind = (typeof OWNERSHIP_KIND_VALUES)[number];
+
+export const INTERNAL_MONO_CONDOMINIUM_VALUES = ['single'] as const; // and null
+export const INTERNAL_CO_CONDOMINIUM_VALUES = [
+  'co',
+  'CL',
+  'CLV',
+  'CV'
+] as const;
diff --git a/server/src/models/HousingApi.ts b/server/src/models/HousingApi.ts
index 7333da761..87fbce2ad 100644
--- a/server/src/models/HousingApi.ts
+++ b/server/src/models/HousingApi.ts
@@ -87,14 +87,6 @@ export enum OwnershipKindsApi {
   Other = 'other'
 }
 
-export const INTERNAL_MONO_CONDOMINIUM_VALUES = ['single'] as const; // and null
-export const INTERNAL_CO_CONDOMINIUM_VALUES = [
-  'co',
-  'CL',
-  'CLV',
-  'CV'
-] as const;
-
 export const getOwnershipKindFromValue = (value?: string) => {
   return !value
     ? OwnershipKindsApi.Single
diff --git a/server/src/repositories/housingRepository.ts b/server/src/repositories/housingRepository.ts
index 2b151aa38..002e00a93 100644
--- a/server/src/repositories/housingRepository.ts
+++ b/server/src/repositories/housingRepository.ts
@@ -3,6 +3,11 @@ import { Knex } from 'knex';
 import _ from 'lodash';
 import fp from 'lodash/fp';
 
+import {
+  AddressKinds,
+  INTERNAL_CO_CONDOMINIUM_VALUES,
+  INTERNAL_MONO_CONDOMINIUM_VALUES
+} from '@zerologementvacant/models';
 import { HousingSource, PaginationOptions } from '@zerologementvacant/shared';
 import db, { toRawArray, where } from '~/infra/database';
 import {
@@ -10,8 +15,6 @@ import {
   HousingApi,
   HousingRecordApi,
   HousingSortApi,
-  INTERNAL_CO_CONDOMINIUM_VALUES,
-  INTERNAL_MONO_CONDOMINIUM_VALUES,
   OccupancyKindApi
 } from '~/models/HousingApi';
 import { OwnerDBO, ownerTable, parseOwnerApi } from './ownerRepository';
@@ -32,7 +35,6 @@ import { groupsHousingTable } from './groupRepository';
 import { housingOwnersTable } from './housingOwnerRepository';
 import { campaignsHousingTable } from './campaignHousingRepository';
 import { campaignsTable } from './campaignRepository';
-import { AddressKinds } from '@zerologementvacant/models';
 import { ReadableStream } from 'node:stream/web';
 import { Readable } from 'node:stream';
 
diff --git a/server/src/test/testFixtures.ts b/server/src/test/testFixtures.ts
index 08040ccff..2251d1dfa 100644
--- a/server/src/test/testFixtures.ts
+++ b/server/src/test/testFixtures.ts
@@ -19,8 +19,6 @@ import {
 import {
   ENERGY_CONSUMPTION_GRADES,
   HousingApi,
-  INTERNAL_CO_CONDOMINIUM_VALUES,
-  INTERNAL_MONO_CONDOMINIUM_VALUES,
   OccupancyKindApi
 } from '~/models/HousingApi';
 import { CampaignApi } from '~/models/CampaignApi';
@@ -77,7 +75,11 @@ import { AddressApi } from '~/models/AddressApi';
 import { HousingNoteApi, NoteApi } from '~/models/NoteApi';
 import { SenderApi } from '~/models/SenderApi';
 import { DraftApi } from '~/models/DraftApi';
-import { HOUSING_KIND_VALUES } from '@zerologementvacant/models';
+import {
+  HOUSING_KIND_VALUES,
+  INTERNAL_CO_CONDOMINIUM_VALUES,
+  INTERNAL_MONO_CONDOMINIUM_VALUES
+} from '@zerologementvacant/models';
 
 export { genGeoCode } from '@zerologementvacant/utils';
 
diff --git a/yarn.lock b/yarn.lock
index d86ad5cf7..04d6f7226 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9426,6 +9426,7 @@ __metadata:
     rimraf: "npm:^5.0.10"
     sass: "npm:^1.79.4"
     ts-essentials: "npm:^10.0.2"
+    ts-pattern: "npm:^5.4.0"
     typescript: "npm:^5.6.2"
     undici: "npm:^6.19.8"
     uuid: "npm:^9.0.1"