diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32d8c088f..bc172fe47 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -312,7 +312,8 @@ class ApplicationController < ActionController::Base
       path == '/contact-admin' ||
       path.start_with?('/connexion-par-jeton') ||
       path.start_with?('/api/') ||
-      path.start_with?('/lien-envoye')
+      path.start_with?('/lien-envoye') ||
+      path.start_with?('/faq')
 
       false
     else
diff --git a/app/views/users/confirmations/new.html.haml b/app/views/users/confirmations/new.html.haml
index 587531801..786c1aa89 100644
--- a/app/views/users/confirmations/new.html.haml
+++ b/app/views/users/confirmations/new.html.haml
@@ -17,7 +17,9 @@
         %p= t('views.confirmation.new.email_cta_html', email: resource.email)
         %p= t('views.confirmation.new.email_guidelines_html')
 
+    %p.fr-text--sm.fr-text-mention--grey.fr-mb-1w
+      = t('views.confirmation.new.email_missing')
+
     = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { class: 'fr-mb-6w'}) do |f|
-      %legend.fr-hint-text.fr-mb-3w= t('views.confirmation.new.email_missing')
       = f.hidden_field :email
       = f.submit t('views.confirmation.new.resent'), class: 'fr-btn fr-btn--secondary'
diff --git a/app/views/users/sessions/link_sent.html.haml b/app/views/users/sessions/link_sent.html.haml
index 66ef59192..270ff697a 100644
--- a/app/views/users/sessions/link_sent.html.haml
+++ b/app/views/users/sessions/link_sent.html.haml
@@ -3,27 +3,26 @@
 - content_for :footer do
   = render partial: 'root/footer'
 
-.fr-container.fr-my-5w
-  .fr-grid-row
-    .fr-col-12.fr-col-offset-md-1.fr-col-md-7
-      %h1.fr-mt-6w Encore une petite étape !
+.fr-container
+  .fr-col-12.fr-col-md-6.fr-col-offset-md-3
+    %h1.fr-mt-6w.fr-h2.center
+      = t('views.confirmation.new.title')
 
-      %section
-        %p.fr-text--lead
-          Nous venons de vous envoyer un courriel sur votre boite email <strong>#{@email}</strong>.
-          Veuillez l’ouvrir et cliquer sur le lien de <strong>connexion sécurisée à #{Current.application_name}</strong>.
+    %p.center{ aria: { hidden: true } }= image_tag("user/confirmation-email.svg", alt: t('views.confirmation.new.image_alt'))
 
-        %p.fr-text--lead
-          Ce lien est <strong>valide une semaine</strong> et peut être réutilisé <strong>plusieurs fois</strong>.
+    = render Dsfr::AlertComponent.new(title: '', state: :info, heading_level: 'h2', extra_class_names: 'fr-mt-6w fr-mb-3w') do |c|
+      - c.with_body do
+        %p= t('views.users.sessions.link_sent.email_cta_html', email: @email)
+        %p= t('views.confirmation.new.email_guidelines_html')
 
-        %p.fr-text--sm.fr-text-mention--grey
-          Ce courriel peut mettre jusqu’à <strong>15 minutes</strong> pour arriver. Si vous n’avez pas reçu de courriel (n’hésitez pas à vérifier dans les indésirables), cliquez sur le bouton ci-dessous.
+    %p.fr-text--sm.fr-text-mention--grey.fr-mb-1w
+      = t('views.confirmation.new.email_missing')
 
-      = button_to instructeurs_reset_link_sent_path, class: 'fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-mail-line', method: 'POST' do
-        Renvoyer le courriel
+    = button_to instructeurs_reset_link_sent_path, class: 'fr-btn fr-btn--secondary', method: 'POST' do
+      = t('views.confirmation.new.resent')
 
-      %section
-        %p.fr-mt-3w
-          Si vous voyez cette page trop souvent, #{link_to "consultez notre aide", t("links.common.faq.confirmer_compte_chaque_connexion_url")}
-        %p.fr-mt-3w
-          = t('views.users.shared.contact_us_if_any_trouble_html', href: contact_admin_url)
+    %p.fr-text--sm.fr-text-mention--grey.fr-mt-3w
+      = t('views.users.sessions.link_sent.consult_help_page_html', href: t("links.common.faq.confirmer_compte_chaque_connexion_url"))
+
+    %p.fr-text--sm.fr-text-mention--grey.fr-mt-3w.fr-mb-6w
+      = t('views.users.shared.contact_us_if_any_trouble_html', href: contact_admin_url)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a05c394b2..c4a9ea309 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -554,6 +554,9 @@ en:
           connect_with_agent_connect: Visit our dedicated page
           subtitle: "Sign in with my account"
           for_tiers_alert: If you are completing a forme for someone else, you must use your own credentials.
+        link_sent:
+          consult_help_page_html: If you're seeing this page too often, <a target="_blank" rel="noopener noreferrer" href="%{href}">please consult our help page</a>.
+          email_cta_html: "We have to validate your email address <strong>%{email}</strong>."
       passwords:
         edit:
           subtitle: Change password
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 42896bd24..24815f182 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -557,6 +557,9 @@ fr:
           connect_with_agent_connect: Accédez à notre page dédiée
           subtitle: "Se connecter avec son compte"
           for_tiers_alert: Si vous remplissez un dossier pour un tiers, vous devez utiliser vos propres identifiants.
+        link_sent:
+          consult_help_page_html: Si vous voyez cette page trop souvent, <a target="_blank" rel="noopener noreferrer" href="%{href}">consultez notre aide</a>.
+          email_cta_html: "Nous avons besoin de vérifier votre adresse électronique <strong>%{email}</strong>."
       passwords:
         edit:
           subtitle: Changement de mot de passe