diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52caa3ea5..9d05f1767 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
+* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
 * [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
 * [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
 * [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 3858979ef..97861ba67 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -179,14 +179,15 @@ final class ActivityController extends AbstractController
     {
         $view = null;
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
         $entity = $this->activityRepository->find($id);
 
         if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        $person = $entity->getPerson();
+
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
             $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -220,6 +221,9 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $entity->getId();
+
             if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
@@ -227,15 +231,13 @@ final class ActivityController extends AbstractController
                         'template' => $form->get('gendocTemplateId')->getData(),
                         'entityClassName' => Activity::class,
                         'entityId' => $entity->getId(),
+                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params)
                     ]
                 );
             }
 
             $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
 
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $entity->getId();
-
             return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
 
@@ -444,6 +446,9 @@ final class ActivityController extends AbstractController
                         'template' => $form->get('gendocTemplateId')->getData(),
                         'entityClassName' => Activity::class,
                         'entityId' => $entity->getId(),
+                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
+                            'id' => $entity->getId(),
+                        ])
                     ]
                 );
             }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 6f935ad99..891eb8577 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -305,6 +305,7 @@ class ActivityType extends AbstractType
                 'label' => $activityType->getLabel('documents'),
                 'required' => $activityType->isRequired('documents'),
                 'allow_add' => true,
+                'allow_delete' => true,
                 'button_add_label' => 'activity.Insert a document',
                 'button_remove_label' => 'activity.Remove a document',
                 'empty_collection_explain' => 'No documents',
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
new file mode 100644
index 000000000..16e66eadb
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -0,0 +1,16 @@
+div.chill-dropzone__below-zone {
+    a.btn-delete {
+        display: none;
+    }
+}
+
+// do it in js does not work
+// document.addEventListener('DOMContentLoaded', e => {
+//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
+//     dropzoneBelow.forEach(
+//         d => {
+//             const a = d.querySelector('a.btn-delete');
+//             d.removeChild(a);
+//         }
+//     )
+// });
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index b278c0300..d0359e223 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -30,4 +30,5 @@
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
+    {{ encore_entry_link_tags('page_edit_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/chill.webpack.config.js b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
index f312e8a19..eec983920 100644
--- a/src/Bundle/ChillActivityBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
@@ -7,5 +7,7 @@ module.exports = function(encore, entries)
         ChillActivityAssets: __dirname + '/Resources/public'
     });
 
+    encore.addEntry('page_edit_activity', __dirname + '/Resources/public/page/edit_activity/index.scss');
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };