diff --git a/ui/app/components/clients/no-data.hbs b/ui/app/components/clients/no-data.hbs
index 9ab6a96f11..1e71d4cf48 100644
--- a/ui/app/components/clients/no-data.hbs
+++ b/ui/app/components/clients/no-data.hbs
@@ -5,7 +5,7 @@
 
 {{#if (or @config.reporting_enabled (eq @config.enabled "default-enabled") (eq @config.enabled "enable"))}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No data received" />
+    <A.Header data-test-empty-state-title @title="No data received" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text="Tracking is turned on and Vault is gathering data. It should appear here within 30 minutes."
@@ -13,7 +13,7 @@
   </Hds::ApplicationState>
 {{else if @config}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="Data tracking is disabled" />
+    <A.Header data-test-empty-state-title @title="Data tracking is disabled" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text="Tracking is disabled, and no data is being collected. To turn it on, edit the configuration."
@@ -32,7 +32,7 @@
   </Hds::ApplicationState>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="Activity configuration data is unavailable" />
+    <A.Header data-test-empty-state-title @title="Activity configuration data is unavailable" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text="Reporting status is unknown and could be enabled or disabled. Check the Vault logs for more information."
diff --git a/ui/app/components/clients/page/client-list.hbs b/ui/app/components/clients/page/client-list.hbs
index e2e28647aa..23387c856f 100644
--- a/ui/app/components/clients/page/client-list.hbs
+++ b/ui/app/components/clients/page/client-list.hbs
@@ -56,20 +56,20 @@
                     <:emptyState>
                       {{#if (and (eq tabName "Secret sync") (not this.flags.secretsSyncIsActivated))}}
                         <Hds::ApplicationState @align="center" as |A|>
-                          <A.Header @title="No secret sync clients" />
+                          <A.Header @title="No secret sync clients" @titleTag="h2" />
                           <A.Body @text="No data is available because Secrets Sync has not been activated." />
-                          <A.Body>
-                            <Hds::Link::Standalone
+                          <A.Footer as |F|>
+                            <F.LinkStandalone
                               @icon="chevron-right"
                               @iconPosition="trailing"
                               @text="Activate Secrets Sync"
                               @route="vault.cluster.sync.secrets.overview"
                             />
-                          </A.Body>
+                          </A.Footer>
                         </Hds::ApplicationState>
                       {{else}}
                         <Hds::ApplicationState @align="center" as |A|>
-                          <A.Header @title="No data found" />
+                          <A.Header @title="No data found" @titleTag="h2" />
                           <A.Body
                             @text="Select another client type {{if
                               this.filtersAreApplied
@@ -91,7 +91,7 @@
   </Clients::CountsCard>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No data found" />
+    <A.Header data-test-empty-state-title @title="No data found" @titleTag="h2" />
     <A.Body data-test-empty-state-message @text="No data to export in provided time range." />
   </Hds::ApplicationState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/components/clients/page/counts.hbs b/ui/app/components/clients/page/counts.hbs
index 52dcb706f0..f2956de69b 100644
--- a/ui/app/components/clients/page/counts.hbs
+++ b/ui/app/components/clients/page/counts.hbs
@@ -78,7 +78,7 @@
     {{else}}
       {{! Empty state for no data in the selected date range }}
       <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-        <A.Header data-test-empty-state-title @title="No data received" />
+        <A.Header data-test-empty-state-title @title="No data received" @titleTag="h2" />
         <A.Body
           data-test-empty-state-message
           @text={{if
@@ -92,7 +92,11 @@
   {{else if (and this.version.isCommunity (or (not @startTimestamp) (not @endTimestamp)))}}
     {{! Empty state for community without start or end query param }}
     <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-      <A.Header data-test-empty-state-title @title="Input the start and end dates to view client attribution by path." />
+      <A.Header
+        data-test-empty-state-title
+        @title="Input the start and end dates to view client attribution by path."
+        @titleTag="h2"
+      />
       <A.Body
         data-test-empty-state-message
         @text="Only historical data may be queried. No data is available for the current month."
diff --git a/ui/app/components/clients/page/overview.hbs b/ui/app/components/clients/page/overview.hbs
index bd0f7e35d7..f95f8fc467 100644
--- a/ui/app/components/clients/page/overview.hbs
+++ b/ui/app/components/clients/page/overview.hbs
@@ -28,7 +28,7 @@
       >
         <:emptyState>
           <Hds::ApplicationState @align="center" as |A|>
-            <A.Header @title="No data found" />
+            <A.Header @title="No data found" @titleTag="h2" />
             <A.Body @text="Clear or change filters to view client count data." />
             <A.Footer as |F|>
               <F.LinkStandalone
diff --git a/ui/app/components/clients/table.hbs b/ui/app/components/clients/table.hbs
index 1d2d8c4dc7..c18d12d583 100644
--- a/ui/app/components/clients/table.hbs
+++ b/ui/app/components/clients/table.hbs
@@ -69,7 +69,7 @@
       {{yield to="emptyState"}}
     {{else}}
       <Hds::ApplicationState as |A|>
-        <A.Header @title="No data to display" />
+        <A.Header @title="No data to display" @titleTag="h2" />
       </Hds::ApplicationState>
     {{/if}}
   </Hds::Card::Container>
diff --git a/ui/app/components/dashboard/quick-actions-card.hbs b/ui/app/components/dashboard/quick-actions-card.hbs
index 5928a0ab4c..2a26f74e7e 100644
--- a/ui/app/components/dashboard/quick-actions-card.hbs
+++ b/ui/app/components/dashboard/quick-actions-card.hbs
@@ -86,13 +86,13 @@
       {{/if}}
     {{else}}
       <Hds::ApplicationState @align="center" data-test-empty-state="no-mount-selected" as |A|>
-        <A.Header data-test-empty-state-title @title="No mount selected" />
+        <A.Header data-test-empty-state-title @title="No mount selected" @titleTag="h2" />
         <A.Body data-test-empty-state-message @text="Select a mount above to get started." />
       </Hds::ApplicationState>
     {{/if}}
   {{else}}
     <Hds::ApplicationState @align="center" data-test-empty-state="quick-actions" as |A|>
-      <A.Header data-test-empty-state-title @title="Welcome to quick actions" />
+      <A.Header data-test-empty-state-title @title="Welcome to quick actions" @titleTag="h2" />
       <A.Body
         data-test-empty-state-message
         @text="Access secret engine actions easily. Enable a compatible secret engine (such as database, KV version 2, or PKI) to get started."
diff --git a/ui/app/components/dashboard/replication-card.hbs b/ui/app/components/dashboard/replication-card.hbs
index 84bc2da0c8..12900fcee9 100644
--- a/ui/app/components/dashboard/replication-card.hbs
+++ b/ui/app/components/dashboard/replication-card.hbs
@@ -87,7 +87,7 @@
     </div>
   {{else}}
     <Hds::ApplicationState @align="center" data-test-empty-state="replication" class="has-top-margin-l" as |A|>
-      <A.Header data-test-empty-state-title @title="Replication not set up" />
+      <A.Header data-test-empty-state-title @title="Replication not set up" @titleTag="h2" />
       <A.Body
         data-test-empty-state-message
         @text="Data will be listed here. Enable a primary replication cluster to get started."
diff --git a/ui/app/components/dashboard/secrets-engines-card.hbs b/ui/app/components/dashboard/secrets-engines-card.hbs
index b8df77eec9..3b6f18daa5 100644
--- a/ui/app/components/dashboard/secrets-engines-card.hbs
+++ b/ui/app/components/dashboard/secrets-engines-card.hbs
@@ -78,7 +78,7 @@
 
   {{else}}
     <Hds::ApplicationState @align="center" data-test-empty-state="secrets-engines" class="has-top-margin-l" as |A|>
-      <A.Header data-test-empty-state-title @title="No secrets engines enabled" />
+      <A.Header data-test-empty-state-title @title="No secrets engines enabled" @titleTag="h2" />
       <A.Body
         data-test-empty-state-message
         @text="Secret engines will be listed here. Enable a secret engine to get started."
diff --git a/ui/app/components/database-connection.hbs b/ui/app/components/database-connection.hbs
index 2b5d94c9b2..1bfe657dd7 100644
--- a/ui/app/components/database-connection.hbs
+++ b/ui/app/components/database-connection.hbs
@@ -144,7 +144,7 @@
           {{/each}}
         {{else}}
           <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-            <A.Header data-test-empty-state-title @title="No plugin selected" />
+            <A.Header data-test-empty-state-title @title="No plugin selected" @titleTag="h2" />
             <A.Body data-test-empty-state-message @text="Select a plugin type to be able to configure it." />
           </Hds::ApplicationState>
         {{/if}}
@@ -158,7 +158,7 @@
         <h3 class="title is-5">Statements</h3>
         {{#if (eq @model.statementFields null)}}
           <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-            <A.Header data-test-empty-state-title @title="No plugin selected" />
+            <A.Header data-test-empty-state-title @title="No plugin selected" @titleTag="h2" />
             <A.Body data-test-empty-state-message @text="Select a plugin type to be able to configure it." />
           </Hds::ApplicationState>
         {{else}}
@@ -309,11 +309,17 @@
   </form>
 {{else if (eq @model.isAvailablePlugin false)}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @icon="skip" @title="Database type unavailable" />
-    <A.Body data-test-empty-state-message>
-      <p>Not supported in the UI</p>
-      <p>This database type cannot be viewed in the UI. You will have to use the API or CLI to perform actions here.</p>
-    </A.Body>
+    <A.Header
+      data-test-empty-state-title
+      @icon="skip"
+      class="align-items-end"
+      @title="Database type unavailable"
+      @titleTag="h2"
+    />
+    <A.Body
+      data-test-empty-state-message
+      @text="This database type cannot be viewed in the UI. You will have to use the API or CLI to perform actions here."
+    />
     <A.Footer data-test-empty-state-actions as |F|>
       <F.LinkStandalone @icon="chevron-left" @text="Go back" @route="vault.cluster.secrets.backend.list-root" />
       <F.LinkStandalone
diff --git a/ui/app/components/database-role-edit.hbs b/ui/app/components/database-role-edit.hbs
index b30ec1daaf..4c39c9e349 100644
--- a/ui/app/components/database-role-edit.hbs
+++ b/ui/app/components/database-role-edit.hbs
@@ -142,7 +142,7 @@
         />
       {{else}}
         <Hds::ApplicationState @align="center" class="bottom-padding-32" as |A|>
-          <A.Header data-test-empty-state-title @title="No database connection selected" />
+          <A.Header data-test-empty-state-title @title="No database connection selected" @titleTag="h2" />
           <A.Body data-test-empty-state-message @text="Choose a connection to be able to configure a role type." />
         </Hds::ApplicationState>
       {{/if}}
diff --git a/ui/app/components/database-role-setting-form.hbs b/ui/app/components/database-role-setting-form.hbs
index 5c4090fe5b..d8b846f66f 100644
--- a/ui/app/components/database-role-setting-form.hbs
+++ b/ui/app/components/database-role-setting-form.hbs
@@ -38,7 +38,7 @@
     </div>
   {{else}}
     <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-      <A.Header data-test-empty-state-title @title="No role type selected" />
+      <A.Header data-test-empty-state-title @title="No role type selected" @titleTag="h2" />
       <A.Body data-test-empty-state-message @text="Select a type of role to be able to configure it" />
     </Hds::ApplicationState>
   {{/if}}
@@ -55,7 +55,7 @@
       </div>
     {{else}}
       <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-        <A.Header data-test-empty-state-title @title="No role type selected" />
+        <A.Header data-test-empty-state-title @title="No role type selected" @titleTag="h2" />
         <A.Body
           data-test-empty-state-message
           @text="Select a type of role to be able to add statements for creation, revocation, and/or rotation."
diff --git a/ui/app/components/generate-credentials-database.hbs b/ui/app/components/generate-credentials-database.hbs
index 716288c210..b9bda7491b 100644
--- a/ui/app/components/generate-credentials-database.hbs
+++ b/ui/app/components/generate-credentials-database.hbs
@@ -16,8 +16,10 @@
       <A.Header
         data-test-empty-state-title
         @title={{this.errorTitle}}
+        @titleTag="h2"
         @errorCode={{@model.errorHttpStatus}}
         @icon="alert-circle"
+        class="align-items-end"
       />
       <A.Body data-test-empty-state-message @text={{@model.errorMessage}} />
       <A.Footer data-test-empty-state-actions as |F|>
diff --git a/ui/app/components/identity/item-alias/alias-metadata.hbs b/ui/app/components/identity/item-alias/alias-metadata.hbs
index 3395526fe5..651cb4dd10 100644
--- a/ui/app/components/identity/item-alias/alias-metadata.hbs
+++ b/ui/app/components/identity/item-alias/alias-metadata.hbs
@@ -20,6 +20,6 @@
   </div>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No metadata associated with {{@model.name}} yet" />
+    <A.Header data-test-empty-state-title @title="No metadata associated with {{@model.name}} yet" @titleTag="h2" />
   </Hds::ApplicationState>
 {{/each-in}}
\ No newline at end of file
diff --git a/ui/app/components/identity/item-aliases.hbs b/ui/app/components/identity/item-aliases.hbs
index 35295ec10a..b69ec6b0ab 100644
--- a/ui/app/components/identity/item-aliases.hbs
+++ b/ui/app/components/identity/item-aliases.hbs
@@ -30,6 +30,10 @@
   </LinkedBlock>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No {{@model.identityType}} aliases for {{@model.name}} yet" />
+    <A.Header
+      data-test-empty-state-title
+      @title="No {{@model.identityType}} aliases for {{@model.name}} yet"
+      @titleTag="h2"
+    />
   </Hds::ApplicationState>
 {{/each}}
\ No newline at end of file
diff --git a/ui/app/components/identity/item-groups.hbs b/ui/app/components/identity/item-groups.hbs
index f9c90529f0..7035f54962 100644
--- a/ui/app/components/identity/item-groups.hbs
+++ b/ui/app/components/identity/item-groups.hbs
@@ -19,6 +19,6 @@
   {{/each}}
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="{{@model.name}} is not a member of any groups." />
+    <A.Header data-test-empty-state-title @title="{{@model.name}} is not a member of any groups." @titleTag="h2" />
   </Hds::ApplicationState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/components/identity/item-members.hbs b/ui/app/components/identity/item-members.hbs
index a933d2e74b..a67c8f8d80 100644
--- a/ui/app/components/identity/item-members.hbs
+++ b/ui/app/components/identity/item-members.hbs
@@ -46,6 +46,6 @@
   {{/each}}
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No members in this group yet" />
+    <A.Header data-test-empty-state-title @title="No members in this group yet" @titleTag="h2" />
   </Hds::ApplicationState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/components/identity/item-metadata.hbs b/ui/app/components/identity/item-metadata.hbs
index d040575c29..514f470614 100644
--- a/ui/app/components/identity/item-metadata.hbs
+++ b/ui/app/components/identity/item-metadata.hbs
@@ -23,7 +23,7 @@
   </div>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No metadata for {{@model.name}}" />
+    <A.Header data-test-empty-state-title @title="No metadata for {{@model.name}}" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text='You can store custom data that you want to associate with this {{lowercase
diff --git a/ui/app/components/identity/item-parent-groups.hbs b/ui/app/components/identity/item-parent-groups.hbs
index 9f4d416063..c09fbd6eda 100644
--- a/ui/app/components/identity/item-parent-groups.hbs
+++ b/ui/app/components/identity/item-parent-groups.hbs
@@ -23,6 +23,6 @@
   {{/each}}
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="This group has no parent groups yet" />
+    <A.Header data-test-empty-state-title @title="This group has no parent groups yet" @titleTag="h2" />
   </Hds::ApplicationState>
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/components/identity/item-policies.hbs b/ui/app/components/identity/item-policies.hbs
index 72161821b7..ac5376030f 100644
--- a/ui/app/components/identity/item-policies.hbs
+++ b/ui/app/components/identity/item-policies.hbs
@@ -24,6 +24,6 @@
   </LinkedBlock>
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No policies associated with {{@model.name}} yet" />
+    <A.Header data-test-empty-state-title @title="No policies associated with {{@model.name}} yet" @titleTag="h2" />
   </Hds::ApplicationState>
 {{/each}}
\ No newline at end of file
diff --git a/ui/app/components/keymgmt/key-edit.hbs b/ui/app/components/keymgmt/key-edit.hbs
index 5fd005fb6d..30ae8bbc3f 100644
--- a/ui/app/components/keymgmt/key-edit.hbs
+++ b/ui/app/components/keymgmt/key-edit.hbs
@@ -171,7 +171,13 @@
       </h2>
       {{#if @model.provider.permissionsError}}
         <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-          <A.Header @title="You are not authorized" @errorCode="403" @icon="minus-circle" />
+          <A.Header
+            @title="You are not authorized"
+            @titleTag="h2"
+            @errorCode="403"
+            @icon="minus-circle"
+            class="align-items-end"
+          />
           <A.Body
             @text={{concat
               "You must be granted permissions to see whether this key is distributed. Ask your administrator if you think you should have access to LIST /"
@@ -189,7 +195,7 @@
           class="top-padding-32 bottom-padding-32"
           as |A|
         >
-          <A.Header @title="Key not distributed" />
+          <A.Header @title="Key not distributed" @titleTag="h2" />
           <A.Body @text="When this key is distributed to a destination, those details will appear here." />
           {{#if @model.canListProviders}}
             <A.Footer>
@@ -226,7 +232,13 @@
           {{/each}}
         {{else}}
           <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-            <A.Header @title="You are not authorized" @errorCode="403" @icon="minus-circle" />
+            <A.Header
+              @title="You are not authorized"
+              @titleTag="h2"
+              @errorCode="403"
+              @icon="minus-circle"
+              class="align-items-end"
+            />
             <A.Body
               @text={{concat
                 "You must be granted permissions to view distribution details for this key. Ask your administrator if you think you should have access to GET /"
diff --git a/ui/app/components/keymgmt/provider-edit.hbs b/ui/app/components/keymgmt/provider-edit.hbs
index 9246c9bd0d..85899b5212 100644
--- a/ui/app/components/keymgmt/provider-edit.hbs
+++ b/ui/app/components/keymgmt/provider-edit.hbs
@@ -99,7 +99,7 @@
                 <FormField @attr={{attr}} @model={{@model}} @modelValidations={{this.modelValidations}} />
               {{else}}
                 <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-                  <A.Header @title="No provider selected" />
+                  <A.Header @title="No provider selected" @titleTag="h2" />
                   <A.Body @text="Select a provider in order to configure it." />
                 </Hds::ApplicationState>
               {{/if}}
@@ -171,7 +171,7 @@
 
           {{else}}
             <Hds::ApplicationState @align="center" class="top-padding-32 bottom-padding-32" as |A|>
-              <A.Header @title="No keys for this provider" />
+              <A.Header @title="No keys for this provider" @titleTag="h2" />
               <A.Body @text="Keys for this provider will be listed here. Add a key to get started." />
               <A.Footer as |F|>
                 <F.LinkStandalone
diff --git a/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs b/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
index e9c939afe3..deab83a7e9 100644
--- a/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
@@ -48,7 +48,7 @@
 
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No {{this.identityType}} aliases yet" />
+    <A.Header data-test-empty-state-title @title="No {{this.identityType}} aliases yet" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text="A list of {{this.identityType}} aliases in this namespace will be listed here. Choose one of the {{pluralize
diff --git a/ui/app/templates/vault/cluster/access/identity/index.hbs b/ui/app/templates/vault/cluster/access/identity/index.hbs
index fe107191d8..729e9c2836 100644
--- a/ui/app/templates/vault/cluster/access/identity/index.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/index.hbs
@@ -97,7 +97,7 @@
 
 {{else}}
   <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-    <A.Header data-test-empty-state-title @title="No {{pluralize this.identityType}} yet" />
+    <A.Header data-test-empty-state-title @title="No {{pluralize this.identityType}} yet" @titleTag="h2" />
     <A.Body
       data-test-empty-state-message
       @text="A list of {{pluralize
diff --git a/ui/app/templates/vault/cluster/auth.hbs b/ui/app/templates/vault/cluster/auth.hbs
index 451781cf09..38c3dc8945 100644
--- a/ui/app/templates/vault/cluster/auth.hbs
+++ b/ui/app/templates/vault/cluster/auth.hbs
@@ -5,7 +5,7 @@
 
 {{#if this.unwrapTokenError}}
   <Hds::ApplicationState @align="center" class="has-top-margin-xxl" data-test-page-error as |A|>
-    <A.Header @title="Authentication error" />
+    <A.Header @title="Authentication error" @titleTag="h2" />
     <A.Body @text="Token unwrap failed" />
     <A.Body @text="Error: {{this.unwrapTokenError}}" />
     <A.Footer as |F|>
diff --git a/ui/app/templates/vault/cluster/clients/counts/client-list.hbs b/ui/app/templates/vault/cluster/clients/counts/client-list.hbs
index bc52bca598..926a2b1580 100644
--- a/ui/app/templates/vault/cluster/clients/counts/client-list.hbs
+++ b/ui/app/templates/vault/cluster/clients/counts/client-list.hbs
@@ -5,7 +5,13 @@
 
 {{#if this.model.cannotRequestExport}}
   <Hds::ApplicationState @align="center" class="has-top-margin-xxl" as |A|>
-    <A.Header @icon="skip" @title="You are not authorized" data-test-empty-state-title />
+    <A.Header
+      @icon="skip"
+      class="align-items-end"
+      @title="You are not authorized"
+      @titleTag="h2"
+      data-test-empty-state-title
+    />
 
     <A.Body data-test-empty-state-message>
       Viewing export data requires
diff --git a/ui/app/templates/vault/cluster/secrets/backend/list.hbs b/ui/app/templates/vault/cluster/secrets/backend/list.hbs
index 6dc95e3a64..9b42cdda9a 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/list.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/list.hbs
@@ -104,6 +104,7 @@
             this.filterFocused
             'Press ENTER to add one.'
           }}'
+          @titleTag="h2"
         />
       </Hds::ApplicationState>
 
@@ -125,12 +126,12 @@
     {{#if (eq this.baseKey.id "")}}
       {{#if (and options.firstStep (not this.tab))}}
         <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-          <A.Header data-test-empty-state-title @title="Get started with {{capitalize this.backendType}}" />
+          <A.Header data-test-empty-state-title @title="Get started with {{capitalize this.backendType}}" @titleTag="h2" />
           <A.Body data-test-empty-state-message @text={{options.firstStep}} />
         </Hds::ApplicationState>
       {{else}}
         <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-          <A.Header data-test-empty-state-title @title="No {{pluralize options.item}} in this backend" />
+          <A.Header data-test-empty-state-title @title="No {{pluralize options.item}} in this backend" @titleTag="h2" />
           <A.Body
             data-test-empty-state-message
             @text="{{concat
@@ -151,6 +152,7 @@
               (concat "No " (pluralize options.item) ' under "' this.filter '".')
               (concat 'No folders matching "' this.filter '".')
             }}
+            @titleTag="h2"
           />
           <A.Body>
             <LinkTo @route="vault.cluster.secrets.backend.list-root" @model={{this.backend}} data-test-list-root-link>
@@ -163,6 +165,7 @@
           <A.Header
             data-test-empty-state-title
             @title={{concat "No " (pluralize options.item) ' matching "' this.filter '".'}}
+            @titleTag="h2"
           />
           <A.Body>
             <LinkTo @route="vault.cluster.secrets.backend.list-root" @model={{this.backend}} data-test-list-root-link>
diff --git a/ui/app/templates/vault/cluster/secrets/backend/overview.hbs b/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
index 37de47a989..3702666037 100644
--- a/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backend/overview.hbs
@@ -9,7 +9,7 @@
   <div class="box is-fullwidth is-shadowless is-sideless is-paddingless is-marginless">
     <Toolbar />
     <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
-      <A.Header data-test-empty-state-title @title="Connect a database" />
+      <A.Header data-test-empty-state-title @title="Connect a database" @titleTag="h2" />
       <A.Body data-test-empty-state-message @text={{this.emptyStateMessage}} />
       {{#if (or this.model.connectionCapabilities.canCreate this.model.connectionCapabilities.canUpdate)}}
         <A.Footer data-test-empty-state-actions as |F|>
diff --git a/ui/app/templates/vault/cluster/tools/tool.hbs b/ui/app/templates/vault/cluster/tools/tool.hbs
index 0214001204..14c3d754d2 100644
--- a/ui/app/templates/vault/cluster/tools/tool.hbs
+++ b/ui/app/templates/vault/cluster/tools/tool.hbs
@@ -16,7 +16,7 @@
 {{else if (eq this.selectedAction "wrap")}}
   <Tools::Wrap />
 {{else}}
-  {{! Center-align error message on the page }}
+  {{! This center aligns error message on the page }}
   <div class="is-flex is-flex-grow-1">
     <Hds::ApplicationState @align="center" class="align-self-center" as |A|>
       <A.Header @title="Tool not available" @titleTag="h2" />
diff --git a/ui/lib/core/addon/components/replication-secondary-card.hbs b/ui/lib/core/addon/components/replication-secondary-card.hbs
index 3ba1523d3a..a2c741e565 100644
--- a/ui/lib/core/addon/components/replication-secondary-card.hbs
+++ b/ui/lib/core/addon/components/replication-secondary-card.hbs
@@ -101,7 +101,7 @@
     <div class="grid-item-third-row">
       {{#if (is-empty this.knownPrimaryClusterAddrs)}}
         <Hds::ApplicationState @align="center" data-test-empty-state as |A|>
-          <A.Header @title="No known_primary_cluster_addrs" />
+          <A.Header @title="No known_primary_cluster_addrs" @titleTag="h2" />
           <A.Body
             @text="These addresses are used by the secondary to communicate with the primary cluster. Should always be non-zero in a functioning replication setup."
           />
diff --git a/ui/lib/replication/addon/components/known-secondaries-card.hbs b/ui/lib/replication/addon/components/known-secondaries-card.hbs
index 09a2700b9e..61c21b7e2e 100644
--- a/ui/lib/replication/addon/components/known-secondaries-card.hbs
+++ b/ui/lib/replication/addon/components/known-secondaries-card.hbs
@@ -17,9 +17,10 @@
     {{#if this.replicationAttrs.secondaries}}
       <KnownSecondariesTable @secondaries={{this.replicationAttrs.secondaries}} />
     {{else}}
-      <Hds::ApplicationState @align="center" as |A|>
+      <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
         <A.Header
           @title="No known {{this.cluster.replicationMode}} secondary clusters associated with this cluster"
+          @titleTag="h2"
           data-test-empty-state-title
         />
         <A.Body
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
index 4274556f04..856a453147 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs
@@ -57,17 +57,18 @@
       <hr class="is-marginless" />
     {{/each}}
   {{else}}
-    <EmptyState
-      @title="No known {{this.performanceMode}} secondary clusters associated with this cluster"
-      @message="Associated secondary clusters will be listed here. Add your first secondary cluster to get started."
-    >
-      <Hds::Link::Standalone
-        @icon="docs-link"
-        @iconPosition="trailing"
-        @text="Replication documentation"
-        @href={{doc-link "/vault/docs/internals/replication"}}
-      />
-    </EmptyState>
+    <Hds::ApplicationState @align="center" class="top-padding-32" as |A|>
+      <A.Header @title="No known {{this.performanceMode}} secondary clusters associated with this cluster" @titleTag="h2" />
+      <A.Body @text="Associated secondary clusters will be listed here. Add your first secondary cluster to get started." />
+      <A.Footer as |F|>
+        <F.LinkStandalone
+          @icon="docs-link"
+          @iconPosition="trailing"
+          @text="Replication documentation"
+          @href={{doc-link "/vault/docs/internals/replication"}}
+        />
+      </A.Footer>
+    </Hds::ApplicationState>
   {{/if}}
 {{/if}}