diff --git a/app/assets/stylesheets/new_design/buttons.scss b/app/assets/stylesheets/new_design/buttons.scss
index e66e2c9fa..522c52d57 100644
--- a/app/assets/stylesheets/new_design/buttons.scss
+++ b/app/assets/stylesheets/new_design/buttons.scss
@@ -130,6 +130,10 @@
   }
 }
 
+.state-button {
+  display: inline-block;
+}
+
 .dropdown {
   display: inline-block;
   position: relative;
diff --git a/app/views/instructeurs/dossiers/_header_actions.html.haml b/app/views/instructeurs/dossiers/_header_actions.html.haml
index 63778f4af..57932439b 100644
--- a/app/views/instructeurs/dossiers/_header_actions.html.haml
+++ b/app/views/instructeurs/dossiers/_header_actions.html.haml
@@ -20,5 +20,5 @@
 
 = render partial: "instructeurs/procedures/dossier_actions", locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: current_instructeur&.follow?(dossier) }
 
-%span.state-button
+.state-button
   = render partial: "state_button", locals: { dossier: dossier }
diff --git a/app/views/instructeurs/dossiers/_state_button.html.haml b/app/views/instructeurs/dossiers/_state_button.html.haml
index cbf3c2251..f30fd97d5 100644
--- a/app/views/instructeurs/dossiers/_state_button.html.haml
+++ b/app/views/instructeurs/dossiers/_state_button.html.haml
@@ -1,4 +1,4 @@
-%span.dropdown
+.dropdown
   -# Dropdown button title
   %button.button.primary.dropdown-button{ class: button_or_label_class(dossier) }
     = dossier_display_state dossier
diff --git a/app/views/invites/_dropdown.html.haml b/app/views/invites/_dropdown.html.haml
index 7fda74dd5..91a451c9e 100644
--- a/app/views/invites/_dropdown.html.haml
+++ b/app/views/invites/_dropdown.html.haml
@@ -1,4 +1,4 @@
-%span.dropdown.invite-user-action
+.dropdown.invite-user-action
   %button.button.dropdown-button
     %span.icon.person
     - if dossier.invites.count > 0
diff --git a/app/views/layouts/_account_dropdown.haml b/app/views/layouts/_account_dropdown.haml
index 9f896c390..5cf464c75 100644
--- a/app/views/layouts/_account_dropdown.haml
+++ b/app/views/layouts/_account_dropdown.haml
@@ -1,4 +1,4 @@
-%span.dropdown.header-menu-opener
+.dropdown.header-menu-opener
   %button.button.dropdown-button.header-menu-button
     = image_tag "icons/account-circle.svg", title: "Mon compte"
   %ul.header-menu.dropdown-content
diff --git a/app/views/users/dossiers/_dossier_actions.html.haml b/app/views/users/dossiers/_dossier_actions.html.haml
index bad0197ba..36d9c290d 100644
--- a/app/views/users/dossiers/_dossier_actions.html.haml
+++ b/app/views/users/dossiers/_dossier_actions.html.haml
@@ -4,7 +4,7 @@
 - has_actions = has_delete_action || has_new_dossier_action
 
 - if has_actions
-  %span.dropdown.user-dossier-actions
+  .dropdown.user-dossier-actions
     %button.button.dropdown-button
       Actions
     .dropdown-content.fade-in-down