diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
index 314c00791..771153d0c 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
@@ -114,11 +114,13 @@
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" type="text/css" href="{{ asset('build/async_upload.css') }}" />
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock css %}
 
 {% block js %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ asset('build/async_upload.js') }}"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
     <script type="text/javascript" src="{{ asset('build/personal_situation_edit.js') }}"></script>
 {% endblock js %}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig
index 7f8798801..8409fcffc 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig
@@ -1,12 +1,12 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set person = entity.getPerson() %}
 
 {% set activeRouteKey = '' %}
-{% set niveaux_maitrise_langue = constant('CSConnectes\\SPBundle\\Entity\\CSPerson::NIVEAU_MAITRISE_LANGUE') %}
-{% set permis_conduire = constant('CSConnectes\\SPBundle\\Entity\\CSPerson::PERMIS_CONDUIRE') %}
-{% set types_contrat = constant('CSConnectes\\SPBundle\\Entity\\CSPerson::TYPE_CONTRAT') %}
-{% set ressources = constant('CSConnectes\\SPBundle\\Entity\\CSPerson::RESSOURCES') %}
+{% set niveaux_maitrise_langue = constant('Chill\\JobBundle\\Entity\\CSPerson::NIVEAU_MAITRISE_LANGUE') %}
+{% set permis_conduire = constant('Chill\\JobBundle\\Entity\\CSPerson::PERMIS_CONDUIRE') %}
+{% set types_contrat = constant('Chill\\JobBundle\\Entity\\CSPerson::TYPE_CONTRAT') %}
+{% set ressources = constant('Chill\\JobBundle\\Entity\\CSPerson::RESSOURCES') %}
 
 {% import '@ChillDocStore/Macro/macro.html.twig' as doc %}
 
@@ -182,7 +182,7 @@
 
         <dt>Montant CPF</dt>
         {% if entity.cPFMontant is not null %}
-            <dd>{{ entity.cPFMontant|localizedcurrency('EUR') }}</dd>
+            <dd>{{ entity.cPFMontant|format_currency('EUR') }}</dd>
         {% else %}
             <dd>{{ null|chill_print_or_message }}</dd>
         {% endif %}
@@ -190,7 +190,7 @@
 
         <dt>Montant acompte DIF</dt>
         {% if entity.acompteDIF is not null %}
-            <dd>{{ entity.acompteDIF|localizedcurrency('EUR') }}</dd>
+            <dd>{{ entity.acompteDIF|format_currency('EUR') }}</dd>
         {% else %}
             <dd>{{ null|chill_print_or_message }}</dd>
         {% endif %}
@@ -267,7 +267,7 @@
 
 
     <ul class="record_actions sticky-form-buttons">
-        <li><a class="sc-button bt-update" href="{{ path('chill_crud_csperson_personal_situation_edit', { 'id': entity.person.id }) }}">Modifier</a></li>
+        <li><a class="btn btn-update" href="{{ path('chill_crud_job_personal_situation_edit', { 'id': entity.person.id }) }}">Modifier</a></li>
     </ul>
 {% endblock %}