diff --git a/app/components/status_page_component.html.erb b/app/components/status_page_component.html.erb
index 65c67610035..3d4ec71e3d7 100644
--- a/app/components/status_page_component.html.erb
+++ b/app/components/status_page_component.html.erb
@@ -5,7 +5,7 @@
 <%= content %>
 
 <% if action_buttons? %>
-  <div class="margin-top-4">
+  <div class="margin-top-5">
     <% action_buttons.each do |action| %>
       <div class="margin-top-2">
         <%= action %>
diff --git a/app/javascript/packages/components/status-page.tsx b/app/javascript/packages/components/status-page.tsx
index ff296cb851c..1559ea9fb9f 100644
--- a/app/javascript/packages/components/status-page.tsx
+++ b/app/javascript/packages/components/status-page.tsx
@@ -90,7 +90,7 @@ function StatusPage({
       <PageHeading>{header}</PageHeading>
       {children}
       {actionButtons.length > 0 && (
-        <div className="margin-top-4">
+        <div className="margin-top-5">
           {actionButtons.map((actionButton, index) => (
             <div key={index} className="margin-top-2">
               {actionButton}
diff --git a/app/javascript/packages/verify-flow/steps/password-confirm/forgot-password.tsx b/app/javascript/packages/verify-flow/steps/password-confirm/forgot-password.tsx
index a3b0e2bd986..043aa6d1e03 100644
--- a/app/javascript/packages/verify-flow/steps/password-confirm/forgot-password.tsx
+++ b/app/javascript/packages/verify-flow/steps/password-confirm/forgot-password.tsx
@@ -1,6 +1,5 @@
-import { PageHeading } from '@18f/identity-components';
+import { StatusPage } from '@18f/identity-components';
 import { t } from '@18f/identity-i18n';
-import { getAssetPath } from '@18f/identity-assets';
 import { HistoryLink } from '@18f/identity-form-steps';
 import PasswordResetButton from './password-reset-button';
 
@@ -10,28 +9,29 @@ interface ForgotPasswordProps {
 
 export function ForgotPassword({ stepPath }: ForgotPasswordProps) {
   return (
-    <>
-      <img
-        src={getAssetPath('status/info-question.svg')}
-        width="54"
-        height="54"
-        alt={t('components.status_page.icons.question')}
-        className="margin-bottom-4"
-      />
-      <PageHeading>{t('idv.forgot_password.modal_header')}</PageHeading>
+    <StatusPage
+      status="info"
+      icon="question"
+      header={t('idv.forgot_password.modal_header')}
+      actionButtons={[
+        <HistoryLink
+          key="try_again"
+          basePath={stepPath}
+          step={undefined}
+          isVisualButton
+          isBig
+          isWide
+        >
+          {t('idv.forgot_password.try_again')}
+        </HistoryLink>,
+        <PasswordResetButton key="password_reset" />,
+      ]}
+    >
       <ul className="usa-list">
         {t(['idv.forgot_password.warnings']).map((warning) => (
           <li key={warning}>{warning}</li>
         ))}
       </ul>
-      <div className="margin-top-4">
-        <HistoryLink basePath={stepPath} step={undefined} isVisualButton isBig isWide>
-          {t('idv.forgot_password.try_again')}
-        </HistoryLink>
-      </div>
-      <div className="margin-top-2">
-        <PasswordResetButton />
-      </div>
-    </>
+    </StatusPage>
   );
 }
diff --git a/app/views/idv/shared/_error.html.erb b/app/views/idv/shared/_error.html.erb
index 21939d38e8b..a9eb2a09f97 100644
--- a/app/views/idv/shared/_error.html.erb
+++ b/app/views/idv/shared/_error.html.erb
@@ -25,7 +25,7 @@ locals:
 <%= yield %>
 
 <% if local_assigns[:action] %>
-  <div class="margin-top-4">
+  <div class="margin-top-5">
     <%= button_or_link_to(
           action[:text],
           action[:url],