diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index c442f3ebd..01fc7f64f 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -30,7 +30,6 @@
     color: $dark-red;
   }
 
-  label,
   legend.form-label {
     font-size: 18px;
     margin-bottom: $default-padding;
@@ -198,9 +197,6 @@
   input[type=tel],
   textarea,
   select {
-    border-radius: 4px;
-    border: solid 1px $border-grey;
-    padding: $default-padding;
 
     &.small {
       padding: $default-spacer;
@@ -218,7 +214,7 @@
     }
 
     // Hide the browser default invalidity indicator until the field is touched
-    &:invalid:not(:focus) {
+    &:invalid:not(:focus):not(.fr-input) {
       box-shadow: none;
     }
 
diff --git a/app/views/shared/dossiers/messages/_form.html.haml b/app/views/shared/dossiers/messages/_form.html.haml
index beac4ec37..6d04822bd 100644
--- a/app/views/shared/dossiers/messages/_form.html.haml
+++ b/app/views/shared/dossiers/messages/_form.html.haml
@@ -3,12 +3,17 @@
   - placeholder = t('views.shared.dossiers.messages.form.write_message_to_administration_placeholder')
   - if instructeur_signed_in? || administrateur_signed_in? || expert_signed_in?
     - placeholder = t('views.shared.dossiers.messages.form.write_message_placeholder')
-  = f.text_area :body, rows: 5, placeholder: placeholder, title: placeholder, required: true, class: 'message-textarea'
+  %p.mandatory-explanation= t('asterisk_html', scope: [:utils])
+  .fr-input-group
+    = label_tag :commentaire_body, class: 'fr-label' do
+      = t('message', scope: [:utils])
+      %span.mandatory *
+    = f.text_area :body, rows: 5, placeholder: placeholder, title: placeholder, required: true, class: 'fr-input message-textarea'
   .flex.justify-between.wrap
     - disable_piece_jointe = defined?(disable_piece_jointe) ? disable_piece_jointe : false
     %div
       - if !disable_piece_jointe
         = render Attachment::EditComponent.new(attached_file: commentaire.piece_jointe)
 
-    %div
-      = f.submit t('views.shared.dossiers.messages.form.send_message'), class: 'button primary send', data: { disable: true }
+    .send-wrapper.fr-my-3w
+      = f.submit t('views.shared.dossiers.messages.form.send_message'), class: 'fr-btn send', data: { disable: true }
diff --git a/app/views/users/dossiers/show/_print_dossier.html.haml b/app/views/users/dossiers/show/_print_dossier.html.haml
index 4a9804dd6..58e030960 100644
--- a/app/views/users/dossiers/show/_print_dossier.html.haml
+++ b/app/views/users/dossiers/show/_print_dossier.html.haml
@@ -1,4 +1,4 @@
-%span.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
+.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
   %button.button.dropdown-button.icon-only{ title: t('views.users.dossiers.show.header.print'), 'aria-label': 'imprimer', data: { menu_button_target: 'button' } }
     %span.icon.printer
   %ul#print-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } }