diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c62503..227d96b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Quality
 
 on:
     push:
-        branches: [ master, develop ]
+        branches: [ master ]
     pull_request:
         branches: [ master, develop ]
 
diff --git a/backend/migrations/Version20260522120000.php b/backend/migrations/Version20260522120000.php
new file mode 100644
index 0000000..015e643
--- /dev/null
+++ b/backend/migrations/Version20260522120000.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260522120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add person_link table for free-form links on a person profile';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE person_link (id INT AUTO_INCREMENT NOT NULL, person_id INT NOT NULL, title VARCHAR(255) NOT NULL, url VARCHAR(2048) NOT NULL, INDEX IDX_person_link_person (person_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci`');
+        $this->addSql('ALTER TABLE person_link ADD CONSTRAINT FK_person_link_person FOREIGN KEY (person_id) REFERENCES person (id) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE person_link DROP FOREIGN KEY FK_person_link_person');
+        $this->addSql('DROP TABLE person_link');
+    }
+}
diff --git a/backend/migrations/Version20260522154347.php b/backend/migrations/Version20260522154347.php
new file mode 100644
index 0000000..92e18d3
--- /dev/null
+++ b/backend/migrations/Version20260522154347.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260522154347 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE person_link DROP FOREIGN KEY `FK_person_link_person`');
+        $this->addSql('ALTER TABLE person_link ADD CONSTRAINT FK_BC4A1DDA217BBB47 FOREIGN KEY (person_id) REFERENCES person (id)');
+        $this->addSql('ALTER TABLE person_link RENAME INDEX idx_person_link_person TO IDX_BC4A1DDA217BBB47');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE person_link DROP FOREIGN KEY FK_BC4A1DDA217BBB47');
+        $this->addSql('ALTER TABLE person_link ADD CONSTRAINT `FK_person_link_person` FOREIGN KEY (person_id) REFERENCES person (id) ON UPDATE NO ACTION ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE person_link RENAME INDEX idx_bc4a1dda217bbb47 TO IDX_person_link_person');
+    }
+}
diff --git a/backend/src/Controller/Admin/DashboardController.php b/backend/src/Controller/Admin/DashboardController.php
index 5d18d1a..5a1e1b5 100644
--- a/backend/src/Controller/Admin/DashboardController.php
+++ b/backend/src/Controller/Admin/DashboardController.php
@@ -62,6 +62,8 @@ public function configureMenuItems(): iterable
         yield MenuItem::section('Demandes');
         yield MenuItem::linkTo(ContactCrudController::class, 'Contacts', 'fa fa-envelope');
         yield MenuItem::section('Outils');
+        $mergeUrl = $this->adminUrlGenerator->setRoute('admin_merge')->generateUrl();
+        yield MenuItem::linkToUrl('Fusionner référentiels', 'fa fa-code-merge', $mergeUrl);
         yield MenuItem::linkToUrl('Test mail', 'fa fa-paper-plane', $this->adminUrlGenerator->setRoute('admin_test_mail')->generateUrl());
         yield MenuItem::section();
         yield MenuItem::linkToUrl('Retour au site', 'fa fa-arrow-left', '/');
diff --git a/backend/src/Controller/Admin/MergeAdminController.php b/backend/src/Controller/Admin/MergeAdminController.php
new file mode 100644
index 0000000..331dbc7
--- /dev/null
+++ b/backend/src/Controller/Admin/MergeAdminController.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Admin;
+
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use App\Entity\Person\Association;
+use App\Entity\Person\Filiere;
+use App\Entity\Person\Role;
+use App\Entity\Person\School;
+use App\Repository\Person\AssociationRepository;
+use App\Repository\Person\FiliereRepository;
+use App\Repository\Person\SchoolRepository;
+use App\Service\MergeService;
+use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted(Role::ADMIN->value)]
+final class MergeAdminController extends AbstractController
+{
+    public function __construct(
+        private readonly MergeService $mergeService,
+        private readonly FiliereRepository $filiereRepository,
+        private readonly AssociationRepository $associationRepository,
+        private readonly SchoolRepository $schoolRepository,
+        private readonly AdminUrlGenerator $adminUrlGenerator,
+    ) {
+    }
+
+    #[Route('/admin/merge', name: 'admin_merge', methods: ['GET', 'POST'])]
+    public function index(Request $request): Response
+    {
+        $mergeUrl = $this->adminUrlGenerator->setRoute('admin_merge')->generateUrl();
+
+        if ($request->isMethod('POST')) {
+            return $this->handleMerge($request, $mergeUrl);
+        }
+
+        return $this->render('admin/merge.html.twig', [
+            'merge_url'    => $mergeUrl,
+            'filieres'     => $this->filiereRepository->findAllOrderedByName(),
+            'associations' => $this->associationRepository->findAllOrderedByName(),
+            'schools'      => $this->schoolRepository->findAllOrderedByName(),
+        ]);
+    }
+
+    private function handleMerge(Request $request, string $mergeUrl): RedirectResponse
+    {
+        if (!$this->isCsrfTokenValid('admin_merge', $request->request->getString('_token'))) {
+            $this->addFlash('danger', 'Token CSRF invalide.');
+            return $this->redirect($mergeUrl);
+        }
+
+        $type     = $request->request->getString('type');
+        $sourceId = $request->request->getInt('source_id');
+        $targetId = $request->request->getInt('target_id');
+
+        if ($sourceId === $targetId) {
+            $this->addFlash('warning', 'La source et la cible sont identiques.');
+            return $this->redirect($mergeUrl);
+        }
+
+        try {
+            $count = match ($type) {
+                'filiere'     => $this->mergeFiliere($sourceId, $targetId),
+                'association' => $this->mergeAssociation($sourceId, $targetId),
+                'school'      => $this->mergeSchool($sourceId, $targetId),
+                default       => throw new \InvalidArgumentException('Type inconnu : ' . $type),
+            };
+
+            $this->addFlash('success', sprintf('Fusion effectuée : %d enregistrement(s) réassigné(s).', $count));
+        } catch (\InvalidArgumentException $invalidArgumentException) {
+            $this->addFlash('danger', $invalidArgumentException->getMessage());
+        } catch (\Throwable) {
+            $this->addFlash('danger', 'Une erreur inattendue est survenue lors de la fusion.');
+        }
+
+        return $this->redirect($mergeUrl);
+    }
+
+    private function mergeFiliere(int $sourceId, int $targetId): int
+    {
+        $source = $this->filiereRepository->find($sourceId);
+        $target = $this->filiereRepository->find($targetId);
+
+        if (!$source instanceof Filiere || !$target instanceof Filiere) {
+            throw new \InvalidArgumentException('Filière source ou cible introuvable.');
+        }
+
+        return $this->mergeService->mergeFiliere($source, $target);
+    }
+
+    private function mergeAssociation(int $sourceId, int $targetId): int
+    {
+        $source = $this->associationRepository->find($sourceId);
+        $target = $this->associationRepository->find($targetId);
+
+        if (!$source instanceof Association || !$target instanceof Association) {
+            throw new \InvalidArgumentException('Association source ou cible introuvable.');
+        }
+
+        return $this->mergeService->mergeAssociation($source, $target);
+    }
+
+    private function mergeSchool(int $sourceId, int $targetId): int
+    {
+        $source = $this->schoolRepository->find($sourceId);
+        $target = $this->schoolRepository->find($targetId);
+
+        if (!$source instanceof School || !$target instanceof School) {
+            throw new \InvalidArgumentException('École source ou cible introuvable.');
+        }
+
+        return $this->mergeService->mergeSchool($source, $target);
+    }
+}
diff --git a/backend/src/Controller/Api/CharacteristicTypeApiController.php b/backend/src/Controller/Api/CharacteristicTypeApiController.php
new file mode 100644
index 0000000..4a8aa21
--- /dev/null
+++ b/backend/src/Controller/Api/CharacteristicTypeApiController.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller\Api;
+
+use App\Entity\Characteristic\CharacteristicType;
+use App\Api\ApiResponse;
+use App\Repository\CharacteristicTypeRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Attribute\Route;
+
+final class CharacteristicTypeApiController extends AbstractController
+{
+    public function __construct(
+        private readonly CharacteristicTypeRepository $characteristicTypeRepository,
+    ) {
+    }
+
+    #[Route('/api/characteristic-types', name: 'api_characteristic_types_list', methods: ['GET'])]
+    public function list(): JsonResponse
+    {
+        $types = $this->characteristicTypeRepository->getAll();
+
+        return ApiResponse::success(array_map(
+            static fn(CharacteristicType $type): array => [
+                'id'    => $type->getId(),
+                'title' => $type->getTitle(),
+                'url'   => $type->getUrl(),
+                'image' => $type->getImage(),
+            ],
+            $types,
+        ));
+    }
+}
diff --git a/backend/src/Controller/Api/PersonApiController.php b/backend/src/Controller/Api/PersonApiController.php
index c8df7ee..ca84509 100644
--- a/backend/src/Controller/Api/PersonApiController.php
+++ b/backend/src/Controller/Api/PersonApiController.php
@@ -95,6 +95,14 @@ public function update(
 
         $this->personService->syncFilieres($person, $dto->filieres ?? []);
         $this->personService->syncAssociations($person, $dto->associations ?? []);
+        if ($dto->characteristics !== null) {
+            $this->personService->syncCharacteristics($person, $dto->characteristics);
+        }
+
+        if ($dto->links !== null) {
+            $this->personService->syncLinks($person, $dto->links);
+        }
+
         $this->personService->update($person);
 
         return ApiResponse::success($this->personService->mapToResponseDto($person));
diff --git a/backend/src/Dto/Person/CharacteristicRequestDto.php b/backend/src/Dto/Person/CharacteristicRequestDto.php
new file mode 100644
index 0000000..ed3609a
--- /dev/null
+++ b/backend/src/Dto/Person/CharacteristicRequestDto.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Dto\Person;
+
+final readonly class CharacteristicRequestDto
+{
+    public function __construct(
+        public ?int $id = null,
+        public ?int $typeId = null,
+        public ?string $value = null,
+        public bool $visible = false,
+    ) {
+    }
+}
diff --git a/backend/src/Dto/Person/PersonLinkDto.php b/backend/src/Dto/Person/PersonLinkDto.php
new file mode 100644
index 0000000..1f4615e
--- /dev/null
+++ b/backend/src/Dto/Person/PersonLinkDto.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Dto\Person;
+
+final readonly class PersonLinkDto
+{
+    public function __construct(
+        public int $id,
+        public string $title,
+        public string $url,
+    ) {
+    }
+}
diff --git a/backend/src/Dto/Person/PersonLinkRequestDto.php b/backend/src/Dto/Person/PersonLinkRequestDto.php
new file mode 100644
index 0000000..65663cd
--- /dev/null
+++ b/backend/src/Dto/Person/PersonLinkRequestDto.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Dto\Person;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+final readonly class PersonLinkRequestDto
+{
+    public function __construct(
+        #[Assert\NotBlank]
+        #[Assert\Length(max: 255)]
+        public string $title,
+        #[Assert\NotBlank]
+        #[Assert\Url]
+        #[Assert\Length(max: 2048)]
+        public string $url,
+    ) {
+    }
+}
diff --git a/backend/src/Dto/Person/PersonRequestDto.php b/backend/src/Dto/Person/PersonRequestDto.php
index f6b684b..dad7613 100644
--- a/backend/src/Dto/Person/PersonRequestDto.php
+++ b/backend/src/Dto/Person/PersonRequestDto.php
@@ -30,6 +30,16 @@ public function __construct(
          */
         #[Assert\Valid]
         public ?array $associations = null,
+        /**
+         * @var CharacteristicRequestDto[]|null
+         */
+        #[Assert\Valid]
+        public ?array $characteristics = null,
+        /**
+         * @var PersonLinkRequestDto[]|null
+         */
+        #[Assert\Valid]
+        public ?array $links = null,
     ) {
     }
 }
