diff --git a/ui/app/components/dashboard/quick-actions-card.hbs b/ui/app/components/dashboard/quick-actions-card.hbs
index 9b1f67090d..5928a0ab4c 100644
--- a/ui/app/components/dashboard/quick-actions-card.hbs
+++ b/ui/app/components/dashboard/quick-actions-card.hbs
@@ -6,7 +6,7 @@
 <Hds::Card::Container @hasBorder={{true}} class="has-padding-l" data-test-card="quick-actions">
   <h2 class="title is-4">Quick actions</h2>
   {{#if this.filteredSecretsEngines}}
-    <div class="has-top-margin-m has-bottom-margin-m">
+    <div class="has-top-margin-m has-bottom-margin-l">
       <Hds::Form::SuperSelect::Single::Field
         @options={{this.filteredSecretsEngines}}
         @selected={{this.selectedEngine}}
@@ -85,25 +85,26 @@
         </div>
       {{/if}}
     {{else}}
-      <EmptyState
-        @title="No mount selected"
-        @message="Select a mount above to get started."
-        data-test-empty-state="no-mount-selected"
-      />
+      <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.Body data-test-empty-state-message @text="Select a mount above to get started." />
+      </Hds::ApplicationState>
     {{/if}}
   {{else}}
-
-    <EmptyState
-      @title="Welcome to quick actions"
-      @message="Access secret engine actions easily. Enable a compatible secret engine (such as database, KV version 2, or PKI) to get started."
-      data-test-empty-state="quick-actions"
-    >
-      <Hds::Link::Standalone
-        @icon="chevron-right"
-        @iconPosition="trailing"
-        @text="Enable a secrets engine"
-        @route="vault.cluster.secrets.enable"
+    <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.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."
       />
-    </EmptyState>
+      <A.Footer data-test-empty-state-actions as |F|>
+        <F.LinkStandalone
+          @icon="chevron-right"
+          @iconPosition="trailing"
+          @text="Enable a secrets engine"
+          @route="vault.cluster.secrets.enable"
+        />
+      </A.Footer>
+    </Hds::ApplicationState>
   {{/if}}
 </Hds::Card::Container>
\ No newline at end of file
diff --git a/ui/app/components/dashboard/replication-card.hbs b/ui/app/components/dashboard/replication-card.hbs
index f5890d535d..84bc2da0c8 100644
--- a/ui/app/components/dashboard/replication-card.hbs
+++ b/ui/app/components/dashboard/replication-card.hbs
@@ -86,18 +86,20 @@
       </small>
     </div>
   {{else}}
-    <EmptyState
-      @title="Replication not set up"
-      @message="Data will be listed here. Enable a primary replication cluster to get started."
-      class="has-top-margin-m"
-      data-test-empty-state="replication"
-    >
-      <Hds::Link::Standalone
-        @icon="chevron-right"
-        @iconPosition="trailing"
-        @text="Enable replication"
-        @route="vault.cluster.replication"
+    <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.Body
+        data-test-empty-state-message
+        @text="Data will be listed here. Enable a primary replication cluster to get started."
       />
-    </EmptyState>
+      <A.Footer data-test-empty-state-actions as |F|>
+        <F.LinkStandalone
+          @icon="chevron-right"
+          @iconPosition="trailing"
+          @text="Enable replication"
+          @route="vault.cluster.replication"
+        />
+      </A.Footer>
+    </Hds::ApplicationState>
   {{/if}}
 </Hds::Card::Container>
\ No newline at end of file
diff --git a/ui/app/components/dashboard/secrets-engines-card.hbs b/ui/app/components/dashboard/secrets-engines-card.hbs
index 2ca10fc077..b8df77eec9 100644
--- a/ui/app/components/dashboard/secrets-engines-card.hbs
+++ b/ui/app/components/dashboard/secrets-engines-card.hbs
@@ -77,18 +77,20 @@
     {{/if}}
 
   {{else}}
-    <EmptyState
-      @title="No secrets engines enabled"
-      @message="Secret engines will be listed here. Enable a secret engine to get started."
-      class="has-top-margin-m"
-      data-test-empty-state="secrets-engines"
-    >
-      <Hds::Link::Standalone
-        @icon="chevron-right"
-        @iconPosition="trailing"
-        @text="Enable a secrets engine"
-        @route="vault.cluster.secrets.enable"
+    <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.Body
+        data-test-empty-state-message
+        @text="Secret engines will be listed here. Enable a secret engine to get started."
       />
-    </EmptyState>
+      <A.Footer data-test-empty-state-actions as |F|>
+        <F.LinkStandalone
+          @icon="chevron-right"
+          @iconPosition="trailing"
+          @text="Enable a secrets engine"
+          @route="vault.cluster.secrets.enable"
+        />
+      </A.Footer>
+    </Hds::ApplicationState>
   {{/if}}
 </Hds::Card::Container>
\ No newline at end of file