diff --git a/Gemfile.lock b/Gemfile.lock
index 2f1796a89..591a7f8dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -132,7 +132,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.9.3)
       msgpack (~> 1.0)
-    brakeman (5.2.2)
+    brakeman (5.4.1)
     browser (5.3.1)
     builder (3.2.4)
     byebug (11.1.3)
diff --git a/app/assets/stylesheets/02_utils.scss b/app/assets/stylesheets/02_utils.scss
index 30a869ff3..301314aa2 100644
--- a/app/assets/stylesheets/02_utils.scss
+++ b/app/assets/stylesheets/02_utils.scss
@@ -139,6 +139,10 @@
   overflow: visible;
 }
 
+.super {
+  vertical-align: super;
+}
+
 // generate spacer utility like bootstrap my-2 -> margin-left/right: 2 * $default-spacer
 // using $direction.key as css modifier, $direction.values to set css properties
 // scale it using $steps
diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss
index e94100721..2066e1228 100644
--- a/app/assets/stylesheets/buttons.scss
+++ b/app/assets/stylesheets/buttons.scss
@@ -140,7 +140,7 @@
   height: 25px;
 }
 
-.state-button {
+.instruction-button {
   display: inline-block;
 }
 
diff --git a/app/assets/stylesheets/dossiers_table.scss b/app/assets/stylesheets/dossiers_table.scss
index aa1aaf791..471158b56 100644
--- a/app/assets/stylesheets/dossiers_table.scss
+++ b/app/assets/stylesheets/dossiers_table.scss
@@ -78,7 +78,7 @@
   }
 
   .follow-col {
-    width: 200px;
+    width: 450px;
 
     .fr-btn {
       margin-bottom: 0;
diff --git a/app/assets/stylesheets/dsfr.scss b/app/assets/stylesheets/dsfr.scss
index 42e777d35..bd3100ce6 100644
--- a/app/assets/stylesheets/dsfr.scss
+++ b/app/assets/stylesheets/dsfr.scss
@@ -56,3 +56,13 @@ fieldset {
   }
 }
 
+// dans le DSFR il est possible d'avoir un bouton seulement avec une icone mais j'ai du surcharger ici pour eviter d'avoir des marges de l'icone. Je n'ai pas bien compris pourquoi
+.fr-btns-group--sm.fr-btns-group--icon-right .fr-btn[class*=" fr-icon-"].icon-only::after {
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.fr-btn.fr-btn--secondary.danger {
+  color: $light-red;
+  box-shadow: 0px 0px 0px 1px $light-red;
+}
diff --git a/app/controllers/instructeurs/dossiers_controller.rb b/app/controllers/instructeurs/dossiers_controller.rb
index 09bf7222b..f013c537a 100644
--- a/app/controllers/instructeurs/dossiers_controller.rb
+++ b/app/controllers/instructeurs/dossiers_controller.rb
@@ -134,7 +134,15 @@ module Instructeurs
       end
 
       @dossier = dossier
-      render :change_state
+      respond_to do |format|
+        format.turbo_stream do
+          render :change_state
+        end
+
+        format.html do
+          redirect_back(fallback_location: instructeur_procedure_path(procedure))
+        end
+      end
     end
 
     def repasser_en_construction
@@ -146,7 +154,15 @@ module Instructeurs
       end
 
       @dossier = dossier
-      render :change_state
+      respond_to do |format|
+        format.turbo_stream do
+          render :change_state
+        end
+
+        format.html do
+          redirect_back(fallback_location: instructeur_procedure_path(procedure))
+        end
+      end
     end
 
     def repasser_en_instruction
@@ -158,7 +174,15 @@ module Instructeurs
       end
 
       @dossier = dossier
-      render :change_state
+      respond_to do |format|
+        format.turbo_stream do
+          render :change_state
+        end
+
+        format.html do
+          redirect_back(fallback_location: instructeur_procedure_path(procedure))
+        end
+      end
     end
 
     def terminer
diff --git a/app/helpers/dossier_helper.rb b/app/helpers/dossier_helper.rb
index 24caabe12..231aa89e2 100644
--- a/app/helpers/dossier_helper.rb
+++ b/app/helpers/dossier_helper.rb
@@ -60,10 +60,10 @@ module DossierHelper
     end
   end
 
-  def status_badge(state)
+  def status_badge(state, alignment_class = '')
     status_text = dossier_display_state(state, lower: true)
     status_class = state.tr('_', '-')
-    tag.span(status_text, class: "label #{status_class} ", role: 'status')
+    tag.span(status_text, class: "label #{status_class} #{alignment_class}", role: 'status')
   end
 
   def deletion_reason_badge(reason)
diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js
index 87e34ffbd..804d3d215 100644
--- a/app/javascript/entrypoints/application.js
+++ b/app/javascript/entrypoints/application.js
@@ -19,7 +19,7 @@ import {
   showMotivation,
   motivationCancel,
   showImportJustificatif
-} from '../new_design/state-button';
+} from '../new_design/instruction-button';
 import { showFusion, showNewAccount } from '../new_design/fc-fusion';
 
 const application = Application.start();
diff --git a/app/javascript/new_design/state-button.js b/app/javascript/new_design/instruction-button.js
similarity index 100%
rename from app/javascript/new_design/state-button.js
rename to app/javascript/new_design/instruction-button.js
diff --git a/app/views/instructeurs/dossiers/_expiration_banner.html.haml b/app/views/instructeurs/dossiers/_expiration_banner.html.haml
index 33d796b8d..1e5c918cf 100644
--- a/app/views/instructeurs/dossiers/_expiration_banner.html.haml
+++ b/app/views/instructeurs/dossiers/_expiration_banner.html.haml
@@ -1,7 +1,6 @@
 -# small expires mention
 - if dossier.expirable?
-  %p.expires_at.mb-2
-
+  %p.expires_at
     %small
       = t("shared.dossiers.header.expires_at.#{dossier.state}", date: safe_expiration_date(dossier), duree_conservation_totale: dossier.duree_totale_conservation_in_months)
       - if dossier.conservation_extension.positive?
@@ -25,4 +24,3 @@
 - elsif dossier.en_instruction? && dossier.procedure.procedure_expires_when_termine_enabled
   %p.expires_at_en_instruction
     %small= t("shared.dossiers.header.expires_at.en_instruction")
-
diff --git a/app/views/instructeurs/dossiers/_header.html.haml b/app/views/instructeurs/dossiers/_header.html.haml
index d3101d051..f8936a464 100644
--- a/app/views/instructeurs/dossiers/_header.html.haml
+++ b/app/views/instructeurs/dossiers/_header.html.haml
@@ -6,42 +6,8 @@
       pour voir si l'opération est finie.
 
 .sub-header
-  .container
-    .flex.justify-between
-      %ul.breadcrumbs
-        %li
-          = link_to dossier.procedure.libelle.truncate_words(10), instructeur_procedure_path(dossier.procedure), title: dossier.procedure.libelle, class: "fr-link"
-          = procedure_badge(dossier.procedure)
-        %li
-          = "Dossier nº #{dossier.id}"
-
-      .header-actions
-        = render partial: 'instructeurs/dossiers/header_actions', locals: { dossier: dossier }
-
-    = render(partial: 'instructeurs/dossiers/expiration_banner', locals: {dossier: dossier})
-
-    %nav.tabs
-      %ul
-        - notifications_summary = current_instructeur.notifications_for_dossier(dossier)
-
-        = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.request'),
-          instructeur_dossier_path(dossier.procedure, dossier),
-          notification: notifications_summary[:demande])
-
-        = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.private_annotations'),
-          annotations_privees_instructeur_dossier_path(dossier.procedure, dossier),
-          notification: notifications_summary[:annotations_privees])
-
-        = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.external_opinion'),
-          avis_instructeur_dossier_path(dossier.procedure, dossier),
-          notification: notifications_summary[:avis])
-
-        = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.messaging'),
-          messagerie_instructeur_dossier_path(dossier.procedure, dossier),
-          notification: notifications_summary[:messagerie])
-
-        = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.involved_persons'),
-          personnes_impliquees_instructeur_dossier_path(dossier.procedure, dossier))
+  = render partial: 'instructeurs/dossiers/header_top', locals: { dossier: }
+  = render partial: 'instructeurs/dossiers/header_bottom', locals: { dossier: }
 
 .container
   .print-header