diff --git a/backend/src/Dto/Person/PersonResponseDto.php b/backend/src/Dto/Person/PersonResponseDto.php
index 0a93907..ead77fb 100644
--- a/backend/src/Dto/Person/PersonResponseDto.php
+++ b/backend/src/Dto/Person/PersonResponseDto.php
@@ -14,6 +14,7 @@
      * @param CharacteristicDto[]      $characteristics
      * @param FiliereResponseDto[]     $filieres
      * @param AssociationResponseDto[] $associations
+     * @param PersonLinkDto[]          $links
      */
     public function __construct(
         public int $id,
@@ -30,6 +31,7 @@ public function __construct(
         public array $characteristics,
         public array $filieres,
         public array $associations,
+        public array $links = [],
     ) {
     }
 }
diff --git a/backend/src/Entity/Person/Person.php b/backend/src/Entity/Person/Person.php
index 10b5286..2e4a56e 100644
--- a/backend/src/Entity/Person/Person.php
+++ b/backend/src/Entity/Person/Person.php
@@ -109,6 +109,12 @@ class Person implements \Stringable
     #[ORM\OneToMany(targetEntity: PersonAssociation::class, mappedBy: 'person', cascade: ['persist'], orphanRemoval: true)]
     private Collection $associations;
 
+    /**
+     * @var Collection<int, PersonLink>
+     */
+    #[ORM\OneToMany(targetEntity: PersonLink::class, mappedBy: 'person', cascade: ['persist'], orphanRemoval: true)]
+    private Collection $links;
+
     public function __construct()
     {
         $this->godFathers      = new ArrayCollection();
@@ -117,6 +123,7 @@ public function __construct()
         $this->createdAt       = new \DateTime();
         $this->filieres        = new ArrayCollection();
         $this->associations    = new ArrayCollection();
+        $this->links = new ArrayCollection();
     }
 
     public function getId(): int
@@ -463,4 +470,33 @@ public function replaceAssociations(array $personAssociations): void
             $this->addAssociation($pa);
         }
     }
+
+    /**
+     * @return Collection<int, PersonLink>
+     */
+    public function getLinks(): Collection
+    {
+        return $this->links;
+    }
+
+    public function addLink(PersonLink $link): static
+    {
+        if (!$this->links->contains($link)) {
+            $this->links->add($link);
+            $link->setPerson($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param PersonLink[] $links
+     */
+    public function replaceLinks(array $links): void
+    {
+        $this->links->clear();
+        foreach ($links as $link) {
+            $this->addLink($link);
+        }
+    }
 }
diff --git a/backend/src/Entity/Person/PersonLink.php b/backend/src/Entity/Person/PersonLink.php
new file mode 100644
index 0000000..78f297a
--- /dev/null
+++ b/backend/src/Entity/Person/PersonLink.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Person;
+
+use App\Repository\Person\PersonLinkRepository;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity(repositoryClass: PersonLinkRepository::class)]
+class PersonLink
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    private string $title = '';
+
+    #[ORM\Column(length: 2048)]
+    private string $url = '';
+
+    #[ORM\ManyToOne(inversedBy: 'links')]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?Person $person = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function setTitle(string $title): static
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function setUrl(string $url): static
+    {
+        $this->url = $url;
+
+        return $this;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function setPerson(?Person $person): static
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+}
diff --git a/backend/src/Fixture/PersonLinkFixture.php b/backend/src/Fixture/PersonLinkFixture.php
new file mode 100644
index 0000000..4b168a7
--- /dev/null
+++ b/backend/src/Fixture/PersonLinkFixture.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Fixture;
+
+use App\Entity\Person\Person;
+use App\Entity\Person\PersonLink;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class PersonLinkFixture extends Fixture implements DependentFixtureInterface
+{
+    #[\Override]
+    public function load(ObjectManager $manager): void
+    {
+        $data = [
+            // [personRef, title, url]
+            [
+                PersonFixture::HENRI,
+                'Portfolio',
+                'https://henridurand.dev',
+            ],
+            [
+                PersonFixture::LUKA,
+                'Blog',
+                'https://lukamaret.fr',
+            ],
+            [
+                PersonFixture::LUKA,
+                'CV',
+                'https://cv.lukamaret.fr',
+            ],
+            [
+                PersonFixture::SARAH,
+                'Portfolio',
+                'https://sarahfontaine.io',
+            ],
+            [
+                PersonFixture::ROMAIN,
+                'Recherches',
+                'https://romain-ai.github.io',
+            ],
+            [
+                PersonFixture::CLARA,
+                'Projet open source',
+                'https://github.com/ClaraMartin/ecodev',
+            ],
+            [
+                PersonFixture::MAXIME,
+                'Site perso',
+                'https://maxime-dubois.xyz',
+            ],
+        ];
+
+        foreach ($data as [$personRef, $title, $url]) {
+            $link = new PersonLink()
+                ->setPerson($this->getReference($personRef, Person::class))
+                ->setTitle($title)
+                ->setUrl($url);
+            $manager->persist($link);
+        }
+
+        $manager->flush();
+    }
+
+    /**
+     * @return string[]
+     */
+    #[\Override]
+    public function getDependencies(): array
+    {
+        return [PersonFixture::class];
+    }
+}
diff --git a/backend/src/Repository/CharacteristicRepository.php b/backend/src/Repository/CharacteristicRepository.php
index 99d3c79..e175c4f 100644
--- a/backend/src/Repository/CharacteristicRepository.php
+++ b/backend/src/Repository/CharacteristicRepository.php
@@ -17,4 +17,9 @@ public function __construct(ManagerRegistry $managerRegistry)
     {
         parent::__construct($managerRegistry, Characteristic::class);
     }
+
+    public function create(Characteristic $characteristic): void
+    {
+        $this->getEntityManager()->persist($characteristic);
+    }
 }
