diff --git a/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
index a46fbee56..b93d8ba90 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Gender/index.html.twig
@@ -16,7 +16,7 @@
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>
-                    <td><i class="{{ entity.icon }}"></i></td>
+                    <td>{{ entity.icon|chill_entity_render_box }}</td>
                     <td>{{ entity.genderTranslation.value }}</td>
                     <td style="text-align:center;">
 						{%- if entity.active -%}
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillGenderIconRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillGenderIconRender.php
new file mode 100644
index 000000000..7494908cb
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillGenderIconRender.php
@@ -0,0 +1,37 @@
+<?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\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\GenderIconEnum;
+use Chill\MainBundle\Entity\NewsItem;
+
+/**
+ * @implements ChillEntityRenderInterface<GenderIconEnum>
+ */
+final readonly class ChillGenderIconRender implements ChillEntityRenderInterface
+{
+    public function renderBox($icon, array $options): string
+    {
+        return
+            '<i class="'. $icon->value .'"></i>';
+    }
+
+    public function renderString($icon, array $options): string
+    {
+        return $icon->value;
+    }
+
+    public function supports($icon, array $options): bool
+    {
+        return $icon instanceof GenderIconEnum;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index 0baa91b69..dc21b07f5 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -49,6 +49,8 @@ services:
 
     Chill\MainBundle\Templating\Entity\NewsItemRender: ~
 
+    Chill\MainBundle\Templating\Entity\ChillGenderIconRender: ~
+
     Chill\MainBundle\Templating\Entity\UserRender: ~
 
     Chill\MainBundle\Templating\Listing\:
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 7c3c02abe..776d87132 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -86,7 +86,8 @@
         </div>
         {%- if options['addInfo'] -%}
             <p class="moreinfo">
-                <i class="{{ person.gender.icon }}" title="{{ person.gender.label|localize_translatable_string }}"></i>
+                {{ person.gender.icon|chill_entity_render_box }}
+{#                <i class="{{ person.gender.icon.value }}" title="{{ person.gender.label|localize_translatable_string }}"></i>#}
 
             {%- if person.deathdate is not null -%}
                 {%- if person.birthdate is not null -%}