diff --git a/app/views/instructeurs/dossiers/_header_actions.html.haml b/app/views/instructeurs/dossiers/_header_actions.html.haml
index 9cdba1d83..8ee89c31e 100644
--- a/app/views/instructeurs/dossiers/_header_actions.html.haml
+++ b/app/views/instructeurs/dossiers/_header_actions.html.haml
@@ -1,41 +1,13 @@
-%ul.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline-md.fr-btns-group--icon-right
-  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-menu'}, button_options: { class: ['fr-btn--tertiary', 'fr-icon-printer-line']}) do |menu|
-    - menu.with_button_inner_html do
-      Imprimer
+%ul.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline-md.fr-btns-group--icon-right.flex.justify-end.fr-mb-1w
+  = render partial: "instructeurs/procedures/dossier_actions",
+    locals: { procedure_id: dossier.procedure.id,
+              dossier_id: dossier.id,
+              state: dossier.state,
+              archived: dossier.archived,
+              dossier_is_followed: current_instructeur&.follow?(dossier),
+              close_to_expiration: dossier.close_to_expiration?,
+              hidden_by_administration: dossier.hidden_by_administration?,
+              post_method: {data: { turbo_method: :post }}}
 
-    - menu.with_item do
-      = link_to print_instructeur_dossier_path(dossier.procedure, dossier), role: 'menuitem', target: "_blank", rel: "noopener", class: "menu-item menu-link" do
-        Tout le dossier
-
-    - menu.with_item do
-      = link_to '#', role: 'menuitem', onclick: "window.print()", class: "menu-item menu-link" do
-        Uniquement cet onglet
-
-    - menu.with_item do
-      = link_to instructeur_dossier_path(dossier.procedure, dossier, format: :pdf), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
-        Export PDF
-
-    - if dossier.geo_data?
-      - menu.with_item do
-        = link_to  geo_data_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
-          Export GeoJSON
-
-  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-pj-menu'}, button_options: { class: ['fr-btn--tertiary', 'fr-icon-download-line']}) do |menu|
-    - menu.with_button_inner_html do
-      Télécharger
-    - menu.with_item do
-      = link_to telecharger_pjs_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem'  do
-        Télécharger le dossier et toutes ses pièces jointes
-
-  %li
-    = render partial: "instructeurs/procedures/dossier_actions",
-      locals: { procedure_id: dossier.procedure.id,
-                dossier_id: dossier.id,
-                state: dossier.state,
-                archived: dossier.archived,
-                dossier_is_followed: current_instructeur&.follow?(dossier),
-                close_to_expiration: dossier.close_to_expiration?,
-                hidden_by_administration: dossier.hidden_by_administration? }
-
-  %li.state-button
-    = render partial: "state_button", locals: { dossier: dossier }
+  %li.instruction-button
+    = render partial: "instruction_button", locals: { dossier: dossier }
diff --git a/app/views/instructeurs/dossiers/_header_bottom.html.haml b/app/views/instructeurs/dossiers/_header_bottom.html.haml
new file mode 100644
index 000000000..5b1493cef
--- /dev/null
+++ b/app/views/instructeurs/dossiers/_header_bottom.html.haml
@@ -0,0 +1,23 @@
+#header-bottom.container
+  %nav.tabs
+    %ul
+      - notifications_summary = current_instructeur.notifications_for_dossier(dossier)
+
+      = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.request'),
+        instructeur_dossier_path(dossier.procedure, dossier),
+        notification: notifications_summary[:demande])
+
+      = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.private_annotations'),
+        annotations_privees_instructeur_dossier_path(dossier.procedure, dossier),
+        notification: notifications_summary[:annotations_privees])
+
+      = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.external_opinion'),
+        avis_instructeur_dossier_path(dossier.procedure, dossier),
+        notification: notifications_summary[:avis])
+
+      = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.messaging'),
+        messagerie_instructeur_dossier_path(dossier.procedure, dossier),
+        notification: notifications_summary[:messagerie])
+
+      = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.involved_persons'),
+        personnes_impliquees_instructeur_dossier_path(dossier.procedure, dossier))
diff --git a/app/views/instructeurs/dossiers/_header_top.html.haml b/app/views/instructeurs/dossiers/_header_top.html.haml
new file mode 100644
index 000000000..27b8ac424
--- /dev/null
+++ b/app/views/instructeurs/dossiers/_header_top.html.haml
@@ -0,0 +1,19 @@
+#header-top.container
+  .flex.fr-mb-3w
+    %div
+      %h1.fr-h2.fr-mb-1w
+        = "Dossier nº #{dossier.id}"
+
+        = status_badge(dossier.state, 'super')
+      = link_to dossier.procedure.libelle.truncate_words(10), instructeur_procedure_path(dossier.procedure), title: dossier.procedure.libelle, class: "fr-link"
+      = procedure_badge(dossier.procedure)
+
+    .header-actions.fr-ml-auto
+      = render partial: 'instructeurs/dossiers/header_actions', locals: { dossier: }
+      = render partial: 'instructeurs/dossiers/print_and_export_actions', locals: { dossier: }
+
+  = render partial: 'instructeurs/dossiers/expiration_banner', locals: { dossier: }
+
+  - if dossier.user_deleted?
+    %p.fr-mb-1w
+      %small L’usager a supprimé son compte. Vous pouvez archiver puis supprimer le dossier.
diff --git a/app/views/instructeurs/dossiers/_instruction_button.html.haml b/app/views/instructeurs/dossiers/_instruction_button.html.haml
new file mode 100644
index 000000000..82e545fe3
--- /dev/null
+++ b/app/views/instructeurs/dossiers/_instruction_button.html.haml
@@ -0,0 +1,36 @@
+- if dossier.en_instruction?
+  = render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: { data: {'turbo-force': true} }, button_options: { class: [button_or_label_class(dossier)] }) do |menu|
+    - menu.with_button_inner_html do
+      Instruire le dossier
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'accept');", role: 'menuitem') do
+        %span.icon.accept
+        .dropdown-description
+          %h4 Accepter
+          L’usager sera notifié que son dossier a été accepté
+
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'without-continuation');", role: 'menuitem') do
+        %span.icon.without-continuation
+        .dropdown-description
+          %h4 Classer sans suite
+          L’usager sera notifié que son dossier a été classé sans suite
+
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'refuse');", role: 'menuitem') do
+        %span.icon.refuse
+        .dropdown-description
+          %h4 Refuser
+          L’usager sera notifié que son dossier a été refusé
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/instruction_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" }
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/instruction_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', placeholder: 'Expliquez au demandeur pourquoi ce dossier est classé sans suite (obligatoire)', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmez-vous le classement sans suite de ce dossier ?' }
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/instruction_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est refusé (obligatoire)', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' }
diff --git a/app/views/instructeurs/dossiers/_state_button_motivation.html.haml b/app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml
similarity index 100%
rename from app/views/instructeurs/dossiers/_state_button_motivation.html.haml
rename to app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml
diff --git a/app/views/instructeurs/dossiers/_print_and_export_actions.html.haml b/app/views/instructeurs/dossiers/_print_and_export_actions.html.haml
new file mode 100644
index 000000000..6c44f725e
--- /dev/null
+++ b/app/views/instructeurs/dossiers/_print_and_export_actions.html.haml
@@ -0,0 +1,28 @@
+%ul.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline-md.fr-btns-group--icon-right.flex.justify-end
+  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-menu'}, button_options: { class: ['fr-btn--tertiary-no-outline', 'fr-icon-printer-line']}) do |menu|
+    - menu.with_button_inner_html do
+      Imprimer
+
+    - menu.with_item do
+      = link_to print_instructeur_dossier_path(dossier.procedure, dossier), role: 'menuitem', target: "_blank", rel: "noopener", class: "menu-item menu-link" do
+        Tout le dossier
+
+    - menu.with_item do
+      = link_to '#', role: 'menuitem', onclick: "window.print()", class: "menu-item menu-link" do
+        Uniquement cet onglet
+
+    - menu.with_item do
+      = link_to instructeur_dossier_path(dossier.procedure, dossier, format: :pdf), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
+        Export PDF
+
+    - if dossier.geo_data?
+      - menu.with_item do
+        = link_to  geo_data_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
+          Export GeoJSON
+
+  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-pj-menu'}, button_options: { class: ['fr-btn--tertiary-no-outline', 'fr-icon-download-line']}) do |menu|
+    - menu.with_button_inner_html do
+      Télécharger
+    - menu.with_item do
+      = link_to telecharger_pjs_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem'  do
+        Télécharger le dossier et toutes ses pièces jointes
diff --git a/app/views/instructeurs/dossiers/_state_button.html.haml b/app/views/instructeurs/dossiers/_state_button.html.haml
deleted file mode 100644
index c8a2e172e..000000000
--- a/app/views/instructeurs/dossiers/_state_button.html.haml
+++ /dev/null
@@ -1,107 +0,0 @@
-= render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: { data: {'turbo-force': true} }, button_options: { class: [button_or_label_class(dossier)] }) do |menu|
-  - menu.with_button_inner_html do
-    = dossier_display_state(dossier)
-
-  - if dossier.en_construction?
-    - menu.with_item(aria: {disabled:"true"}, class: 'selected') do
-      %span.icon.edit
-      .dropdown-description
-        %h4 En construction
-        Vous permettez à l'usager de modifier ses réponses au formulaire
-
-    - menu.with_item('data-turbo': 'true') do
-      = link_to(passer_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en instruction de ce dossier ?", turbo: true }, role: 'menuitem') do
-        %span.icon.in-progress
-        .dropdown-description
-          %h4 Passer en instruction
-          L’usager ne pourra plus modifier le formulaire
-
-  - elsif dossier.en_instruction?
-    - menu.with_item('data-turbo': 'true') do
-      = link_to(repasser_en_construction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en construction de ce dossier ?"}, role: 'menuitem') do
-        %span.icon.edit
-        .dropdown-description
-          %h4 Repasser en construction
-          Vous permettrez à l'usager de modifier ses réponses au formulaire
-
-    - menu.with_item(aria: {disabled:"true"}, class: 'selected') do
-      %span.icon.in-progress
-      .dropdown-description
-        %h4 En instruction
-        L’usager ne peut modifier son dossier pendant l'instruction
-
-    - menu.with_item do
-      = link_to('#', onclick: "DS.showMotivation(event, 'accept');", role: 'menuitem') do
-        %span.icon.accept
-        .dropdown-description
-          %h4 Accepter
-          L’usager sera notifié que son dossier a été accepté
-
-
-    - menu.with_item do
-      = link_to('#', onclick: "DS.showMotivation(event, 'without-continuation');", role: 'menuitem') do
-        %span.icon.without-continuation
-        .dropdown-description
-          %h4 Classer sans suite
-          L’usager sera notifié que son dossier a été classé sans suite
-
-
-    - menu.with_item do
-      = link_to('#', onclick: "DS.showMotivation(event, 'refuse');", role: 'menuitem') do
-        %span.icon.refuse
-        .dropdown-description
-          %h4 Refuser
-          L’usager sera notifié que son dossier a été refusé
-
-    - menu.with_form do
-      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" }
-
-    - menu.with_form do
-      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', placeholder: 'Expliquez au demandeur pourquoi ce dossier est classé sans suite (obligatoire)', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmez-vous le classement sans suite de ce dossier ?' }
-
-    - menu.with_form do
-      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est refusé (obligatoire)', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' }
-
-  - elsif dossier.termine?
-    - if dossier.motivation.present?
-      - menu.with_item(class: 'inactive') do
-        %span.icon.info
-        .dropdown-description
-          %h4 Motivation
-          %p « #{dossier.motivation} »
-
-    - if dossier.justificatif_motivation.attached?
-      - menu.with_item(class: 'inactive') do
-        %span.icon.justificatif
-        .dropdown-description
-          %h4 Justificatif
-          %p Ce justificatif joint par l’instructeur a été envoyé au demandeur.
-          = render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
-
-    - if dossier.attestation.present?
-      - menu.with_item do
-        = link_to(attestation_instructeur_dossier_path(dossier.procedure, dossier), target: '_blank', rel: 'noopener', role: 'menuitem') do
-          %span.icon.preview
-          .dropdown-description
-            %h4 Voir l’attestation
-            %p Cette attestation a été envoyée automatiquement au demandeur.
-
-    - if dossier.can_repasser_en_instruction?
-      - menu.with_item do
-        = link_to(repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Voulez vous remettre le dossier #{dossier.id} en instruction ?", turbo: true }, role: 'menuitem') do
-          %span.icon.in-progress
-          .dropdown-description
-            %h4 Repasser en instruction
-            L’usager sera notifié que son dossier est réexaminé.
-    - elsif dossier.user_deleted?
-      - menu.with_item do
-        %span.icon.info
-        .dropdown-description
-          %h4 En attente d’archivage
-          L’usager a supprimé son compte. Vous pouvez archiver puis supprimer le dossier.
-
-    - menu.with_item do
-      = link_to(instructeur_dossier_path(dossier.procedure, dossier), method: :delete, role: 'menuitem') do
-        %span.icon.delete
-        .dropdown-description
-          %h4 Supprimer le dossier
diff --git a/app/views/instructeurs/dossiers/change_state.turbo_stream.haml b/app/views/instructeurs/dossiers/change_state.turbo_stream.haml
index 94ce488db..d7dd8ded2 100644
--- a/app/views/instructeurs/dossiers/change_state.turbo_stream.haml
+++ b/app/views/instructeurs/dossiers/change_state.turbo_stream.haml
@@ -1 +1 @@
-= turbo_stream.update_all '.header-actions', partial: 'header_actions', locals: { dossier: @dossier }
+= turbo_stream.replace 'header-top', partial: 'header_top', locals: { dossier: @dossier }
diff --git a/app/views/instructeurs/procedures/_dossier_actions.html.haml b/app/views/instructeurs/procedures/_dossier_actions.html.haml
index 3c9bf64d4..f1a3f3027 100644
--- a/app/views/instructeurs/procedures/_dossier_actions.html.haml
+++ b/app/views/instructeurs/procedures/_dossier_actions.html.haml
@@ -1,42 +1,47 @@
 - if hidden_by_administration
-  = link_to restore_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: "fr-btn fr-btn--secondary" do
-    = t('views.instructeurs.dossiers.restore')
+  %li
+    = link_to restore_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: "fr-btn fr-icon-refresh-line" do
+      = t('views.instructeurs.dossiers.restore')
 - elsif close_to_expiration || Dossier::TERMINE.include?(state)
-  = render Dropdown::MenuComponent.new(wrapper: :li, button_options: { class: ['fr-mb-0']}, menu_options: { id: "dossier_#{dossier_id}_actions_menu", class: 'user-dossier-actions' }) do |menu|
-    - menu.with_button_inner_html do
-      Actions
-
+  %li{ 'data-turbo': 'true' }
     - if close_to_expiration
-      - menu.with_item do
-        = link_to(repousser_expiration_instructeur_dossier_path(procedure_id, dossier_id), method: :post, role: 'menuitem') do
-          %span.icon.standby
-          %span.dropdown-description= t('instructeurs.dossiers.header.banner.button_delay_expiration')
+      = link_to repasser_en_instruction_instructeur_dossier_path(procedure_id, dossier_id), { class: 'fr-btn fr-btn--secondary fr-icon-edit-line' }.deep_merge!(post_method) do
+        Repasser en instruction
 
-    - if archived
-      - menu.with_item do
-        = link_to( unarchive_instructeur_dossier_path(procedure_id, dossier_id), role: 'menuitem', method: :patch) do
-          %span.icon.unarchive
-          %span.dropdown-description
-            Désarchiver le dossier
+      = link_to(repousser_expiration_instructeur_dossier_path(procedure_id, dossier_id), method: :post, class: "fr-btn") do
+        = t('instructeurs.dossiers.header.banner.button_delay_expiration')
+
+    - elsif archived
+      = link_to( unarchive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: "fr-btn fr-icon-upload-2-line") do
+        Désarchiver le dossier
+
+      = link_to('', instructeur_dossier_path(procedure_id, dossier_id), method: :delete, class: 'fr-btn fr-btn--secondary fr-icon-delete-line icon-only danger', title: t('views.instructeurs.dossiers.delete_dossier'))
 
     - else
-      - menu.with_item do
-        = link_to(  archive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, role: 'menuitem') do
-          %span.icon.archive
-          %span.dropdown-description
-            Archiver le dossier
+      = link_to repasser_en_instruction_instructeur_dossier_path(procedure_id, dossier_id), { class: 'fr-btn fr-btn--secondary fr-icon-edit-line' }.deep_merge!(post_method) do
+        Repasser en instruction
 
-      - menu.with_item(class: 'danger') do
-        = link_to(instructeur_dossier_path(procedure_id, dossier_id), method: :delete, role: 'menuitem') do
-          %span.icon.delete
-          %span.dropdown-description
-            = t('views.instructeurs.dossiers.delete_dossier')
+      = link_to(  archive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: 'fr-btn fr-icon-folder-2-line') do
+        Archiver le dossier
 
+      = link_to('', instructeur_dossier_path(procedure_id, dossier_id), method: :delete, class: 'fr-btn fr-btn--secondary fr-icon-delete-line icon-only danger', title: t('views.instructeurs.dossiers.delete_dossier'))
 
 - elsif Dossier::EN_CONSTRUCTION_OU_INSTRUCTION.include?(state)
+  - if Dossier.states[:en_construction] == state
+    %li{ 'data-turbo': 'true' }
+      = link_to passer_en_instruction_instructeur_dossier_path(procedure_id, dossier_id), { class: 'fr-btn fr-btn--secondary fr-icon-edit-line' }.deep_merge!(post_method) do
+        Passer en instruction
+  - elsif Dossier.states[:en_instruction] == state
+    %li{ 'data-turbo': 'true' }
+      = link_to repasser_en_construction_instructeur_dossier_path(procedure_id, dossier_id), { class: 'fr-btn fr-btn--secondary fr-icon-draft-line' }.deep_merge!(post_method) do
+        Repasser en construction
+
+
   - if dossier_is_followed
-    = link_to unfollow_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: 'fr-btn fr-btn--secondary fr-icon-star-fill' do
-      = t('views.instructeurs.dossiers.stop_follow')
+    %li
+      = link_to unfollow_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: 'fr-btn fr-btn--secondary fr-icon-star-fill' do
+        = t('views.instructeurs.dossiers.stop_follow')
   - else
-    = link_to follow_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: 'fr-btn fr-btn--secondary fr-icon-star-line' do
-      = t('views.instructeurs.dossiers.follow_file')
+    %li
+      = link_to follow_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: 'fr-btn fr-icon-star-line' do
+        = t('views.instructeurs.dossiers.follow_file')
diff --git a/app/views/instructeurs/procedures/show.html.haml b/app/views/instructeurs/procedures/show.html.haml
index 81a748055..4bb34f922 100644
--- a/app/views/instructeurs/procedures/show.html.haml
+++ b/app/views/instructeurs/procedures/show.html.haml
@@ -180,7 +180,8 @@
                                   archived: p.archived,
                                   dossier_is_followed: @followed_dossiers_id.include?(p.dossier_id),
                                   close_to_expiration: @statut == 'expirant',
-                                  hidden_by_administration: @statut == 'supprimes_recemment' }
+                                  hidden_by_administration: @statut == 'supprimes_recemment',
+                                  post_method: { method: :post } }
             %tfoot
               %tr
                 %td.force-table-100{ colspan: @procedure_presentation.displayed_fields_for_headers.size + 2 }= paginate @filtered_sorted_paginated_ids
diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml
index 46aa5b6ed..a5aaac223 100644
--- a/app/views/recherche/index.html.haml
+++ b/app/views/recherche/index.html.haml
@@ -97,7 +97,8 @@
                                                                       archived: p.archived,
                                                                       dossier_is_followed: @followed_dossiers_id.include?(p.dossier_id),
                                                                       close_to_expiration: nil,
-                                                                      hidden_by_administration: nil }
+                                                                      hidden_by_administration: nil,
+                                                                      post_method: { method: :post } }
 
             - else
               %td
diff --git a/app/views/shared/dossiers/_infos_generales.html.haml b/app/views/shared/dossiers/_infos_generales.html.haml
index 0a4c6242b..4eae901fa 100644
--- a/app/views/shared/dossiers/_infos_generales.html.haml
+++ b/app/views/shared/dossiers/_infos_generales.html.haml
@@ -3,9 +3,24 @@
     %tr
       %td.libelle Déposé le :
       %td= l(dossier.depose_at, format: '%d %B %Y')
+
   - if dossier.justificatif_motivation.attached?
     %tr
       %td.libelle Justificatif :
       %td
         .action
           = render Attachment::ShowComponent.new(attachment: dossier.justificatif_motivation.attachment)
+
+  - if dossier.motivation.present?
+    %tr
+      %td.libelle Motivation :
+      %td
+        .action
+          = dossier.motivation
+
+  - if dossier.attestation.present?
+    %tr
+      %td.libelle Attestation :
+      %td
+        .action
+          = link_to('Voir l’attestation', attestation_instructeur_dossier_path(dossier.procedure, dossier), target: '_blank', rel: 'noopener')
diff --git a/app/views/users/dossiers/_expiration_banner.html.haml b/app/views/users/dossiers/_expiration_banner.html.haml
index 6320a8c73..509d1eb81 100644
--- a/app/views/users/dossiers/_expiration_banner.html.haml
+++ b/app/views/users/dossiers/_expiration_banner.html.haml
@@ -1,6 +1,6 @@
 -# small expires mention
 - if dossier.expirable?