diff --git a/backend/src/Repository/Person/PersonLinkRepository.php b/backend/src/Repository/Person/PersonLinkRepository.php
new file mode 100644
index 0000000..80a834a
--- /dev/null
+++ b/backend/src/Repository/Person/PersonLinkRepository.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repository\Person;
+
+use App\Entity\Person\PersonLink;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<PersonLink>
+ */
+class PersonLinkRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $managerRegistry)
+    {
+        parent::__construct($managerRegistry, PersonLink::class);
+    }
+}
diff --git a/backend/src/Service/MergeService.php b/backend/src/Service/MergeService.php
new file mode 100644
index 0000000..e3b8d36
--- /dev/null
+++ b/backend/src/Service/MergeService.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Entity\Person\Association;
+use App\Entity\Person\Filiere;
+use App\Entity\Person\School;
+use Doctrine\ORM\EntityManagerInterface;
+
+final readonly class MergeService
+{
+    public function __construct(private EntityManagerInterface $em)
+    {
+    }
+
+    /**
+     * Réassigne tous les PersonFiliere de $source vers $target puis supprime $source.
+     */
+    public function mergeFiliere(Filiere $source, Filiere $target): int
+    {
+        return $this->doMerge(
+            'UPDATE App\Entity\Person\PersonFiliere pf SET pf.filiere = :target WHERE pf.filiere = :source',
+            $source,
+            $target,
+        );
+    }
+
+    /**
+     * Réassigne tous les PersonAssociation de $source vers $target puis supprime $source.
+     */
+    public function mergeAssociation(Association $source, Association $target): int
+    {
+        return $this->doMerge(
+            'UPDATE App\Entity\Person\PersonAssociation pa SET pa.association = :target WHERE pa.association = :source',
+            $source,
+            $target,
+        );
+    }
+
+    /**
+     * Réassigne tous les PersonFiliere (school) de $source vers $target puis supprime $source.
+     */
+    public function mergeSchool(School $source, School $target): int
+    {
+        return $this->doMerge(
+            'UPDATE App\Entity\Person\PersonFiliere pf SET pf.school = :target WHERE pf.school = :source',
+            $source,
+            $target,
+        );
+    }
+
+    private function doMerge(string $dql, object $source, object $target): int
+    {
+        $conn = $this->em->getConnection();
+        $conn->beginTransaction();
+
+        try {
+            $raw = $this->em->createQuery($dql)
+                ->setParameter('target', $target)
+                ->setParameter('source', $source)
+                ->execute();
+
+            $count = is_int($raw) ? $raw : 0;
+
+            $this->em->remove($source);
+            $this->em->flush();
+
+            $conn->commit();
+        } catch (\Throwable $throwable) {
+            $conn->rollBack();
+            throw $throwable;
+        }
+
+        return $count;
+    }
+}
diff --git a/backend/src/Service/PersonService.php b/backend/src/Service/PersonService.php
index 33be7b5..a643380 100644
--- a/backend/src/Service/PersonService.php
+++ b/backend/src/Service/PersonService.php
@@ -7,8 +7,11 @@
 use App\Dto\Person\AssociationRequestDto;
 use App\Dto\Person\AssociationResponseDto;
 use App\Dto\Person\CharacteristicDto;
+use App\Dto\Person\CharacteristicRequestDto;
 use App\Dto\Person\FiliereRequestDto;
 use App\Dto\Person\FiliereResponseDto;
+use App\Dto\Person\PersonLinkDto;
+use App\Dto\Person\PersonLinkRequestDto;
 use App\Dto\Person\PersonResponseDto;
 use App\Dto\Sponsor\SponsorResponseDto;
 use App\Entity\Characteristic\Characteristic;
@@ -16,10 +19,12 @@
 use App\Entity\Person\Association;
 use App\Entity\Person\Person;
 use App\Entity\Person\PersonAssociation;
+use App\Entity\Person\PersonLink;
 use App\Entity\Sponsor\Sponsor;
 use App\Entity\Person\Filiere;
 use App\Entity\Person\PersonFiliere;
 use App\Entity\Person\School;
+use App\Repository\CharacteristicRepository;
 use App\Repository\CharacteristicTypeRepository;
 use App\Repository\Person\AssociationRepository;
 use App\Repository\Person\FiliereRepository;
@@ -31,6 +36,7 @@
     public function __construct(
         private PersonRepository $personRepository,
         private CharacteristicTypeRepository $characteristicTypeRepository,
+        private CharacteristicRepository $characteristicRepository,
         private FiliereRepository $filiereRepository,
         private SchoolRepository $schoolRepository,
         private AssociationRepository $associationRepository,
@@ -167,7 +173,15 @@ public function mapToResponseDto(Person $person): PersonResponseDto
                     endDate: $pa->getEndDate()?->format('Y-m-d'),
                 ),
                 $person->getAssociations()->toArray()
-            )
+            ),
+            links: array_map(
+                static fn(PersonLink $l): PersonLinkDto => new PersonLinkDto(
+                    id: (int) $l->getId(),
+                    title: $l->getTitle(),
+                    url: $l->getUrl(),
+                ),
+                $person->getLinks()->toArray()
+            ),
         );
     }
 
@@ -242,6 +256,74 @@ private function buildPersonAssociation(AssociationRequestDto $dto): PersonAssoc
         return $personAssociation;
     }
 
+    /**
+     * @param CharacteristicRequestDto[] $dtos
+     */
+    public function syncCharacteristics(Person $person, array $dtos): void
+    {
+        // Build a map of existing characteristics by id for fast lookup
+        $existingById = [];
+        foreach ($person->getCharacteristics() as $characteristic) {
+            $id = $characteristic->getId();
+            if ($id !== null) {
+                $existingById[$id] = $characteristic;
+            }
+        }
+
+        $seenIds = [];
+
+        foreach ($dtos as $dto) {
+            if ($dto->id !== null && isset($existingById[$dto->id])) {
+                // Update existing
+                $existingById[$dto->id]->setValue($dto->value ?? '');
+                $existingById[$dto->id]->setVisible($dto->visible);
+                $seenIds[] = $dto->id;
+            } elseif ($dto->typeId !== null) {
+                // Create new characteristic for this type if not already present
+                $type = $this->characteristicTypeRepository->find($dto->typeId);
+                if ($type === null) {
+                    continue;
+                }
+
+                $alreadyExists = $person->getCharacteristics()->exists(
+                    static fn(int $key, Characteristic $c): bool => $c->getType()?->getId() === $type->getId(),
+                );
+                if ($alreadyExists) {
+                    continue;
+                }
+
+                $characteristic = new Characteristic();
+                $characteristic->setPerson($person);
+                $characteristic->setType($type);
+                $characteristic->setValue($dto->value ?? '');
+                $characteristic->setVisible($dto->visible);
+                $person->addCharacteristic($characteristic);
+                $this->characteristicRepository->create($characteristic);
+                $seenIds[] = $characteristic->getId();
+            }
+        }
+
+        // Remove characteristics absent from the payload (orphanRemoval handles DELETE)
+        foreach ($existingById as $id => $characteristic) {
+            if (!in_array($id, $seenIds, true)) {
+                $person->removeCharacteristic($characteristic);
+            }
+        }
+    }
+
+    /**
+     * @param PersonLinkRequestDto[] $dtos
+     */
+    public function syncLinks(Person $person, array $dtos): void
+    {
+        $person->replaceLinks(array_map(
+            static fn(PersonLinkRequestDto $dto): PersonLink => new PersonLink()
+                ->setTitle($dto->title)
+                ->setUrl($dto->url),
+            $dtos,
+        ));
+    }
+
     private function buildPersonFiliere(FiliereRequestDto $dto): PersonFiliere
     {
         $canonical = Filiere::normalize($dto->name);
diff --git a/backend/templates/admin/merge.html.twig b/backend/templates/admin/merge.html.twig
new file mode 100644
index 0000000..508d079
--- /dev/null
+++ b/backend/templates/admin/merge.html.twig
@@ -0,0 +1,69 @@
+{% extends '@EasyAdmin/page/content.html.twig' %}
+
+{% block page_title %}Fusionner des référentiels{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col-12">
+        <p class="text-muted mb-4">
+            Fusionnez deux éléments d'un référentiel : tous les liens de la <strong>source</strong> seront
+            réassignés vers la <strong>cible</strong>, puis la source sera supprimée.
+            Les champs annexes (dates, poste, diplôme…) sont conservés.
+        </p>
+
+        {% macro merge_card(title, icon, type, items, merge_url) %}
+            <div class="card mb-4">
+                <div class="card-header">
+                    <h5 class="card-title mb-0">
+                        <i class="fa {{ icon }} me-2"></i>{{ title }}
+                    </h5>
+                </div>
+                <div class="card-body">
+                    <form method="post" action="{{ merge_url }}"
+                          onsubmit="return confirm('Confirmer la fusion ? La source sera définitivement supprimée.')">
+                        <input type="hidden" name="_token" value="{{ csrf_token('admin_merge') }}">
+                        <input type="hidden" name="type" value="{{ type }}">
+
+                        <div class="d-flex gap-3 align-items-end">
+                            <div class="flex-grow-1">
+                                <label class="form-label fw-bold">
+                                    Source <span class="badge bg-danger">sera supprimée</span>
+                                </label>
+                                <select name="source_id" class="form-select" required>
+                                    <option value="">— Choisir —</option>
+                                    {% for item in items %}
+                                        <option value="{{ item.id }}">{{ item.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                            <div class="pb-1 text-muted">
+                                <i class="fa fa-arrow-right fa-lg"></i>
+                            </div>
+                            <div class="flex-grow-1">
+                                <label class="form-label fw-bold">
+                                    Cible <span class="badge bg-success">sera conservée</span>
+                                </label>
+                                <select name="target_id" class="form-select" required>
+                                    <option value="">— Choisir —</option>
+                                    {% for item in items %}
+                                        <option value="{{ item.id }}">{{ item.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                            <div class="pb-1">
+                                <button type="submit" class="btn btn-danger">
+                                    <i class="fa fa-code-merge me-1"></i> Fusionner
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        {% endmacro %}
+
+        {{ _self.merge_card('Filières', 'fa-graduation-cap', 'filiere', filieres, merge_url) }}
+        {{ _self.merge_card('Associations', 'fa-users', 'association', associations, merge_url) }}
+        {{ _self.merge_card('Écoles', 'fa-school', 'school', schools, merge_url) }}
+    </div>
+</div>
+{% endblock %}
diff --git a/e2e/tests/tree/filters.spec.ts b/e2e/tests/tree/filters.spec.ts
index 5a0a6a8..bdac06b 100644
--- a/e2e/tests/tree/filters.spec.ts
+++ b/e2e/tests/tree/filters.spec.ts
@@ -25,6 +25,8 @@ test('tree directory filters: search, year, count', async ({ page }) => {
   await expect(counter).toHaveText(new RegExp(`^${initialCount.toString()} résultats?$`));
 
   // 3. Filtre année 2021 → nombre réduit (Luka est en 2021)
+  // Ouvrir le combobox "Promo" puis sélectionner "2021 / 22"
+  await page.getByPlaceholder('Promo').click();
   await page.getByRole('button', { name: /^2021 \/ 22$/ }).click();
   const filteredText = (await counter.textContent()) ?? '';
   const filteredCount = parseInt(/(\d+)/.exec(filteredText)?.[1] ?? '0', 10);
@@ -35,8 +37,8 @@ test('tree directory filters: search, year, count', async ({ page }) => {
   const cards = page.locator('[data-testid^="person-card-"]');
   await expect(cards).toHaveCount(filteredCount);
 
-  // 4. Reset filtre années via "Toutes"
-  await page.getByRole('button', { name: 'Toutes' }).click();
+  // 4. Reset filtre années : le dropdown est encore ouvert, cliquer l'option pour désélectionner
+  await page.getByRole('button', { name: /^2021 \/ 22$/ }).click();
   await expect(counter).toHaveText(new RegExp(`^${initialCount.toString()} résultats?$`));
 
   // 5. Tri alphabétique : on toggle, on vérifie que le bouton devient actif (background ink)
diff --git a/frontend/src/hooks/usePersonFilter.test.ts b/frontend/src/hooks/usePersonFilter.test.ts
index 904b4ce..18c0ba4 100644
--- a/frontend/src/hooks/usePersonFilter.test.ts
+++ b/frontend/src/hooks/usePersonFilter.test.ts
@@ -11,6 +11,15 @@ function mkPerson(id: number, firstName: string, lastName: string, startYear: nu
     fullName: `${firstName} ${lastName}`,
     startYear,
     picture: null,
+    birthdate: null,
+    biography: null,
+    description: null,
+    godFathers: [],
+    godChildren: [],
+    characteristics: [],
+    filieres: [],
+    associations: [],
+    links: [],
   };
 }
 
diff --git a/frontend/src/hooks/usePersonFilter.ts b/frontend/src/hooks/usePersonFilter.ts
index c1b992a..678c76e 100644
--- a/frontend/src/hooks/usePersonFilter.ts
+++ b/frontend/src/hooks/usePersonFilter.ts
@@ -6,31 +6,53 @@ export interface PersonFilterState {
   name: string;
   years: number[];
   alphabetical: boolean;
+  filieres: string[];
+  schools: string[];
   filtered: Person[];
   setName: (name: string) => void;
   toggleYear: (year: number) => void;
   clearYears: () => void;
   toggleAlphabetical: () => void;
+  toggleFiliere: (filiere: string) => void;
+  clearFilieres: () => void;
+  toggleSchool: (school: string) => void;
+  clearSchools: () => void;
 }
 
 export function usePersonFilter(persons: Person[], initialYears: number[] = []): PersonFilterState {
   const [name, setName] = useState('');
   const [years, setYears] = useState<number[]>(initialYears);
   const [alphabetical, setAlphabetical] = useState(false);
+  const [filieres, setFilieres] = useState<string[]>([]);
+  const [schools, setSchools] = useState<string[]>([]);
 
   const filtered = useMemo(
-    () => filterPersons(persons, { name, years, alphabetical }),
-    [persons, name, years, alphabetical],
+    () => filterPersons(persons, { name, years, alphabetical, filieres, schools }),
+    [persons, name, years, alphabetical, filieres, schools],
   );
 
   function toggleYear(year: number) {
     setYears((prev) => (prev.includes(year) ? prev.filter((y) => y !== year) : [...prev, year]));
   }
 
+  function toggleFiliere(filiere: string) {
+    setFilieres((prev) =>
+      prev.includes(filiere) ? prev.filter((f) => f !== filiere) : [...prev, filiere],
+    );
+  }
+
+  function toggleSchool(school: string) {
+    setSchools((prev) =>
+      prev.includes(school) ? prev.filter((s) => s !== school) : [...prev, school],
+    );
+  }
+
   return {
     name,
     years,
     alphabetical,
+    filieres,
+    schools,
     filtered,
     setName,
     toggleYear,
@@ -40,5 +62,13 @@ export function usePersonFilter(persons: Person[], initialYears: number[] = []):
     toggleAlphabetical: () => {
       setAlphabetical((prev) => !prev);
     },
+    toggleFiliere,
+    clearFilieres: () => {
+      setFilieres([]);
+    },
+    toggleSchool,
+    clearSchools: () => {
+      setSchools([]);
+    },
   };
 }
diff --git a/frontend/src/lib/api/characteristicTypes.ts b/frontend/src/lib/api/characteristicTypes.ts
new file mode 100644
index 0000000..9bfbf00
--- /dev/null
+++ b/frontend/src/lib/api/characteristicTypes.ts
@@ -0,0 +1,13 @@
+import { get } from './client';
+import type { Result } from '../../types/api';
+
+export interface CharacteristicType {
+  id: number;
+  title: string;
+  url: string | null;
+  image: string | null;
+}
+
+export function getCharacteristicTypes(): Promise<Result<CharacteristicType[]>> {
+  return get<CharacteristicType[]>('/api/characteristic-types');
+}
diff --git a/frontend/src/lib/persons.test.ts b/frontend/src/lib/persons.test.ts
index 26185d0..a6a6e37 100644
--- a/frontend/src/lib/persons.test.ts
+++ b/frontend/src/lib/persons.test.ts
@@ -11,7 +11,15 @@ function mkPerson(id: number, firstName: string, lastName: string, startYear: nu
     fullName: `${firstName} ${lastName}`,
     startYear,
     picture: null,
-    color: '#000',
+    birthdate: null,
+    biography: null,
+    description: null,
+    godFathers: [],
+    godChildren: [],
+    characteristics: [],
+    filieres: [],
+    associations: [],
+    links: [],
   };
 }
 
@@ -22,7 +30,7 @@ const people: Person[] = [
   mkPerson(4, 'Charles', 'Bernard', 2022),
 ];
 
-const base: PersonFilter = { name: '', year: null, alphabetical: false };
+const base: PersonFilter = { name: '', years: [], alphabetical: false, filieres: [], schools: [] };
 
 describe('filterPersons', () => {
   it('retourne tous les éléments sans filtre', () => {
@@ -30,7 +38,7 @@ describe('filterPersons', () => {
   });
 
   it('filtre par année', () => {
-    const result = filterPersons(people, { ...base, year: 2020 });
+    const result = filterPersons(people, { ...base, years: [2020] });
     expect(result).toHaveLength(2);
     expect(result.map((p) => p.id)).toEqual([1, 3]);
   });
@@ -64,7 +72,13 @@ describe('filterPersons', () => {
   });
 
   it('combine filtre nom et année', () => {
-    const result = filterPersons(people, { name: 'alice', year: 2020, alphabetical: false });
+    const result = filterPersons(people, {
+      name: 'alice',
+      years: [2020],
+      alphabetical: false,
+      filieres: [],
+      schools: [],
+    });
     expect(result).toHaveLength(1);
     expect(result[0]?.id).toBe(1);
   });
diff --git a/frontend/src/lib/persons.ts b/frontend/src/lib/persons.ts
index f35ec39..1035208 100644
--- a/frontend/src/lib/persons.ts
+++ b/frontend/src/lib/persons.ts
@@ -4,6 +4,8 @@ export interface PersonFilter {
   name: string;
   years: number[];
   alphabetical: boolean;
+  filieres: string[];
+  schools: string[];
 }
 
 function normalize(s: string): string {
@@ -13,9 +15,17 @@ function normalize(s: string): string {
 export function filterPersons(persons: Person[], filter: PersonFilter): Person[] {
   const query = normalize(filter.name.trim());
   const yearSet = new Set(filter.years);
+  const filiereSet = new Set(filter.filieres);
+  const schoolSet = new Set(filter.schools);
 
   let result = persons.filter((p) => {
     if (yearSet.size > 0 && !yearSet.has(p.startYear)) return false;
+    if (filiereSet.size > 0 && !p.filieres.some((f) => filiereSet.has(f.name))) return false;
+    if (
+      schoolSet.size > 0 &&
+      !p.filieres.some((f) => f.schoolName !== null && schoolSet.has(f.schoolName))
+    )
+      return false;
     if (query.length > 0) {
       const full = normalize(`${p.lastName} ${p.firstName}`);
       const reversed = normalize(`${p.firstName} ${p.lastName}`);
diff --git a/frontend/src/pages/person/EditPersonPage.tsx b/frontend/src/pages/person/EditPersonPage.tsx
index 55ab739..2ddabe7 100644
--- a/frontend/src/pages/person/EditPersonPage.tsx
+++ b/frontend/src/pages/person/EditPersonPage.tsx
@@ -24,15 +24,21 @@ import { SPONSOR_TYPE_ICONS, SPONSOR_TYPE_LABELS } from '../../lib/sponsorTypes'
 import type {
   Association,
   AssociationRequest,
+  Characteristic,
+  CharacteristicRequest,
   Filiere,
   FiliereRequest,
   Person,
+  PersonLink,
+  PersonLinkRequest,
   PersonRequest,
 } from '../../types/person';
 import type { Sponsor, SponsorType } from '../../types/sponsor';
 import { getFilieres } from '../../lib/api/filieres';
 import { getSchools } from '../../lib/api/schools';
 import { getAssociations } from '../../lib/api/associations';
+import { getCharacteristicTypes } from '../../lib/api/characteristicTypes';
+import type { CharacteristicType } from '../../lib/api/characteristicTypes';
 
 // ── Skeleton ──────────────────────────────────────────────────────────────────
 
@@ -1068,6 +1074,296 @@ function AssociationsEditor({
   );
 }
 
+// ── Éditeur de liens (caractéristiques) ──────────────────────────────────────
+
+const EyeIcon = ({ open }: { open: boolean }) => (
+  <svg
+    width="13"
+    height="13"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    strokeWidth="2"
+    strokeLinecap="round"
+    strokeLinejoin="round"
+  >
+    {open ? (
+      <>
+        <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+        <circle cx="12" cy="12" r="3" />
+      </>
+    ) : (
+      <>
+        <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24" />
+        <line x1="1" y1="1" x2="23" y2="23" />
+      </>
+    )}
+  </svg>
+);
+
+function CharacteristicRow({
+  characteristic,
+  onUpdate,
+  onRemove,
+}: {
+  characteristic: Characteristic;
+  onUpdate: (patch: Partial<Characteristic>) => void;
+  onRemove: () => void;
+}) {
+  const icon = characteristic.typeImage
+    ? `/images/icons/${characteristic.typeImage}`
+    : characteristic.typeUrl
+      ? `https://www.google.com/s2/favicons?domain=${new URL(characteristic.typeUrl).hostname}&sz=16`
+      : null;
+
+  return (
+    <div className="flex items-center gap-3">
+      <button
+        type="button"
+        title={characteristic.visible ? 'Masquer ce lien' : 'Afficher ce lien'}
+        onClick={() => {
+          onUpdate({ visible: !characteristic.visible });
+        }}
+        className={`shrink-0 rounded-[7px] border p-1.5 transition-colors cursor-pointer ${
+          characteristic.visible
+            ? 'border-ink bg-ink text-white'
+            : 'border-line bg-surface text-ink-4 hover:border-ink-3'
+        }`}
+      >
+        <EyeIcon open={characteristic.visible} />
+      </button>
+
+      <div className="flex w-36 shrink-0 items-center gap-1.5">
+        {icon && (
+          <img
+            src={icon}
+            alt=""
+            width={13}
+            height={13}
+            className="shrink-0 opacity-50"
+            style={{ filter: 'brightness(0)' }}
+            onError={(e) => {
+              e.currentTarget.style.display = 'none';
+            }}
+          />
+        )}
+        <span className="truncate text-[12px] font-medium text-ink-3">
+          {characteristic.typeTitle}
+        </span>
+      </div>
+
+      <Input
+        value={characteristic.value ?? ''}
+        onChange={(e) => {
+          onUpdate({ value: e.target.value || null });
+        }}
+        placeholder={
+          characteristic.typeUrl ? characteristic.typeUrl.replace(/https?:\/\//, '') : 'Valeur…'
+        }
+        className="flex-1"
+      />
+
+      <Button
+        type="button"
+        variant="ghost"
+        size="sm"
+        onClick={onRemove}
+        className="shrink-0 text-ink-4"
+        title="Supprimer ce lien"
+        icon={
+          <svg
+            width="13"
+            height="13"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+            strokeLinecap="round"
+            strokeLinejoin="round"
+          >
+            <polyline points="3 6 5 6 21 6" />
+            <path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6" />
+            <path d="M10 11v6M14 11v6" />
+            <path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2" />
+          </svg>
+        }
+      />
+    </div>
+  );
+}
+
+function CharacteristicsEditor({
+  characteristics,
+  allTypes,
+  onChange,
+}: {
+  characteristics: Characteristic[];
+  allTypes: CharacteristicType[];
+  onChange: (updated: Characteristic[]) => void;
+}) {
+  const tempCounter = useRef(-1);
+  const addableTypes = allTypes.filter(
+    (t) => !characteristics.some((c) => c.typeTitle === t.title),
+  );
+
+  function update(id: number, patch: Partial<Characteristic>) {
+    onChange(characteristics.map((c) => (c.id === id ? { ...c, ...patch } : c)));
+  }
+
+  function remove(id: number) {
+    onChange(characteristics.filter((c) => c.id !== id));
+  }
+
+  function addType(type: CharacteristicType) {
+    const tempId = tempCounter.current--;
+    onChange([
+      ...characteristics,
+      {
+        id: tempId,
+        value: null,
+        visible: true,
+        typeTitle: type.title,
+        typeUrl: type.url,
+        typeImage: type.image,
+        _typeId: type.id,
+      } as Characteristic & { _typeId: number },
+    ]);
+  }
+
+  return (
+    <div>
+      <div className="space-y-3">
+        {characteristics.map((c) => (
+          <CharacteristicRow
+            key={c.id}
+            characteristic={c}
+            onUpdate={(patch) => {
+              update(c.id, patch);
+            }}
+            onRemove={() => {
+              remove(c.id);
+            }}
+          />
+        ))}
+      </div>
+
+      {addableTypes.length > 0 && (
+        <div className="mt-3 flex flex-wrap gap-2">
+          {addableTypes.map((type) => (
+            <button
+              key={type.id}
+              type="button"
+              onClick={() => {
+                addType(type);
+              }}
+              className="flex items-center gap-1.5 rounded-[7px] border border-dashed border-line px-2.5 py-1 text-[12px] text-ink-3 transition-colors hover:border-ink-3 hover:text-ink-2 cursor-pointer"
+            >
+              {type.image && (
+                <img
+                  src={`/images/icons/${type.image}`}
+                  alt=""
+                  width={11}
+                  height={11}
+                  className="opacity-40"
+                  style={{ filter: 'brightness(0)' }}
+                  onError={(e) => {
+                    e.currentTarget.style.display = 'none';
+                  }}
+                />
+              )}
+              + {type.title}
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ── Éditeur de liens libres ───────────────────────────────────────────────────
+
+function LinksEditor({
+  links,
+  onChange,
+}: {
+  links: PersonLink[];
+  onChange: (updated: PersonLink[]) => void;
+}) {
+  const tempCounter = useRef(-1);
+
+  function addRow() {
+    onChange([...links, { id: tempCounter.current--, title: '', url: '' }]);
+  }
+
+  function updateRow(id: number, patch: Partial<PersonLink>) {
+    onChange(links.map((l) => (l.id === id ? { ...l, ...patch } : l)));
+  }
+
+  function removeRow(id: number) {
+    onChange(links.filter((l) => l.id !== id));
+  }
+
+  const trashIcon = (
+    <svg
+      width="14"
+      height="14"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <polyline points="3 6 5 6 21 6" />
+      <path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6" />
+      <path d="M10 11v6M14 11v6" />
+      <path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2" />
+    </svg>
+  );
+
+  return (
+    <div>
+      <div className="space-y-2">
+        {links.map((l) => (
+          <div key={l.id} className="flex items-center gap-2">
+            <div className="w-36 shrink-0">
+              <Input
+                value={l.title}
+                onChange={(e) => {
+                  updateRow(l.id, { title: e.target.value });
+                }}
+                placeholder="Titre (ex: Portfolio)"
+              />
+            </div>
+            <div className="min-w-0 flex-1">
+              <Input
+                value={l.url}
+                onChange={(e) => {
+                  updateRow(l.id, { url: e.target.value });
+                }}
+                placeholder="https://…"
+              />
+            </div>
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={() => {
+                removeRow(l.id);
+              }}
+              className="shrink-0 text-ink-4"
+              icon={trashIcon}
+            />
+          </div>
+        ))}
+      </div>
+      <Button type="button" variant="ghost" size="sm" className="mt-2 text-ink-3" onClick={addRow}>
+        + Ajouter un lien
+      </Button>
+    </div>
+  );
+}
+
 // ── Page ──────────────────────────────────────────────────────────────────────
 
 export function EditPersonPage() {
@@ -1115,6 +1411,9 @@ export function EditPersonPage() {
   const [allSchools, setAllSchools] = useState<string[]>([]);
   const [associations, setAssociations] = useState<Association[]>([]);
   const [allAssociations, setAllAssociations] = useState<string[]>([]);
+  const [characteristics, setCharacteristics] = useState<Characteristic[]>([]);
+  const [allCharacteristicTypes, setAllCharacteristicTypes] = useState<CharacteristicType[]>([]);
+  const [freeLinks, setFreeLinks] = useState<PersonLink[]>([]);
 
   useEffect(() => {
     if (!person || initialized.current) return;
@@ -1140,6 +1439,8 @@ export function EditPersonPage() {
         endDate: a.endDate ?? null,
       })),
     );
+    setCharacteristics([...person.characteristics]);
+    setFreeLinks([...person.links]);
   }, [person]);
 
   useEffect(() => {
@@ -1157,6 +1458,9 @@ export function EditPersonPage() {
     void getAssociations().then((result) => {
       if (result.ok) setAllAssociations(result.data);
     });
+    void getCharacteristicTypes().then((result) => {
+      if (result.ok) setAllCharacteristicTypes(result.data);
+    });
   }, [notify]);
 
   async function handleSubmit(e: SyntheticEvent) {
@@ -1213,6 +1517,17 @@ export function EditPersonPage() {
           endDate,
         }),
       ),
+      links: freeLinks
+        .filter((l) => l.title.trim() && l.url.trim())
+        .map(({ title, url }): PersonLinkRequest => ({ title, url })),
+      characteristics: characteristics.map((c): CharacteristicRequest => {
+        if (c.id < 0) {
+          // nouvelle caractéristique — on envoie typeId sans id
+          const typeId = (c as Characteristic & { _typeId?: number })._typeId;
+          return { id: null, typeId, value: c.value, visible: c.visible };
+        }
+        return { id: c.id, value: c.value, visible: c.visible };
+      }),
     };
 
     const updateResult = await updatePerson(Number(id), data);
@@ -1371,6 +1686,28 @@ export function EditPersonPage() {
           />
         </Card>
 
+        {/* Liens */}
+        <Card radius="xl" padding="md" className="mb-5">
+          <h2 className="mb-4 text-[17px] font-semibold tracking-tight text-ink">Liens</h2>
+          {characteristics.length > 0 && (
+            <>
+              <p className="mb-2 text-[11px] font-semibold uppercase tracking-widest text-ink-3">
+                Réseaux &amp; services
+              </p>
+              <CharacteristicsEditor
+                characteristics={characteristics}
+                allTypes={allCharacteristicTypes}
+                onChange={setCharacteristics}
+              />
+              <div className="my-4 h-px bg-line" />
+            </>
+          )}
+          <p className="mb-2 text-[11px] font-semibold uppercase tracking-widest text-ink-3">
+            Liens libres
+          </p>
+          <LinksEditor links={freeLinks} onChange={setFreeLinks} />
+        </Card>
+
         {/* Parrainages */}
         <Card radius="xl" padding="md" className="mb-5">
           <h2 className="mb-4 text-[17px] font-semibold tracking-tight text-ink">Parrainages</h2>
diff --git a/frontend/src/pages/person/PersonPage.tsx b/frontend/src/pages/person/PersonPage.tsx
index 44c94e1..1ccf197 100644
--- a/frontend/src/pages/person/PersonPage.tsx
+++ b/frontend/src/pages/person/PersonPage.tsx
@@ -315,15 +315,49 @@ export function PersonPage() {
           </Card>
         )}
 
-        {/* Caractéristiques */}
-        {visibleCharacteristics.length > 0 && (
+        {/* Caractéristiques + Liens libres */}
+        {(visibleCharacteristics.length > 0 || person.links.length > 0) && (
           <Card radius="xl" padding="md">
             <h2 className="mb-3 text-[17px] font-semibold tracking-tight text-ink">Liens</h2>
-            <div className="flex flex-wrap gap-2">
-              {visibleCharacteristics.map((c) => (
-                <CharacteristicChip key={c.id} characteristic={c} />
-              ))}
-            </div>
+            {visibleCharacteristics.length > 0 && (
+              <div className="flex flex-wrap gap-2">
+                {visibleCharacteristics.map((c) => (
+                  <CharacteristicChip key={c.id} characteristic={c} />
+                ))}
+              </div>
+            )}
+            {person.links.length > 0 && (
+              <div
+                className={`flex flex-wrap gap-2 ${visibleCharacteristics.length > 0 ? 'mt-2' : ''}`}
+              >
+                {person.links.map((link) => (
+                  <a
+                    key={link.id}
+                    href={link.url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="inline-flex items-center gap-1.5 rounded-full border border-line bg-surface px-3 py-1 text-[12px] font-medium text-ink transition-colors hover:border-ink-3"
+                  >
+                    <svg
+                      width="11"
+                      height="11"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      strokeWidth="2.5"
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                      className="text-ink-3"
+                    >
+                      <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" />
+                      <polyline points="15 3 21 3 21 9" />
+                      <line x1="10" y1="14" x2="21" y2="3" />
+                    </svg>
+                    {link.title}
+                  </a>
+                ))}
+              </div>
+            )}
           </Card>
         )}
       </div>
diff --git a/frontend/src/pages/tree/TreePage.tsx b/frontend/src/pages/tree/TreePage.tsx
index 3abdd85..fce6cbc 100644
--- a/frontend/src/pages/tree/TreePage.tsx
+++ b/frontend/src/pages/tree/TreePage.tsx
@@ -1,8 +1,9 @@
-import { useMemo, useState } from 'react';
+import { useMemo, useReducer, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router';
 import { usePersonFilter } from '../../hooks/usePersonFilter';
 import { DirectoryToolbar } from './toolbar/DirectoryToolbar';
 import type { DirectoryView } from './types';
+import type { Person } from '../../types/person';
 import { usePersons } from './usePersons';
 import { useSponsorsGraph } from './useSponsorsGraph';
 import { GridView } from './views/GridView';
@@ -11,10 +12,39 @@ import { TimelineView } from './views/TimelineView';
 import { TreeView } from './views/TreeView';
 import { EgoGraphView } from './views/EgoGraphView';
 
+interface ShuffleAction {
+  type: 'SET';
+  persons: Person[];
+}
+
+function shuffleReducer(state: Person[], action: ShuffleAction): Person[] {
+  if (state.length > 0) return state;
+  const copy = [...action.persons];
+  for (let i = copy.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    const a = copy[i];
+    const b = copy[j];
+    if (a !== undefined && b !== undefined) {
+      copy[i] = b;
+      copy[j] = a;
+    }
+  }
+  return copy;
+}
+
 export function TreePage() {
-  const { persons, loading } = usePersons();
+  const { persons, loading, loadingMore } = usePersons();
   const { links, loading: linksLoading } = useSponsorsGraph(persons);
   const [view, setView] = useState<DirectoryView>('grid');
+  const [shuffledPersons, dispatch] = useReducer(shuffleReducer, []);
+
+  useEffect(() => {
+    if (!loading && !loadingMore && persons.length > 0) {
+      dispatch({ type: 'SET', persons });
+    }
+  }, [loading, loadingMore, persons]);
+
+  const displayPersons = shuffledPersons.length > 0 ? shuffledPersons : persons;
   const [searchParams] = useSearchParams();
   const initialYear = searchParams.get('year') ? Number(searchParams.get('year')) : null;
 
@@ -22,18 +52,42 @@ export function TreePage() {
     name,
     years: selectedYears,
     alphabetical,
+    filieres: selectedFilieres,
+    schools: selectedSchools,
     filtered,
     setName,
     toggleYear,
     clearYears,
     toggleAlphabetical,
-  } = usePersonFilter(persons, initialYear !== null ? [initialYear] : []);
+    toggleFiliere,
+    clearFilieres,
+    toggleSchool,
+    clearSchools,
+  } = usePersonFilter(displayPersons, initialYear !== null ? [initialYear] : []);
 
   const availableYears = useMemo(() => {
     const yearSet = new Set(persons.map((p) => p.startYear));
     return Array.from(yearSet).sort((a, b) => a - b);
   }, [persons]);
 
+  const availableFilieres = useMemo(() => {
+    const set = new Set<string>();
+    for (const p of persons) {
+      for (const f of p.filieres) set.add(f.name);
+    }
+    return Array.from(set).sort((a, b) => a.localeCompare(b, 'fr'));
+  }, [persons]);
+
+  const availableSchools = useMemo(() => {
+    const set = new Set<string>();
+    for (const p of persons) {
+      for (const f of p.filieres) {
+        if (f.schoolName) set.add(f.schoolName);
+      }
+    }
+    return Array.from(set).sort((a, b) => a.localeCompare(b, 'fr'));
+  }, [persons]);
+
   return (
     <div className="flex min-h-[calc(100vh-var(--header-height))] flex-col bg-bg">
       {/* En-tête */}
@@ -59,6 +113,14 @@ export function TreePage() {
         selectedYears={selectedYears}
         onToggleYear={toggleYear}
         onClearYears={clearYears}
+        availableFilieres={availableFilieres}
+        selectedFilieres={selectedFilieres}
+        onToggleFiliere={toggleFiliere}
+        onClearFilieres={clearFilieres}
+        availableSchools={availableSchools}
+        selectedSchools={selectedSchools}
+        onToggleSchool={toggleSchool}
+        onClearSchools={clearSchools}
         resultCount={filtered.length}
         loading={loading}
       />
diff --git a/frontend/src/pages/tree/toolbar/DirectoryToolbar.tsx b/frontend/src/pages/tree/toolbar/DirectoryToolbar.tsx
index 6625d79..a99ccee 100644
--- a/frontend/src/pages/tree/toolbar/DirectoryToolbar.tsx
+++ b/frontend/src/pages/tree/toolbar/DirectoryToolbar.tsx
@@ -2,7 +2,7 @@ import { Input } from '../../../components/ui';
 import { cn } from '../../../lib/cn';
 import type { DirectoryView } from '../types';
 import { ViewSwitcher } from './ViewSwitcher';
-import { YearFilter } from './YearFilter';
+import { FilterCombobox } from './FilterCombobox';
 
 const SearchIcon = () => (
   <svg width={14} height={14} viewBox="0 0 15 15" fill="currentColor">
@@ -24,6 +24,14 @@ interface DirectoryToolbarProps {
   selectedYears: number[];
   onToggleYear: (year: number) => void;
   onClearYears: () => void;
+  availableFilieres: string[];
+  selectedFilieres: string[];
+  onToggleFiliere: (f: string) => void;
+  onClearFilieres: () => void;
+  availableSchools: string[];
+  selectedSchools: string[];
+  onToggleSchool: (s: string) => void;
+  onClearSchools: () => void;
   resultCount: number;
   loading: boolean;
 }
@@ -39,12 +47,20 @@ export function DirectoryToolbar({
   selectedYears,
   onToggleYear,
   onClearYears,
+  availableFilieres,
+  selectedFilieres,
+  onToggleFiliere,
+  onClearFilieres,
+  availableSchools,
+  selectedSchools,
+  onToggleSchool,
+  onClearSchools,
   resultCount,
   loading,
 }: DirectoryToolbarProps) {
   return (
     <div className="border-b border-line bg-surface px-4 py-4 sm:px-7 sm:py-5">
-      {/* Ligne 1 : recherche + sélecteurs */}
+      {/* Ligne 1 : recherche + sélecteurs de vue */}
       <div className="flex flex-wrap items-center gap-2.5">
         <Input
           leadingIcon={<SearchIcon />}
@@ -84,23 +100,41 @@ export function DirectoryToolbar({
         </button>
       </div>
 
-      {/* Ligne 2 : filtre années + compteur */}
-      <div className="mt-3.5 flex flex-wrap items-center justify-between gap-3">
+      {/* Ligne 2 : filtres + compteur */}
+      <div className="mt-3.5 flex flex-wrap items-center gap-2">
         {loading ? (
-          <div className="h-7 w-64 animate-pulse rounded-full bg-line" />
+          <div className="h-9 w-64 animate-pulse rounded-[9px] bg-line" />
         ) : (
-          <YearFilter
-            years={years}
-            selected={selectedYears}
-            onToggle={onToggleYear}
-            onClear={onClearYears}
-          />
-        )}
+          <>
+            <FilterCombobox
+              label="Promo"
+              items={years.map(String)}
+              selected={selectedYears.map(String)}
+              onToggle={(y) => {
+                onToggleYear(Number(y));
+              }}
+              onClear={onClearYears}
+              formatItem={(y) => `${y} / ${String(Number(y) + 1).slice(2)}`}
+            />
+            <FilterCombobox
+              label="Filière"
+              items={availableFilieres}
+              selected={selectedFilieres}
+              onToggle={onToggleFiliere}
+              onClear={onClearFilieres}
+            />
+            <FilterCombobox
+              label="École"
+              items={availableSchools}
+              selected={selectedSchools}
+              onToggle={onToggleSchool}
+              onClear={onClearSchools}
+            />
 
-        {!loading && (
-          <span className="shrink-0 text-[12.5px] font-medium text-ink-3">
-            {resultCount} résultat{resultCount > 1 ? 's' : ''}
-          </span>
+            <span className="ml-auto text-[12.5px] font-medium text-ink-3">
+              {resultCount} résultat{resultCount > 1 ? 's' : ''}
+            </span>
+          </>
         )}
       </div>
     </div>
diff --git a/frontend/src/pages/tree/toolbar/FilterCombobox.tsx b/frontend/src/pages/tree/toolbar/FilterCombobox.tsx
new file mode 100644
index 0000000..ac938f9
--- /dev/null
+++ b/frontend/src/pages/tree/toolbar/FilterCombobox.tsx
@@ -0,0 +1,215 @@
+import { useEffect, useRef, useState } from 'react';
+import { cn } from '../../../lib/cn';
+
+const MAX_CHIPS = 2;
+
+interface FilterComboboxProps {
+  label: string;
+  items: string[];
+  selected: string[];
+  onToggle: (item: string) => void;
+  onClear: () => void;
+  formatItem?: (item: string) => string;
+}
+
+export function FilterCombobox({
+  label,
+  items,
+  selected,
+  onToggle,
+  onClear,
+  formatItem,
+}: FilterComboboxProps) {
+  const [open, setOpen] = useState(false);
+  const [query, setQuery] = useState('');
+  const ref = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const fmt = formatItem ?? ((s) => s);
+  const normalize = (s: string) => s.toLowerCase().normalize('NFD').replace(/\p{M}/gu, '');
+
+  const filtered = query.trim()
+    ? items.filter((item) => normalize(fmt(item)).includes(normalize(query)))
+    : items;
+
+  useEffect(() => {
+    if (!open) return;
+    inputRef.current?.focus();
+
+    function onPointerDown(e: PointerEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
+    }
+    function onKeyDown(e: KeyboardEvent) {
+      if (e.key === 'Escape') setOpen(false);
+    }
+    document.addEventListener('pointerdown', onPointerDown);
+    document.addEventListener('keydown', onKeyDown);
+    return () => {
+      document.removeEventListener('pointerdown', onPointerDown);
+      document.removeEventListener('keydown', onKeyDown);
+      setQuery('');
+    };
+  }, [open]);
+
+  if (items.length === 0) return null;
+
+  const active = selected.length > 0;
+  const compact = selected.length > MAX_CHIPS;
+
+  return (
+    <div ref={ref} className="relative w-44 shrink-0">
+      {/* Trigger — largeur fixe */}
+      <div
+        onClick={() => {
+          setOpen(true);
+        }}
+        className={cn(
+          'flex h-9 w-full cursor-text items-center gap-1 overflow-hidden rounded-[9px] border px-2 transition-all duration-150',
+          open
+            ? 'border-ink-2 bg-surface'
+            : active
+              ? 'border-ink bg-surface'
+              : 'border-line bg-surface hover:border-ink-3',
+        )}
+      >
+        {compact ? (
+          /* Mode compact : label · N */
+          <>
+            <span className="flex-1 truncate text-[13px] font-medium text-ink">
+              {label} · {selected.length}
+            </span>
+            <button
+              type="button"
+              onClick={(e) => {
+                e.stopPropagation();
+                onClear();
+              }}
+              className="shrink-0 cursor-pointer text-ink-4 hover:text-ink-2"
+              title="Tout effacer"
+            >
+              <svg
+                width="11"
+                height="11"
+                viewBox="0 0 12 12"
+                fill="none"
+                stroke="currentColor"
+                strokeWidth="2"
+                strokeLinecap="round"
+              >
+                <path d="M2 2l8 8M10 2l-8 8" />
+              </svg>
+            </button>
+          </>
+        ) : active ? (
+          /* 1 ou 2 chips */
+          <>
+            {selected.map((item) => (
+              <span
+                key={item}
+                className="flex shrink-0 items-center gap-0.5 rounded-[5px] bg-ink px-1.5 py-0.5 text-[11px] font-medium text-white"
+              >
+                <span className="max-w-[52px] truncate">{fmt(item)}</span>
+                <button
+                  type="button"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onToggle(item);
+                  }}
+                  className="cursor-pointer opacity-70 hover:opacity-100"
+                >
+                  <svg
+                    width="8"
+                    height="8"
+                    viewBox="0 0 10 10"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2.2"
+                    strokeLinecap="round"
+                  >
+                    <path d="M2 2l6 6M8 2l-6 6" />
+                  </svg>
+                </button>
+              </span>
+            ))}
+          </>
+        ) : (
+          /* Placeholder / input de recherche */
+          <input
+            ref={inputRef}
+            value={query}
+            onChange={(e) => {
+              setQuery(e.target.value);
+              setOpen(true);
+            }}
+            onFocus={() => {
+              setOpen(true);
+            }}
+            placeholder={label}
+            className="w-full bg-transparent text-[13px] text-ink placeholder:text-ink-4 outline-none"
+          />
+        )}
+      </div>
+
+      {/* Dropdown */}
+      {open && (
+        <div className="absolute left-0 top-full z-50 mt-1.5 w-full rounded-xl border border-line bg-surface p-1.5 shadow-lg">
+          {/* Input de recherche quand des chips sont affichées */}
+          {active && (
+            <div className="mb-1 px-1">
+              <input
+                ref={inputRef}
+                value={query}
+                onChange={(e) => {
+                  setQuery(e.target.value);
+                }}
+                placeholder="Rechercher…"
+                className="w-full rounded-[7px] border border-line bg-bg px-2.5 py-1.5 text-[12.5px] text-ink placeholder:text-ink-4 outline-none"
+              />
+            </div>
+          )}
+
+          <div className="max-h-56 overflow-y-auto">
+            {filtered.length === 0 ? (
+              <p className="px-3 py-2 text-[12.5px] text-ink-4">Aucun résultat</p>
+            ) : (
+              filtered.map((item) => {
+                const isSelected = selected.includes(item);
+                return (
+                  <button
+                    key={item}
+                    type="button"
+                    onPointerDown={(e) => {
+                      e.preventDefault();
+                      onToggle(item);
+                      setQuery('');
+                    }}
+                    className={cn(
+                      'flex w-full cursor-pointer items-center justify-between gap-3 rounded-[7px] px-3 py-1.5 text-left text-[12.5px] transition-colors',
+                      isSelected ? 'bg-ink/8 font-medium text-ink' : 'text-ink-2 hover:bg-bg',
+                    )}
+                  >
+                    <span>{fmt(item)}</span>
+                    {isSelected && (
+                      <svg
+                        width="11"
+                        height="11"
+                        viewBox="0 0 12 12"
+                        fill="none"
+                        stroke="currentColor"
+                        strokeWidth="2.2"
+                        strokeLinecap="round"
+                        strokeLinejoin="round"
+                      >
+                        <path d="M2 6l3 3 5-5" />
+                      </svg>
+                    )}
+                  </button>
+                );
+              })
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/pages/tree/toolbar/FilterDropdown.tsx b/frontend/src/pages/tree/toolbar/FilterDropdown.tsx
new file mode 100644
index 0000000..2a521b6
--- /dev/null
+++ b/frontend/src/pages/tree/toolbar/FilterDropdown.tsx
@@ -0,0 +1,136 @@
+import { useEffect, useRef, useState } from 'react';
+import { cn } from '../../../lib/cn';
+
+interface FilterDropdownProps {
+  label: string;
+  items: string[];
+  selected: string[];
+  onToggle: (item: string) => void;
+  onClear: () => void;
+  formatItem?: (item: string) => string;
+}
+
+export function FilterDropdown({
+  label,
+  items,
+  selected,
+  onToggle,
+  onClear,
+  formatItem,
+}: FilterDropdownProps) {
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (!open) return;
+    function onPointerDown(e: PointerEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
+    }
+    function onKeyDown(e: KeyboardEvent) {
+      if (e.key === 'Escape') setOpen(false);
+    }
+    document.addEventListener('pointerdown', onPointerDown);
+    document.addEventListener('keydown', onKeyDown);
+    return () => {
+      document.removeEventListener('pointerdown', onPointerDown);
+      document.removeEventListener('keydown', onKeyDown);
+    };
+  }, [open]);
+
+  if (items.length === 0) return null;
+
+  const active = selected.length > 0;
+  const fmt = formatItem ?? ((s) => s);
+
+  return (
+    <div ref={ref} className="relative">
+      <button
+        type="button"
+        onClick={() => {
+          setOpen((v) => !v);
+        }}
+        className={cn(
+          'flex h-9 cursor-pointer items-center gap-1.5 rounded-[9px] border px-3.5 text-[13px] font-medium transition-all duration-150',
+          active
+            ? 'border-transparent bg-ink text-white'
+            : 'border-line bg-surface text-ink-2 hover:border-ink',
+        )}
+      >
+        {label}
+        {active && (
+          <span className="flex h-4 min-w-4 items-center justify-center rounded-full bg-white/20 px-1 text-[11px] font-semibold">
+            {selected.length}
+          </span>
+        )}
+        <svg
+          width="10"
+          height="10"
+          viewBox="0 0 10 10"
+          fill="none"
+          stroke="currentColor"
+          strokeWidth="1.8"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          className={cn('transition-transform duration-150', open && 'rotate-180')}
+        >
+          <path d="M2 3.5l3 3 3-3" />
+        </svg>
+      </button>
+
+      {open && (
+        <div className="absolute left-0 top-full z-50 mt-1.5 min-w-[180px] rounded-xl border border-line bg-surface p-1.5 shadow-lg">
+          {/* Tout sélectionner / effacer */}
+          <button
+            type="button"
+            onClick={() => {
+              onClear();
+            }}
+            className={cn(
+              'flex w-full cursor-pointer items-center rounded-[7px] px-3 py-1.5 text-[12.5px] font-medium transition-colors',
+              selected.length === 0 ? 'bg-ink text-white' : 'text-ink-2 hover:bg-bg',
+            )}
+          >
+            Tous
+          </button>
+
+          <div className="my-1 h-px bg-line" />
+
+          <div className="max-h-56 overflow-y-auto">
+            {items.map((item) => {
+              const isSelected = selected.includes(item);
+              return (
+                <button
+                  key={item}
+                  type="button"
+                  onClick={() => {
+                    onToggle(item);
+                  }}
+                  className={cn(
+                    'flex w-full cursor-pointer items-center justify-between gap-3 rounded-[7px] px-3 py-1.5 text-[12.5px] transition-colors',
+                    isSelected ? 'bg-ink text-white' : 'text-ink-2 hover:bg-bg',
+                  )}
+                >
+                  <span>{fmt(item)}</span>
+                  {isSelected && (
+                    <svg
+                      width="11"
+                      height="11"
+                      viewBox="0 0 12 12"
+                      fill="none"
+                      stroke="currentColor"
+                      strokeWidth="2.2"
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                    >
+                      <path d="M2 6l3 3 5-5" />
+                    </svg>
+                  )}
+                </button>
+              );
+            })}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/pages/tree/toolbar/TagFilter.tsx b/frontend/src/pages/tree/toolbar/TagFilter.tsx
new file mode 100644
index 0000000..48c88a0
--- /dev/null
+++ b/frontend/src/pages/tree/toolbar/TagFilter.tsx
@@ -0,0 +1,54 @@
+import { cn } from '../../../lib/cn';
+
+interface TagFilterProps {
+  label: string;
+  items: string[];
+  selected: string[];
+  onToggle: (item: string) => void;
+  onClear: () => void;
+}
+
+export function TagFilter({ label, items, selected, onToggle, onClear }: TagFilterProps) {
+  if (items.length === 0) return null;
+  const allSelected = selected.length === 0;
+
+  return (
+    <div className="flex flex-wrap items-center gap-1.5">
+      <span className="text-[11px] font-semibold uppercase tracking-widest text-ink-4">
+        {label}
+      </span>
+      <button
+        type="button"
+        onClick={onClear}
+        className={cn(
+          'h-7 cursor-pointer rounded-full border px-3 text-xs font-medium transition-all duration-100',
+          allSelected
+            ? 'border-ink bg-ink text-white'
+            : 'border-line bg-surface text-ink-2 hover:border-ink',
+        )}
+      >
+        Tous
+      </button>
+      {items.map((item) => {
+        const active = selected.includes(item);
+        return (
+          <button
+            key={item}
+            type="button"
+            onClick={() => {
+              onToggle(item);
+            }}
+            className={cn(
+              'h-7 cursor-pointer rounded-full border px-3 text-xs font-medium transition-all duration-100',
+              active
+                ? 'border-ink bg-ink text-white'
+                : 'border-line bg-surface text-ink-2 hover:border-ink',
+            )}
+          >
+            {item}
+          </button>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/frontend/src/types/person.ts b/frontend/src/types/person.ts
index 9cc2e50..0d8f573 100644
--- a/frontend/src/types/person.ts
+++ b/frontend/src/types/person.ts
@@ -24,6 +24,7 @@ export interface Person {
   characteristics: Characteristic[];
   filieres: Filiere[];
   associations: Association[];
+  links: PersonLink[];
 }
 
 export interface FiliereRequest {
@@ -41,6 +42,24 @@ export interface AssociationRequest {
   endDate: string | null;
 }
 
+export interface CharacteristicRequest {
+  id: number | null;
+  typeId?: number;
+  value: string | null;
+  visible: boolean;
+}
+
+export interface PersonLink {
+  id: number;
+  title: string;
+  url: string;
+}
+
+export interface PersonLinkRequest {
+  title: string;
+  url: string;
+}
+
 export interface PersonRequest {
   firstName: string;
   lastName: string;
@@ -49,6 +68,8 @@ export interface PersonRequest {
   description: string | null;
   filieres: FiliereRequest[];
   associations: AssociationRequest[];
+  characteristics?: CharacteristicRequest[];
+  links?: PersonLinkRequest[];
 }
 
 export interface Filiere {