diff --git a/src/Bundle/ChillMainBundle/Form/GenderType.php b/src/Bundle/ChillMainBundle/Form/GenderType.php
index 2f188ba58..d6a95e803 100644
--- a/src/Bundle/ChillMainBundle/Form/GenderType.php
+++ b/src/Bundle/ChillMainBundle/Form/GenderType.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\GenderEnum;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -20,11 +21,11 @@ class GenderType extends AbstractType
                 'required' => true,
             ])
             ->add('icon', TextType::class)
-            ->add('isGrammatical', ChoiceType::class, [
-                'choices' => [
-                    'Grammatical' => true,
-                    'Not grammatical' => false,
-                ],
+            ->add('genderTranslation', ChoiceType::class, [
+                'choices' => GenderEnum::cases(),
+                'choice_label' => fn(GenderEnum $enum) => ucfirst(strtolower($enum->name)),
+                'choice_value' => fn(?GenderEnum $enum) => $enum ? $enum->value : null,
+                'data_class' => null,
             ])
             ->add('active', ChoiceType::class, [
                 'choices' => [
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
index 82994aaa4..a46fbee56 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
@@ -6,7 +6,7 @@
             <th>id</th>
             <th>{{ 'gender.label'|trans }}</th>
             <th>{{ 'gender.icon'|trans }}</th>
-            <th>{{ 'gender.isGrammatical'|trans }}</th>
+            <th>{{ 'gender.genderTranslation'|trans }}</th>
             <th>{{ 'gender.active'|trans }}</th>
             <th>{{ 'gender.ordering'|trans }}</th>
             <th></th>
@@ -16,15 +16,8 @@
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>
-{#                    todo: decide which icon source to use#}
                     <td><i class="{{ entity.icon }}"></i></td>
-                    <td style="text-align:center;">
-                        {%- if entity.isGrammatical -%}
-                            <i class="fa fa-check-square-o"></i>
-                        {%- else -%}
-                            <i class="fa fa-square-o"></i>
-                        {%- endif -%}
-                    </td>
+                    <td>{{ entity.genderTranslation.value }}</td>
                     <td style="text-align:center;">
 						{%- if entity.active -%}
 							<i class="fa fa-check-square-o"></i>
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20240925133053.php b/src/Bundle/ChillMainBundle/migrations/Version20240925133053.php
deleted file mode 100644
index 4767ff3bd..000000000
--- a/src/Bundle/ChillMainBundle/migrations/Version20240925133053.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20240925133053 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add gender entity';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('CREATE SEQUENCE chill_main_gender_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_main_gender (id INT NOT NULL, label JSON NOT NULL, active BOOLEAN NOT NULL, isGrammatical BOOLEAN NOT NULL, icon VARCHAR(255) NOT NULL, ordering DOUBLE PRECISION DEFAULT \'0.0\', PRIMARY KEY(id))');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_main_gender_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_main_gender');
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index c8ba84797..aa59948df 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -996,7 +996,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->fullnameCanonical;
     }
 
-    public function getGender(): ?string
+    public function getGender(): ?Gender
     {
         return $this->gender;
     }
@@ -1525,7 +1525,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setGender(?string $gender): self
+    public function setGender(?Gender $gender): self
     {
         $this->gender = $gender;
 
@@ -1650,16 +1650,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function getGenderKind(): ?Gender
-    {
-        return $this->genderKind;
-    }
-
-    public function setGenderKind(?Gender $genderKind): void
-    {
-        $this->genderKind = $genderKind;
-    }
-
     private function getCurrentCenterHistory(): ?PersonCenterHistory
     {
         if (0 === $this->centerHistory->count()) {
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 9bfb75e31..bb40c6c35 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -20,8 +20,8 @@ use Chill\MainBundle\Form\Type\PickCenterType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
+use Chill\PersonBundle\Form\Type\PickGenderType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -60,7 +60,7 @@ final class CreationPersonType extends AbstractType
                 'label' => 'Civility',
                 'placeholder' => 'choose civility',
             ])
-            ->add('gender', GenderType::class, [
+            ->add('gender', PickGenderType::class, [
                 'required' => true, 'placeholder' => null,
             ])
             ->add('birthdate', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 21717a25b..0f4fbd8e4 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -24,9 +24,9 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
-use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
+use Chill\PersonBundle\Form\Type\PickGenderType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -80,7 +80,7 @@ class PersonType extends AbstractType
                 'input' => 'datetime_immutable',
                 'widget' => 'single_text',
             ])
-            ->add('gender', GenderType::class, [
+            ->add('gender', PickGenderType::class, [
                 'required' => true,
             ])
             ->add('genderComment', CommentType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php b/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
deleted file mode 100644
index 2989b3ec4..000000000
--- a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\PersonBundle\Form\Type;
-
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * A type to select the civil union state.
- */
-class GenderType extends AbstractType
-{
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $a = [
-            Person::MALE_GENDER => Person::MALE_GENDER,
-            Person::FEMALE_GENDER => Person::FEMALE_GENDER,
-            Person::BOTH_GENDER => Person::BOTH_GENDER,
-        ];
-
-        $resolver->setDefaults([
-            'choices' => $a,
-            'expanded' => true,
-            'multiple' => false,
-            'placeholder' => null,
-        ]);
-    }
-
-    public function getParent()
-    {
-        return ChoiceType::class;
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickGenderType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickGenderType.php
new file mode 100644
index 000000000..4d4552caf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickGenderType.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Form\Type;
+
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * A type to select the civil union state.
+ */
+class PickGenderType extends AbstractType
+{
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('label', 'Gender')
+            ->setDefault(
+                'choice_label',
+                fn (Gender $gender): string => $this->translatableStringHelper->localize($gender->getLabel())
+            )
+            ->setDefault(
+                'query_builder',
+                static fn (EntityRepository $er): QueryBuilder => $er->createQueryBuilder('g')
+                    ->where('g.active = true')
+                    ->orderBy('g.order'),
+            )
+            ->setDefault('placeholder', 'choose gender')
+            ->setDefault('class', Gender::class);
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 5c606e737..bd3ff0ff1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -106,7 +106,7 @@
                 {%- endif -%}
             {%- elseif person.birthdate is not null -%}
                 <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
-                {{ 'Born the date'|trans({'gender': person.gender,
+                {{ 'Born the date'|trans({'gender': person.gender.genderTranslation.value,
                     'birthdate': person.birthdate|format_date("medium") }) }}
                 </time>
                 {%- if options['addAge'] -%}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 9b2edf573..c65e8ccdd 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -2,7 +2,7 @@ Born the date: >-
     {gender, select,
         man {Né le {birthdate}}
         woman {Née le {birthdate}}
-        other {Né·e le {birthdate}}
+        neutral {Né·e le {birthdate}}
     }
 
 Requestor: >-