diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 08a62287f..cb9392ac0 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -18,6 +18,7 @@ Moderator: Animateur
 Details of an event: Détails d'un événement
 New event: Nouvel événement
 Back to the most recent events: Retour aux derniers événements
+Back to the person events: Retour aux événements de la personne
 Event creation: Création d'un événement
 Add an event: Ajouter un événement
 Event edit: Modifier un événement
diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig
index 34158ef88..a85995ebb 100644
--- a/Resources/views/Event/edit.html.twig
+++ b/Resources/views/Event/edit.html.twig
@@ -26,8 +26,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
-                {{ 'Back to the most recent events'|trans }}
+
+            {% set returnPath = app.request.get('return_path') %}
+            {% set returnLabel = app.request.get('return_label') %}
+
+            <a href="{{ returnPath |default( path('chill_event_list_most_recent') ) }}" class="sc-button bt-cancel">
+                {{ returnLabel |default('Back to the most recent events'|trans) }}
             </a>
         </li>
         <li>
diff --git a/Resources/views/Event/listByPerson.html.twig b/Resources/views/Event/listByPerson.html.twig
index daa5eb540..4c17630e4 100644
--- a/Resources/views/Event/listByPerson.html.twig
+++ b/Resources/views/Event/listByPerson.html.twig
@@ -45,8 +45,46 @@
                 <td>
                     <ul class="record_actions">
                         <li>
+                            {% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
+                            {% set returnLabel = 'Back to the person events'|trans %}
+
+                            {# temporaire --
+                               TODO corriger EventVoter.php pour régler les autorisations sur les boutons, puis remplacer ci-dessous par le code commenté #}
+
+                                <a href="{{ path('chill_event__event_show', {
+                                    'event_id' : participation.event.id,
+                                    'return_path' : currentPath,
+                                    'return_label' : returnLabel
+                                }) }}" class="sc-button bt-show"></a>
+
+                                <div class="bt-dropdown">
+                                    <a href="" class="sc-button bt-update"></a>
+                                    <div class="bt-dropdown-content">
+
+                                        <a href="{{ path('chill_event__event_edit', {
+                                            'event_id' : participation.event.id,
+                                            'return_path' : currentPath,
+                                            'return_label' : returnLabel
+                                            }) }}" class="sc-button bt-update">{{ 'Event edit'|trans }}
+                                        </a>
+
+                                        <a href="{{ path('chill_event_participation_edit', {
+                                            'participation_id' : participation.id,
+                                            'return_path' : currentPath,
+                                            'return_label' : returnLabel
+                                            }) }}" class="sc-button bt-update">{{ 'Participation Edit'|trans }}
+                                        </a>
+
+                                    </div>
+                                </div>
+
+                            {#
                             {% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
-                                <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button bt-show"></a>
+                                <a href="{{ path('chill_event__event_show', {
+                                    'event_id' : participation.event.id,
+                                    'return_path' : currentPath,
+                                    'return_label' : returnLabel
+                                     } ) }}" class="sc-button bt-show"></a>
                             {% endif %}
 
                             {% if  is_granted('CHILL_EVENT_UPDATE', participation.event)
@@ -56,11 +94,18 @@
                                     <a href="" class="sc-button bt-update"></a>
                                     <div class="bt-dropdown-content">
 
-                                        <a href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id } ) }}" class="sc-button bt-update">
-                                            {{ 'Event edit'|trans }}
+                                        <a href="{{ path('chill_event__event_edit', {
+                                            'event_id' : participation.event.id,
+                                            'return_path' : currentPath,
+                                            'return_label' : returnLabel
+                                            }) }}" class="sc-button bt-update">{{ 'Event edit'|trans }}
                                         </a>
-                                        <a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id } ) }}" class="sc-button bt-update">
-                                            {{ 'Participation Edit'|trans }}
+
+                                        <a href="{{ path('chill_event_participation_edit', {
+                                            'participation_id' : participation.id,
+                                            'return_path' : currentPath,
+                                            'return_label' : returnLabel
+                                            }) }}" class="sc-button bt-update">{{ 'Participation Edit'|trans }}
                                         </a>
 
                                     </div>
@@ -68,17 +113,25 @@
                             {% else %}
 
                                 {% if is_granted('CHILL_EVENT_UPDATE', participation.event) %}
-                                    <a href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id } ) }}" class="sc-button bt-update has-hidden">
-                                        <span class="show-on-hover">{{ 'Event edit'|trans }}</span>
+                                    <a href="{{ path('chill_event__event_edit', {
+                                        'event_id' : participation.event.id,
+                                        'return_path' : currentPath,
+                                        'return_label' : returnLabel
+                                        }) }}" class="sc-button bt-update">{{ 'Event edit'|trans }}
                                     </a>
                                 {% endif %}
+
                                 {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
-                                    <a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id } ) }}" class="sc-button bt-update has-hidden">
-                                        <span class="show-on-hover">{{ 'Participation Edit'|trans }}</span>
+                                    <a href="{{ path('chill_event_participation_edit', {
+                                        'participation_id' : participation.id,
+                                        'return_path' : currentPath,
+                                        'return_label' : returnLabel
+                                        }) }}" class="sc-button bt-update">{{ 'Participation Edit'|trans }}
                                     </a>
                                 {% endif %}
 
                             {% endif %}
+                            #}
                         </li>
                     </ul>
                 </td>
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index c97342528..c5af27003 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -34,11 +34,19 @@
     </table>
             
     <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_event__event_edit', { 'event_id': event.id }) }}" class="sc-button bt-edit">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
+        {% set returnPath = app.request.get('return_path') %}
+        {% set returnLabel = app.request.get('return_label') %}
+        {% if returnPath and returnLabel %}
+            <li class="cancel">
+                <a href="{{ returnPath }}" class="sc-button bt-cancel">{{ returnLabel }}</a>
+            </li>
+        {% endif %}
+
+        <li>
+            <a href="{{ path('chill_event__event_edit', { 'event_id': event.id }) }}" class="sc-button bt-edit">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
     </ul>
             
     <h2>{{ 'Participations'|trans }}</h2>
diff --git a/Resources/views/Participation/edit.html.twig b/Resources/views/Participation/edit.html.twig
index 004108a26..86b9422a2 100644
--- a/Resources/views/Participation/edit.html.twig
+++ b/Resources/views/Participation/edit.html.twig
@@ -28,8 +28,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button bt-cancel">
-                {{ 'Back to the event'|trans }}
+
+            {% set returnPath = app.request.get('return_path') %}
+            {% set returnLabel = app.request.get('return_label') %}
+
+            <a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="sc-button bt-cancel">
+                {{ returnLabel |default('Back to the event'|trans) }}
             </a>
         </li>
         <li>