-  %p.expires_at.mb-2
+  %p.expires_at
     %small= t("shared.dossiers.header.expires_at.#{dossier.state}", date: safe_expiration_date(dossier), duree_conservation_totale: dossier.duree_totale_conservation_in_months)
 
   - if dossier.close_to_expiration?
@@ -21,4 +21,3 @@
 - elsif dossier.en_instruction? && dossier.procedure.procedure_expires_when_termine_enabled
   %p.expires_at_en_instruction
     %small= t("shared.dossiers.header.expires_at.en_instruction")
-
diff --git a/spec/controllers/instructeurs/dossiers_controller_spec.rb b/spec/controllers/instructeurs/dossiers_controller_spec.rb
index b6e1af036..86b114add 100644
--- a/spec/controllers/instructeurs/dossiers_controller_spec.rb
+++ b/spec/controllers/instructeurs/dossiers_controller_spec.rb
@@ -154,7 +154,7 @@ describe Instructeurs::DossiersController, type: :controller do
     it { expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_instruction)) }
     it { expect(instructeur.follow?(dossier)).to be true }
     it { expect(response).to have_http_status(:ok) }
-    it { expect(response.body).to include('.header-actions') }
+    it { expect(response.body).to include('header-top') }
 
     context 'when the dossier has already been put en_instruction' do
       let(:dossier) { create(:dossier, :en_instruction, procedure: procedure) }
@@ -200,7 +200,7 @@ describe Instructeurs::DossiersController, type: :controller do
 
     it { expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_construction)) }
     it { expect(response).to have_http_status(:ok) }
-    it { expect(response.body).to include('.header-actions') }
+    it { expect(response.body).to include('header-top') }
 
     context 'when the dossier has already been put en_construction' do
       let(:dossier) { create(:dossier, :en_construction, procedure: procedure) }
@@ -236,7 +236,7 @@ describe Instructeurs::DossiersController, type: :controller do
     context 'when the dossier is refuse' do
       it { expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_instruction)) }
       it { expect(response).to have_http_status(:ok) }
-      it { expect(response.body).to include('.header-actions') }
+      it { expect(response.body).to include('header-top') }
     end
 
     context 'when the dossier has already been put en_instruction' do
@@ -313,7 +313,7 @@ describe Instructeurs::DossiersController, type: :controller do
           expect(dossier.justificatif_motivation).to be_attached
         end
 
-        it { expect(subject.body).to include('.header-actions') }
+        it { expect(subject.body).to include('header-top') }
       end
 
       context 'with dossier in batch_operation' do
@@ -353,7 +353,7 @@ describe Instructeurs::DossiersController, type: :controller do
           subject
         end
 
-        it { expect(subject.body).to include('.header-actions') }
+        it { expect(subject.body).to include('header-top') }
       end
 
       context 'with attachment' do
