diff --git a/src/Bundle/ChillMainBundle/Resources/views/Gender/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Gender/edit.html.twig
index 4d55c480c..39f01e519 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Gender/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Gender/edit.html.twig
@@ -4,8 +4,72 @@
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
+{% form_theme form _self %}
+
+{% block _gender_icon_widget %}
+    {% for child in form %}
+        <div class="form-check">
+            <input
+                type="radio"
+                id="{{ child.vars.id }}"
+                name="{{ child.vars.full_name }}"
+                value="{{ child.vars.value }}"
+                {% if child.vars.checked %}checked="checked"{% endif %}
+            />
+
+            <label for="{{ child.vars.id }}">{{ child.vars.label|raw }}</label>
+        </div>
+    {% endfor %}
+{% endblock %}
+
 {% block admin_content %}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+    {% set formId = crudMainFormId|default('crud_main_form') %}
+
+    {% block crud_content_header %}
+        <h1 class="mb-5">{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
+    {% endblock crud_content_header %}
+
+    {% block crud_content_form %}
+        {{ form_start(form, { 'attr' : { 'id': formId } }) }}
+
+        {{ form_row(form.label) }}
+        {{ form_row(form.genderTranslation) }}
+        {{ form_row(form.icon) }}
+        {{ form_row(form.active) }}
+        {{ form_row(form.order) }}
+
+        {{ form_end(form) }}
+        {% block crud_content_after_form %}{% endblock %}
+
+        {% block crud_content_form_actions %}
+            <ul class="record_actions sticky-form-buttons">
+                {% block content_form_actions_back %}
+                    <li class="cancel">
+                        {#                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">#}
+                        {#                        {{ 'Cancel'|trans }}#}
+                        {#                    </a>#}
+                    </li>
+                {% endblock %}
+                {% block content_form_actions_before %}{% endblock %}
+                {% block content_form_actions_delete %}
+                    {% if chill_crud_action_exists(crud_name, 'delete') %}
+                        {% if is_granted(chill_crud_config('role', crud_name, 'delete'), entity) %}
+                            <li class="">
+                                <a class="btn btn-small btn-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id }) }}"></a>
+                            </li>
+                        {% endif %}
+                    {% endif %}
+                {% endblock content_form_actions_delete %}
+                {% block content_form_actions_save_and_close %}
+                    <li class="">
+                        <button type="submit" name="submit" value="save-and-close" class="btn btn-update" form="{{ formId }}">
+                            {{ 'crud.edit.save_and_close'|trans }}
+                        </button>
+                    </li>
+                {% endblock %}
+                {% block content_form_actions_after %}{% endblock %}
+            </ul>
+        {% endblock %}
+
+    {% endblock %}
 {% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Gender/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Gender/new.html.twig
index 7c204dddd..a07ebfa9d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Gender/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Gender/new.html.twig
@@ -4,8 +4,76 @@
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
+{% form_theme form _self %}
+
+{% block _gender_icon_widget %}
+    {% for child in form %}
+        <div class="form-check">
+            <input
+                type="radio"
+                id="{{ child.vars.id }}"
+                name="{{ child.vars.full_name }}"
+                value="{{ child.vars.value }}"
+                {% if child.vars.checked %}checked="checked"{% endif %}
+            />
+
+            <label for="{{ child.vars.id }}">{{ child.vars.label|raw }}</label>
+        </div>
+    {% endfor %}
+{% endblock %}
+
 {% block admin_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+    {% set formId = crudMainFormId|default('crud_main_form') %}
+
+    {% block crud_content_header %}
+        <h1>{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}</h1>
+    {% endblock crud_content_header %}
+
+    {% block crud_content_form %}
+        {{ form_start(form, { 'attr' : { 'id': formId } }) }}
+            {{ form_row(form.label) }}
+            {{ form_row(form.genderTranslation) }}
+            {{ form_row(form.icon) }}
+            {{ form_row(form.active) }}
+            {{ form_row(form.order) }}
+        {{ form_end(form) }}
+
+        {% block crud_content_after_form %}{% endblock %}
+
+        {% block crud_content_form_actions %}
+            <ul class="record_actions sticky-form-buttons">
+                {% block content_form_actions_back %}
+                    <li class="cancel">
+                        <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                            {{ 'Cancel'|trans }}
+                        </a>
+                    </li>
+                {% endblock %}
+                {% block content_form_actions_save_and_close %}
+                    <li class="">
+                        <button type="submit" name="submit" value="save-and-close" class="btn btn-create" form="{{ formId }}">
+                            {{ 'crud.new.save_and_close'|trans }}
+                        </button>
+                    </li>
+                {% endblock %}
+                {% block content_form_actions_save_and_show %}
+                    <li class="">
+                        <button type="submit" name="submit" value="save-and-show" class="btn btn-create" form="{{ formId }}">
+                            {{ 'crud.new.save_and_show'|trans }}
+                        </button>
+                    </li>
+                {% endblock %}
+                {% block content_form_actions_save_and_new %}
+                    <li class="">
+                        <button type="submit" name="submit" value="save-and-new" class="btn btn-create" form="{{ formId }}">
+                            {{ 'crud.new.save_and_new'|trans }}
+                        </button>
+                    </li>
+                {% endblock %}
+            </ul>
+        {% endblock %}
+
+        {{ form_end(form) }}
+    {% endblock %}
+
 {% endblock admin_content %}