diff --git a/app/Resources/views/admin/booking/_partial/bucket_modal.html.twig b/app/Resources/views/admin/booking/_partial/bucket_modal.html.twig
index 5558f7c5e..d86e55444 100644
--- a/app/Resources/views/admin/booking/_partial/bucket_modal.html.twig
+++ b/app/Resources/views/admin/booking/_partial/bucket_modal.html.twig
@@ -1,8 +1,12 @@
 {#
 Template for the modal popup used to change the user register for a shift bucket in /booking/admin
+Also on the /schedule page to display more shift infos (without any action buttons)
 It use the materialize modal class https://materializeweb.com/modals.html
 id = "modal-bucket"
 #}
+{% if (display_names ?? true) %}
+    {% set display_names = display_name_shifters %}
+{% endif %}
 {% set nbBookableShifts = shifts | filter ( shift => not shift.shifter) | length %}
 {% set nbShifts = (shifts | length) %}
 {% set nbBookedShifts = nbShifts - nbBookableShifts %}
@@ -33,7 +37,9 @@ id = "modal-bucket"
                             {% if use_card_reader_to_validate_shifts and shift.isPastOrCurrent %}
                                 <span class="{% if shift.wasCarriedOut %}green-text{% else %}red-text{% endif %}">&#9673;</span>&nbsp;
                             {% endif %}
-                            {{ shift.shifter.displayNameWithMemberNumber }}
+                            {% if display_names %}
+                                {{ shift.shifter.displayNameWithMemberNumber }}
+                            {% endif %}
                             {% if shift.formation %}&nbsp;({{ shift.formation.name }}){% endif %}
                             {% if not shift.formation and shift.shifter.formations | length > 0 %}
                                 &nbsp;<strong class="orange-text">({{ shift.shifter.formations | join(', ') }})</strong>
@@ -54,7 +60,7 @@ id = "modal-bucket"
                             <strong>{% if shift.fixe %}fixe{% else %}volant{% endif %}</strong>
                         {% endif %}
                         réservé
-                        {% if shift.shifter != shift.booker.beneficiary %}
+                        {% if shift.shifter != shift.booker.beneficiary and display_names %}
                             pour <a href="{{ path("member_show", { 'member_number': shift.shifter.membership.memberNumber }) }}" target="_blank">{{ shift.shifter }}</a>
                         {% endif %}
                         le <i>{{ shift.bookedTime | date_fr_full_with_time }}</i>
@@ -75,18 +81,20 @@ id = "modal-bucket"
                                 {% endif %}
                             {{ form_end(shift_validate_invalidate_forms[shift.id]) }}
                         {% endif %}
-                        {{ form_start(shift_free_forms[shift.id], {'attr': { 'style': 'display:inline;' }}) }}
-                            {% do shift_free_forms[shift.id].reason.setRendered() %} <!-- hidden -->
-                            {% if shift.isPast %}
-                                <button type="submit" class="btn red" title="Supprimer la participation">
-                                    <i class="material-icons left">delete</i>Supprimer la participation
-                                </button>
-                            {% else %}
-                                <button type="submit" class="btn orange" title="Libérer">
-                                    <i class="material-icons left">lock_open</i>Libérer
-                                </button>
-                            {% endif %}
-                        {{ form_end(shift_free_forms[shift.id]) }}
+                        {% if shift_free_forms is defined %}
+                            {{ form_start(shift_free_forms[shift.id], {'attr': { 'style': 'display:inline;' }}) }}
+                                {% do shift_free_forms[shift.id].reason.setRendered() %} <!-- hidden -->
+                                {% if shift.isPast %}
+                                    <button type="submit" class="btn red" title="Supprimer la participation">
+                                        <i class="material-icons left">delete</i>Supprimer la participation
+                                    </button>
+                                {% else %}
+                                    <button type="submit" class="btn orange" title="Libérer">
+                                        <i class="material-icons left">lock_open</i>Libérer
+                                    </button>
+                                {% endif %}
+                            {{ form_end(shift_free_forms[shift.id]) }}
+                        {% endif %}
                     {% endif %}
                     <!-- shift.createdBy -->
                     {% if shift.createdBy %}
@@ -104,8 +112,13 @@ id = "modal-bucket"
                         <div class="col s12">
                             <b>
                                 <span style="font-style: italic">
-                                    {% if shift.lastShifter %}réservé à {{ shift.lastShifter.displayNameWithMemberNumber }}
-                                    {% else %}libre
+                                    {% if shift.lastShifter %}
+                                        réservé
+                                        {% if display_names %}
+                                            à {{ shift.lastShifter.displayNameWithMemberNumber }}
+                                        {% endif %}
+                                    {% else %}
+                                        libre
                                     {% endif %}
                                 </span>
                             </b>
@@ -119,29 +132,32 @@ id = "modal-bucket"
                 </div>
                 <div class="collapsible-body">
                     <!-- shift book form -->
-                    {{ form_start(shift_book_forms[shift.id], {'attr': { 'style': 'display:inline;' }}) }}
-                    <div class="row">
-                        <div class="col {% if use_fly_and_fixed %}s7{% else %}s9{% endif %} input-field">
-                            {{ form_label(shift_book_forms[shift.id].shifter) }}
-                            {{ form_widget(shift_book_forms[shift.id].shifter) }}
-                        </div>
-                        {% if use_fly_and_fixed %}
-                            <div class="col s2 input-field">
-                                {{ form_widget(shift_book_forms[shift.id].fixe) }}
+                    {% if shift_book_forms is defined %}
+                        {{ form_start(shift_book_forms[shift.id], {'attr': { 'style': 'display:inline;' }}) }}
+                        <div class="row">
+                            <div class="col {% if use_fly_and_fixed %}s7{% else %}s9{% endif %} input-field">
+                                {{ form_label(shift_book_forms[shift.id].shifter) }}
+                                {{ form_widget(shift_book_forms[shift.id].shifter) }}
                             </div>
-                        {% endif %}
-                        <div class="col s3 input-field">
-                            {% if not use_fly_and_fixed %}
-                                {{ form_widget(shift_book_forms[shift.id].fixe) }}
+                            {% if use_fly_and_fixed %}
+                                <div class="col s2 input-field">
+                                    {{ form_widget(shift_book_forms[shift.id].fixe) }}
+                                </div>
                             {% endif %}
-                            <button type="submit" class="btn">
-                                <i class="material-icons left">add</i>Ajouter
-                            </button>
+                            <div class="col s3 input-field">
+                                {% if not use_fly_and_fixed %}
+                                    {{ form_widget(shift_book_forms[shift.id].fixe) }}
+                                {% endif %}
+                                <button type="submit" class="btn">
+                                    <i class="material-icons left">add</i>Ajouter
+                                </button>
+                            </div>
                         </div>
-                    </div>
-                    {{ form_end(shift_book_forms[shift.id]) }}
+                        {{ form_end(shift_book_forms[shift.id]) }}
+                    {% endif %}
+
                     <!-- shift delete form -->
-                    {% if is_granted("ROLE_ADMIN") %}
+                    {% if is_granted("ROLE_ADMIN") and shift_delete_forms is defined %}
                         {% if not shift.lastShifter %}
                             {{ form_start(shift_delete_forms[shift.id]) }}
                             <button type="submit" title="Supprimer le poste" class="btn red">
@@ -164,49 +180,60 @@ id = "modal-bucket"
 </ul>
 
 {# add shift form #}
-{{ form_start(bucket_shift_add_form, {'attr': { 'style': 'display:inline;' }}) }}
-<input type="hidden" id="{{ bucket_shift_add_form.start.date.vars.id }}" name="{{ bucket_shift_add_form.start.date.vars.full_name }}" value="{{ bucket_shift_add_form.start.date.vars.value }}">
-<input type="hidden" id="{{ bucket_shift_add_form.start.time.vars.id }}" name="{{ bucket_shift_add_form.start.time.vars.full_name }}" value="{{ bucket_shift_add_form.start.time.vars.value }}">
-<input type="hidden" id="{{ bucket_shift_add_form.end.date.vars.id }}" name="{{ bucket_shift_add_form.end.date.vars.full_name }}" value="{{ bucket_shift_add_form.end.date.vars.value }}">
-<input type="hidden" id="{{ bucket_shift_add_form.end.time.vars.id }}" name="{{ bucket_shift_add_form.end.time.vars.full_name }}" value="{{ bucket_shift_add_form.end.time.vars.value }}">
-{{ form_widget(bucket_shift_add_form.job) }}
-<div class="row valign-wrapper">
-    <div class="col s3">
-        {{ form_label(bucket_shift_add_form.number) }}
-        {{ form_widget(bucket_shift_add_form.number) }}
+{% if bucket_shift_add_form is defined %}
+    {{ form_start(bucket_shift_add_form, {'attr': { 'style': 'display:inline;' }}) }}
+    <input type="hidden" id="{{ bucket_shift_add_form.start.date.vars.id }}" name="{{ bucket_shift_add_form.start.date.vars.full_name }}" value="{{ bucket_shift_add_form.start.date.vars.value }}">
+    <input type="hidden" id="{{ bucket_shift_add_form.start.time.vars.id }}" name="{{ bucket_shift_add_form.start.time.vars.full_name }}" value="{{ bucket_shift_add_form.start.time.vars.value }}">
+    <input type="hidden" id="{{ bucket_shift_add_form.end.date.vars.id }}" name="{{ bucket_shift_add_form.end.date.vars.full_name }}" value="{{ bucket_shift_add_form.end.date.vars.value }}">
+    <input type="hidden" id="{{ bucket_shift_add_form.end.time.vars.id }}" name="{{ bucket_shift_add_form.end.time.vars.full_name }}" value="{{ bucket_shift_add_form.end.time.vars.value }}">
+    {{ form_widget(bucket_shift_add_form.job) }}
+    <div class="row valign-wrapper">
+        <div class="col s3">
+            {{ form_label(bucket_shift_add_form.number) }}
+            {{ form_widget(bucket_shift_add_form.number) }}
+        </div>
+        <div class="col s6">
+            {{ form_label(bucket_shift_add_form.formation) }}
+            {{ form_widget(bucket_shift_add_form.formation) }}
+        </div>
+        <div class="col s3">
+            <button type="submit" class="btn waves-effect waves-light teal">
+                <i class="material-icons left">add</i>Ajouter
+            </button>
+        </div>
     </div>
-    <div class="col s6">
-        {{ form_label(bucket_shift_add_form.formation) }}
-        {{ form_widget(bucket_shift_add_form.formation) }}
-    </div>
-    <div class="col s3">
-        <button type="submit" class="btn waves-effect waves-light teal">
-            <i class="material-icons left">add</i>Ajouter
-        </button>
-    </div>
-</div>
-{{ form_row(bucket_shift_add_form._token) }}
-{{ form_end(bucket_shift_add_form, {'render_rest': false}) }}
+    {{ form_row(bucket_shift_add_form._token) }}
+    {{ form_end(bucket_shift_add_form, {'render_rest': false}) }}
+{% endif %}
 
 {# bucket actions #}
-<a href="{{ path('mail_bucketshift', { 'id': bucket.id }) }}" class="btn">
-    <i class="material-icons left">mail</i>Envoyer un email
-</a>
-{{ form_start(bucket_lock_unlock_form, {'attr': { 'style': 'display:inline;' }}) }}
-{% if bucket.locked %}
-    <button type="submit" class="btn orange">
-        <i class="material-icons left">lock_open</i>Déverrouiller
-    </button>
-{% else %}
-    <button type="submit" class="btn orange">
-        <i class="material-icons left">lock</i>Verrouiller
-    </button>
+{% if display_send_email_button ?? false and is_granted("ROLE_ADMIN_PANEL") %}
+    <a href="{{ path('mail_bucketshift', { 'id': bucket.id }) }}" class="btn">
+        <i class="material-icons left">mail</i>Envoyer un email
+    </a>
 {% endif %}
-{{ form_end(bucket_lock_unlock_form) }}
-<a href="{{ path('bucket_edit', { 'id': bucket.id }) }}" class="btn deep-purple">
-    <i class="material-icons left">edit</i>Editer
-</a>
-{% if is_granted("ROLE_ADMIN") %}
+
+{% if bucket_lock_unlock_form is defined %}
+    {{ form_start(bucket_lock_unlock_form, {'attr': { 'style': 'display:inline;' }}) }}
+    {% if bucket.locked %}
+        <button type="submit" class="btn orange">
+            <i class="material-icons left">lock_open</i>Déverrouiller
+        </button>
+    {% else %}
+        <button type="submit" class="btn orange">
+            <i class="material-icons left">lock</i>Verrouiller
+        </button>
+    {% endif %}
+    {{ form_end(bucket_lock_unlock_form) }}
+{% endif %}
+
+{% if display_edit_button ?? false and is_granted("ROLE_SHIFT_MANAGER") %}
+    <a href="{{ path('bucket_edit', { 'id': bucket.id }) }}" class="btn deep-purple">
+        <i class="material-icons left">edit</i>Editer
+    </a>
+{% endif %}
+
+{% if is_granted("ROLE_ADMIN") and bucket_delete_form is defined %}
     <!-- bucket delete is allowed only if all shifts are free -->
     {{ form_start(bucket_delete_form, {'attr': { 'style': 'display:inline;' }}) }}
     <button id="bucket_delete" class="btn red" title="Supprimer tous les créneaux à cette heure et ce poste" {% if not use_time_log_saving and (nbBookedShifts > 0) %}disabled{% endif %}>
diff --git a/app/Resources/views/admin/member/_partial/member_or_user_link.html.twig b/app/Resources/views/admin/member/_partial/member_or_user_link.html.twig
index efb216fd9..24f0848b7 100644
--- a/app/Resources/views/admin/member/_partial/member_or_user_link.html.twig
+++ b/app/Resources/views/admin/member/_partial/member_or_user_link.html.twig
@@ -1,6 +1,9 @@
+{% if (display_names ?? true) %}
+    {% set display_names = display_name_shifters %}
+{% endif %}
 {% set target_blank = target_blank ?? false %}
 
-{% if user %}
+{% if user and display_names %}
     {% if user.beneficiary %}
         <a href="{{ path("member_show", { 'member_number': user.beneficiary.membership.memberNumber }) }}" {% if target_blank %}target="_blank"{% endif %}>
             {{ user.beneficiary }}
@@ -8,4 +11,6 @@
     {% else %}
         {{ user }}
     {% endif %}
+{% else %}
+    quelqu'un⋅e
 {% endif %}
diff --git a/app/Resources/views/booking/_partial/shift.html.twig b/app/Resources/views/booking/_partial/shift.html.twig
index 51ee13499..ce7fbcb96 100644
--- a/app/Resources/views/booking/_partial/shift.html.twig
+++ b/app/Resources/views/booking/_partial/shift.html.twig
@@ -14,7 +14,12 @@
             {% endfor %}
         {% endif %}
     </div>
-    <a {% if firstBookableShift %}href="#book{{ firstBookableShift.id }}"{% endif %}
+    <a
+        {% if firstBookableShift %}
+            href="#book{{ firstBookableShift.id }}"
+        {% else %}
+            href="#show{{ bucket.id }}"
+        {% endif %}
        class="modal-trigger tooltipped" data-position="top" data-delay="100" data-tooltip="{{ bucket.sortedShifts.first.job.name }}">
         <div class="z-depth-1 {{ bucket.sortedShifts.first.job.color }} lighten-5 black-text" style="position: relative">
             <div class="shift-block">
@@ -65,4 +70,10 @@
 </div>
 {% if firstBookableShift %}
     {% include "booking/_partial/modal.html.twig" with { beneficiary: beneficiary, user: app.user, bucket: bucket, cycle: cycle } %}
+{% else %}
+    <div id="show{{ bucket.id }}" class="modal">
+        <div class="modal-content">
+            {% include "admin/booking/_partial/bucket_modal.html.twig" with { shifts: bucket.getSortedShifts() } %}
+        </div>
+    </div>
 {% endif %}
diff --git a/src/AppBundle/Controller/BookingController.php b/src/AppBundle/Controller/BookingController.php
index 68de924a4..ee1c56c5d 100644
--- a/src/AppBundle/Controller/BookingController.php
+++ b/src/AppBundle/Controller/BookingController.php
@@ -340,6 +340,8 @@ public function showBucketAction(Request $request, Shift $bucket)
 
         return $this->render('admin/booking/_partial/bucket_modal.html.twig', [
             'shifts' => $shifts,
+            'display_send_email_button' => true,
+            'display_edit_button' => true,
             'bucket_shift_add_form' => $bucketShiftAddForm->createView(),
             'shift_book_forms' => $shiftBookForms,
             'shift_delete_forms' => $shiftDeleteForms,