@@ -367,7 +367,7 @@ describe Instructeurs::DossiersController, type: :controller do
           expect(dossier.justificatif_motivation).to be_attached
         end
 
-        it { expect(subject.body).to include('.header-actions') }
+        it { expect(subject.body).to include('header-top') }
       end
     end
 
@@ -409,14 +409,14 @@ describe Instructeurs::DossiersController, type: :controller do
         end
 
         it 'The instructeur is sent back to the dossier page' do
-          expect(subject.body).to include('.header-actions')
+          expect(subject.body).to include('header-top')
         end
 
         context 'and the dossier has already an attestation' do
           it 'should not crash' do
             dossier.attestation = Attestation.new
             dossier.save
-            expect(subject.body).to include('.header-actions')
+            expect(subject.body).to include('header-top')
           end
         end
       end
@@ -455,7 +455,7 @@ describe Instructeurs::DossiersController, type: :controller do
           expect(dossier.justificatif_motivation).to be_attached
         end
 
-        it { expect(subject.body).to include('.header-actions') }
+        it { expect(subject.body).to include('header-top') }
       end
     end
 
diff --git a/spec/system/instructeurs/instruction_spec.rb b/spec/system/instructeurs/instruction_spec.rb
index 7cea056ca..43025324a 100644
--- a/spec/system/instructeurs/instruction_spec.rb
+++ b/spec/system/instructeurs/instruction_spec.rb
@@ -37,18 +37,18 @@ describe 'Instructing a dossier:', js: true do
     click_on dossier.user.email
     expect(page).to have_current_path(instructeur_dossier_path(procedure, dossier))
 
-    click_on 'En construction'
-    accept_confirm do
-      click_on 'Passer en instruction'
-    end
-    expect(page).to have_text('En instruction')
+    click_on 'Passer en instruction'
+
+    expect(page).to have_text('Dossier passé en instruction.')
+    expect(page).to have_text('Instruire le dossier')
+    expect(page).to have_selector('.label.en-instruction')
 
     dossier.reload
     expect(dossier.state).to eq(Dossier.states.fetch(:en_instruction))
 
-    click_on 'En instruction'
+    click_on 'Instruire le dossier'
 
-    within('.state-button') do
+    within('.instruction-button') do
       click_on 'Accepter'
     end
 
@@ -69,10 +69,10 @@ describe 'Instructing a dossier:', js: true do
 
     click_on procedure.libelle
     click_on 'traité'
-    click_on 'Actions' # destroy from list
-    click_on 'Supprimer le dossier'
+    expect(page).to have_link('Repasser en instruction')
+    page.click_link('', title: 'Supprimer le dossier')
     click_on 'traité'
-    expect(page).not_to have_button('Actions')
+    expect(page).not_to have_link('Repasser en instruction')
   end
 
   scenario 'An instructeur can destroy a dossier from view' do
@@ -81,10 +81,7 @@ describe 'Instructing a dossier:', js: true do
     dossier.passer_en_instruction(instructeur: instructeur)
     dossier.accepter!(instructeur: instructeur)
     visit instructeur_dossier_path(procedure, dossier)
-    click_on 'Actions' # destroy from view
-    within '.user-dossier-actions' do
-      click_on 'Supprimer le dossier'
-    end
+    page.click_link('', title: 'Supprimer le dossier')
   end
 
   scenario 'A instructeur can follow/unfollow a dossier' do
diff --git a/spec/views/instructeur/dossiers/_instruction_button.html.haml_spec.rb b/spec/views/instructeur/dossiers/_instruction_button.html.haml_spec.rb
new file mode 100644
index 000000000..049640877
--- /dev/null
+++ b/spec/views/instructeur/dossiers/_instruction_button.html.haml_spec.rb
@@ -0,0 +1,43 @@
+describe 'instructeurs/dossiers/instruction_button.html.haml', type: :view do
+  include DossierHelper
+
+  subject! do
+    render('instructeurs/dossiers/instruction_button.html.haml', dossier: dossier)
+  end
+
+  matcher :have_dropdown_title do |expected_title|
+    match do |rendered|
+      expect(rendered).to have_selector('.dropdown .dropdown-button', text: expected_title)
+    end
+  end
+
+  matcher :have_dropdown_items do |options|
+    match do |rendered|
+      expected_count = options[:count] || 1
+      expect(rendered).to have_selector('ul.dropdown-items li', count: expected_count)
+    end
+  end
+
+  matcher :have_dropdown_item do |expected_title, options = {}|
+    match do |rendered|
+      expected_href = options[:href]
+      if (expected_href.present?)
+        expect(rendered).to have_selector("ul.dropdown-items li a[href='#{expected_href}']", text: expected_title)
+      else
+        expect(rendered).to have_selector('ul.dropdown-items li', text: expected_title)
+      end
+    end
+  end
+
+  context 'en_instruction' do
+    let(:dossier) { create(:dossier, :en_instruction) }
+
+    it 'renders a dropdown' do
+      expect(rendered).to have_dropdown_title('Instruire le dossier')
+      expect(rendered).to have_dropdown_items(count: 3)
+      expect(rendered).to have_dropdown_item('Accepter')
+      expect(rendered).to have_dropdown_item('Classer sans suite')
+      expect(rendered).to have_dropdown_item('Refuser')
+    end
+  end
+end
diff --git a/spec/views/instructeur/dossiers/_state_button_motivation.html.haml_spec.rb b/spec/views/instructeur/dossiers/_instruction_button_motivation.html.haml_spec.rb
similarity index 84%
rename from spec/views/instructeur/dossiers/_state_button_motivation.html.haml_spec.rb
rename to spec/views/instructeur/dossiers/_instruction_button_motivation.html.haml_spec.rb
index dbcaa7920..6e915976d 100644
--- a/spec/views/instructeur/dossiers/_state_button_motivation.html.haml_spec.rb
+++ b/spec/views/instructeur/dossiers/_instruction_button_motivation.html.haml_spec.rb
@@ -1,9 +1,9 @@
-describe 'instructeurs/dossiers/state_button_motivation.html.haml', type: :view do
+describe 'instructeurs/dossiers/instruction_button_motivation.html.haml', type: :view do
   let(:dossier) { create(:dossier, :en_instruction) }
 
   subject do
     render(
-      'instructeurs/dossiers/state_button_motivation.html.haml',
+      'instructeurs/dossiers/instruction_button_motivation.html.haml',
       dossier: dossier,
       popup_title: 'Accepter le dossier',
       placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)',
diff --git a/spec/views/instructeur/dossiers/_state_button.html.haml_spec.rb b/spec/views/instructeur/dossiers/_state_button.html.haml_spec.rb
deleted file mode 100644
index 5c71fc460..000000000
--- a/spec/views/instructeur/dossiers/_state_button.html.haml_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-describe 'instructeurs/dossiers/state_button.html.haml', type: :view do
-  include DossierHelper
-
-  subject! do
-    render('instructeurs/dossiers/state_button.html.haml', dossier: dossier)
-  end
-
-  matcher :have_dropdown_title do |expected_title|
-    match do |rendered|
-      expect(rendered).to have_selector('.dropdown .dropdown-button', text: expected_title)
-    end
-  end
-
-  matcher :have_dropdown_items do |options|
-    match do |rendered|
-      expected_count = options[:count] || 1
-      expect(rendered).to have_selector('ul.dropdown-items li', count: expected_count)
-    end
-  end
-
-  matcher :have_dropdown_item do |expected_title, options = {}|
-    match do |rendered|
-      expected_href = options[:href]
-      if (expected_href.present?)
-        expect(rendered).to have_selector("ul.dropdown-items li a[href='#{expected_href}']", text: expected_title)
-      else
-        expect(rendered).to have_selector('ul.dropdown-items li', text: expected_title)
-      end
-    end
-  end
-
-  context 'brouillon' do
-    # Currently the state button is not supposed to be displayed for brouillons.
-    # But better have a sane fallback than crashing.
-    let(:dossier) { create(:dossier) }
-
-    it 'renders a dropdown' do
-      expect(rendered).to have_dropdown_title('Brouillon')
-      expect(rendered).to have_dropdown_items(count: 0)
-    end
-  end
-
-  context 'en_contruction' do
-    let(:dossier) { create(:dossier, :en_construction) }
-
-    it 'renders a dropdown' do
-      expect(rendered).to have_dropdown_title('En construction')
-      expect(rendered).to have_dropdown_items(count: 2)
-      expect(rendered).to have_dropdown_item('En construction')
-      expect(rendered).to have_dropdown_item('Passer en instruction', href: passer_en_instruction_instructeur_dossier_path(dossier.procedure, dossier))
-    end
-  end
-
-  context 'en_instruction' do
-    let(:dossier) { create(:dossier, :en_instruction) }
-
-    it 'renders a dropdown' do
-      expect(rendered).to have_dropdown_title('En instruction')
-      expect(rendered).to have_dropdown_items(count: 5)
-      expect(rendered).to have_dropdown_item('Repasser en construction', href: repasser_en_construction_instructeur_dossier_path(dossier.procedure, dossier))
-      expect(rendered).to have_dropdown_item('En instruction')
-      expect(rendered).to have_dropdown_item('Accepter')
-      expect(rendered).to have_dropdown_item('Classer sans suite')
-      expect(rendered).to have_dropdown_item('Refuser')
-    end
-  end
-
-  shared_examples 'a dropdown for a closed state' do |state|
-    let(:dossier) { create :dossier, state }
-
-    it 'renders a dropdown' do
-      expect(rendered).to have_dropdown_title(dossier_display_state(dossier))
-      expect(rendered).to have_dropdown_items(count: 2)
-      expect(rendered).to have_dropdown_item('Repasser en instruction', href: repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier))
-    end
-
-    context 'with a motivation' do
-      let(:dossier) { create :dossier, state, :with_motivation }
-
-      it 'displays the motivation text' do
-        expect(rendered).to have_dropdown_item('Motivation')
-        expect(rendered).to have_content(dossier.motivation)
-      end
-    end
-
-    context 'with an attestation' do
-      let(:dossier) { create :dossier, state, :with_attestation }
-
-      it 'provides a link to the attestation' do
-        expect(rendered).to have_dropdown_item('Voir l’attestation')
-        expect(rendered).to have_link(href: attestation_instructeur_dossier_path(dossier.procedure, dossier))
-      end
-    end
-
-    context 'with a justificatif' do
-      let(:dossier) do
-        dossier = create(:dossier, state, :with_justificatif)
-        dossier.justificatif_motivation.blob.update(virus_scan_result: ActiveStorage::VirusScanner::SAFE)
-        dossier
-      end
-
-      it 'allows to download the justificatif' do
-        expect(rendered).to have_dropdown_item('Justificatif')
-        expect(response).to have_css("a[href*='/rails/active_storage/blobs/']", text: dossier.justificatif_motivation.attachment.filename.to_s)
-      end
-    end
-  end
-
-  context 'accepte' do
-    it_behaves_like 'a dropdown for a closed state', :accepte
-  end
-
-  context 'refuse' do
-    it_behaves_like 'a dropdown for a closed state', :refuse
-  end
-
-  context 'sans_suite' do
-    it_behaves_like 'a dropdown for a closed state', :sans_suite
-  end
-end
diff --git a/spec/views/instructeur/dossiers/show.html.haml_spec.rb b/spec/views/instructeur/dossiers/show.html.haml_spec.rb
index 0ae1552dd..f45a062a3 100644
--- a/spec/views/instructeur/dossiers/show.html.haml_spec.rb
+++ b/spec/views/instructeur/dossiers/show.html.haml_spec.rb
@@ -8,15 +8,119 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do
     assign(:dossier, dossier)
   end
 
-  subject! { render }
+  subject { render }
 
   it 'renders the header' do
-    expect(rendered).to have_text("Dossier nº #{dossier.id}")
+    expect(subject).to have_text("Dossier nº #{dossier.id}")
   end
 
   it 'renders the dossier infos' do
-    expect(rendered).to have_text('Identité')
-    expect(rendered).to have_text('Demande')
+    expect(subject).to have_text('Identité')
+    expect(subject).to have_text('Demande')
+  end
+
+  it 'renders the correct dossier state' do
+    expect(subject).to have_text('en construction')
+  end
+
+  context 'with a motivation' do
+    let(:dossier) { create :dossier, :accepte, :with_motivation }
+
+    it 'displays the motivation text' do
+      expect(subject).to have_content(dossier.motivation)
+    end
+  end
+
+  context 'with an attestation' do
+    let(:dossier) { create :dossier, :accepte, :with_attestation }
+
+    it 'provides a link to the attestation' do
+      expect(subject).to have_text('Attestation')
+      expect(subject).to have_link(href: attestation_instructeur_dossier_path(dossier.procedure, dossier))
+    end
+  end
+
+  context 'with a justificatif' do
+    let(:dossier) do
+      dossier = create(:dossier, :accepte, :with_justificatif)
+      dossier.justificatif_motivation.blob.update(virus_scan_result: ActiveStorage::VirusScanner::SAFE)
+      dossier
+    end
+
+    it 'allows to download the justificatif' do
+      expect(subject).to have_css("a[href*='/rails/active_storage/blobs/']", text: dossier.justificatif_motivation.attachment.filename.to_s)
+    end
+  end
+
+  context 'en_contruction' do
+    let(:dossier) { create(:dossier, :en_construction) }
+    it 'displays the correct actions' do
+      expect(subject).to have_link('Passer en instruction', href: passer_en_instruction_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_link('Suivre le dossier', href: follow_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 2)
+    end
+  end
+
+  context 'en_instruction' do
+    let(:dossier) { create(:dossier, :en_instruction) }
+
+    before do
+      current_instructeur.followed_dossiers << dossier
+      render
+    end
+
+    it 'displays the correct actions' do
+      expect(subject).to have_link('Repasser en construction', href: repasser_en_construction_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_link('Ne plus suivre', href: unfollow_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_button('Instruire le dossier')
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 3)
+    end
+  end
+
+  context 'accepte' do
+    let(:dossier) { create(:dossier, :accepte) }
+
+    it 'displays the correct actions' do
+      expect(subject).to have_link('Repasser en instruction', href: repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_link('Archiver le dossier', href: archive_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_selector('[title^="Supprimer le dossier"]')
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 3)
+    end
+  end
+
+  context 'supprime' do
+    let(:dossier) { create(:dossier, :accepte) }
+
+    before do
+      dossier.hide_and_keep_track!(current_instructeur, :instructeur_request)
+      render
+    end
+
+    it 'displays the correct actions' do
+      expect(subject).to have_link('Restaurer', href: restore_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 1)
+    end
+  end
+
+  context 'expirant' do
+    let(:procedure) { create(:procedure, :published, duree_conservation_dossiers_dans_ds: 6, procedure_expires_when_termine_enabled: true) }
+    let!(:dossier) { create(:dossier, state: :accepte, procedure: procedure, processed_at: 175.days.ago) }
+
+    it 'displays the correct actions' do
+      expect(subject).to have_text('Conserver un mois de plus')
+      expect(subject).to have_link('Repasser en instruction', href: repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 2)
+    end
+  end
+
+  context 'archived' do
+    let(:dossier) { create(:dossier, :accepte, :archived) }
+
+    it 'displays the correct actions' do
+      expect(subject).to have_link('Désarchiver le dossier', href: unarchive_instructeur_dossier_path(dossier.procedure, dossier))
+      expect(subject).to have_selector('[title^="Supprimer le dossier"]')
+      expect(subject).to have_selector('.header-actions ul:first-child .fr-btn', count: 2)
+    end
   end
 
   context 'when the user is logged in with france connect' do
@@ -39,7 +143,7 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do
       let(:dossier) { create(:dossier, :en_construction, :with_entreprise, as_degraded_mode: false) }
 
       it 'contains no warning' do
-        expect(rendered).not_to have_text("Les services de l’INSEE sont indisponibles")
+        expect(subject).not_to have_text("Les services de l’INSEE sont indisponibles")
       end
     end
 
@@ -47,7 +151,7 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do
       let(:dossier) { create(:dossier, :en_construction, :with_entreprise, as_degraded_mode: true) }
 
       it 'warns the instructeur' do
-        expect(rendered).to have_text("Les services de l’INSEE sont indisponibles")
+        expect(subject).to have_text("Les services de l’INSEE sont indisponibles")
       end
     end
   end