From eb9fe573b8689cb5202f06166dca39945e4d6315 Mon Sep 17 00:00:00 2001
From: Cameron Perera <cameron.perera@hashicorp.com>
Date: Thu, 15 May 2025 14:48:27 -0500
Subject: [PATCH] Icu 11937 foundation components retire rose typography styles
 (#2810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 💡 update _typography stylesheet

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 update header margin styles into single rule

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 add remove-header-margin class

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 remove 'header' class

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* test: 💍 fix failing tests for branded-card in desktop

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 update style rule to use :where()

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 rename remove-header-margin to remove-margin

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937

* refactor: 💡 update style comment

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11937
---
 .../tests/dummy/app/templates/smoke-test.hbs  |  2 +-
 addons/rose/addon/styles/hds/overrides.scss   |  6 +++
 addons/rose/app/styles/rose/_typography.scss  | 49 +++----------------
 .../accounts/account/header/index.hbs         |  2 +-
 .../auth-methods/auth-method/header/index.hbs |  2 +-
 .../managed-group/header/index.hbs            |  2 +-
 .../credential-store/header/index.hbs         |  2 +-
 .../components/form/account/ldap/index.hbs    |  8 ++-
 .../form/auth-method/ldap/index.hbs           | 40 +++++++++++++--
 .../form/scope/add-storage-policy/create.hbs  |  7 +--
 .../form/worker/create-worker-led/index.hbs   | 21 ++------
 .../components/groups/group/header/index.hbs  |  2 +-
 .../host-catalog/header/index.hbs             |  2 +-
 .../host-set/add-hosts/header/index.hbs       |  2 +-
 .../create-and-add-host/header/index.hbs      |  2 +-
 .../host-sets/host-set/header/index.hbs       |  2 +-
 .../host-set/hosts/host/header/index.hbs      |  2 +-
 .../host-sets/new/header/index.hbs            |  2 +-
 .../host-catalog/hosts/host/header/index.hbs  |  2 +-
 .../host-catalog/hosts/new/header/index.hbs   |  2 +-
 .../components/roles/role/header/index.hbs    |  2 +-
 .../targets/target/header/index.hbs           |  2 +-
 .../components/users/user/header/index.hbs    |  2 +-
 .../workers/worker/header/index.hbs           |  2 +-
 ui/admin/app/styles/app.scss                  |  5 --
 .../app/templates/account/change-password.hbs |  9 ++--
 ui/admin/app/templates/index.hbs              |  6 ++-
 ui/admin/app/templates/onboarding/index.hbs   |  9 ++--
 ui/admin/app/templates/onboarding/success.hbs | 29 ++++++-----
 .../scope/add-storage-policy/create.hbs       |  7 +--
 .../scopes/scope/add-storage-policy/index.hbs |  7 +--
 .../scopes/scope/aliases/alias/index.hbs      |  7 +--
 .../templates/scopes/scope/aliases/index.hbs  |  7 +--
 .../templates/scopes/scope/aliases/new.hbs    |  7 +--
 .../accounts/account/set-password.hbs         |  9 ++--
 .../auth-methods/auth-method/accounts/new.hbs |  7 +--
 .../auth-method/managed-groups/new.hbs        |  7 +--
 .../scopes/scope/auth-methods/index.hbs       |  7 +--
 .../scopes/scope/auth-methods/new.hbs         |  7 +--
 .../templates/scopes/scope/authenticate.hbs   |  9 ++--
 .../credential-library/index.hbs              |  7 +--
 .../credential-libraries/new.hbs              |  7 +--
 .../credentials/credential/index.hbs          |  7 +--
 .../credential-store/credentials/new.hbs      |  7 +--
 .../credential-store/edit-worker-filter.hbs   |  2 +-
 .../scopes/scope/credential-stores/index.hbs  |  7 +--
 .../scopes/scope/credential-stores/new.hbs    |  7 +--
 ui/admin/app/templates/scopes/scope/edit.hbs  | 23 ++-------
 .../scopes/scope/groups/group/add-members.hbs |  7 +--
 .../templates/scopes/scope/groups/index.hbs   |  7 +--
 .../app/templates/scopes/scope/groups/new.hbs |  7 +--
 .../scopes/scope/host-catalogs/index.hbs      |  7 +--
 .../scopes/scope/host-catalogs/new.hbs        |  7 +--
 .../templates/scopes/scope/policies/index.hbs |  7 +--
 .../templates/scopes/scope/policies/new.hbs   |  7 +--
 .../scopes/scope/policies/policy/index.hbs    |  7 +--
 .../templates/scopes/scope/roles/index.hbs    |  7 +--
 .../app/templates/scopes/scope/roles/new.hbs  |  7 +--
 .../scope/roles/role/add-principals.hbs       |  7 +--
 .../scopes/scope/roles/role/grants.hbs        |  7 +--
 .../scope/roles/role/manage-scopes/index.hbs  |  7 +--
 .../manage-scopes/manage-custom-scopes.hbs    |  7 +--
 .../manage-scopes/manage-org-projects.hbs     |  7 +--
 .../scopes/scope/roles/role/principals.hbs    |  7 +--
 .../scopes/scope/roles/role/scopes.hbs        |  7 +--
 .../templates/scopes/scope/scopes/index.hbs   | 14 +-----
 .../app/templates/scopes/scope/scopes/new.hbs | 14 +-----
 .../scopes/scope/session-recordings/index.hbs |  9 ++--
 .../channels-by-connection/channel.hbs        | 23 ++-------
 .../channels-by-connection/index.hbs          | 27 ++++------
 .../templates/scopes/scope/sessions/index.hbs |  7 +--
 .../scopes/scope/storage-buckets/index.hbs    |  7 +--
 .../scopes/scope/storage-buckets/new.hbs      |  7 +--
 .../storage-buckets/storage-bucket/index.hbs  |  7 +--
 .../templates/scopes/scope/targets/index.hbs  |  7 +--
 .../templates/scopes/scope/targets/new.hbs    |  7 +--
 .../add-brokered-credential-sources.hbs       |  7 +--
 .../scope/targets/target/add-host-sources.hbs |  7 +--
 ...njected-application-credential-sources.hbs |  7 +--
 .../scope/targets/target/create-alias.hbs     |  7 +--
 .../target/edit-egress-worker-filter.hbs      |  7 +--
 .../target/edit-ingress-worker-filter.hbs     |  7 +--
 .../create-storage-bucket.hbs                 |  7 +--
 .../target/enable-session-recording/index.hbs |  9 ++--
 .../scopes/scope/targets/target/index.hbs     |  6 +--
 .../scope/targets/target/manage-alias.hbs     |  7 +--
 .../templates/scopes/scope/users/index.hbs    |  7 +--
 .../app/templates/scopes/scope/users/new.hbs  |  7 +--
 .../scopes/scope/users/user/add-accounts.hbs  |  9 ++--
 .../templates/scopes/scope/workers/index.hbs  |  7 +--
 .../templates/scopes/scope/workers/new.hbs    |  7 +--
 .../scope/workers/worker/create-tags.hbs      |  7 +--
 .../app/components/branded-card/index.hbs     |  6 +--
 .../app/components/settings-card/index.hbs    |  2 +-
 ui/desktop/app/styles/app.scss                | 10 ----
 .../scopes/scope/projects/sessions.hbs        |  7 +--
 .../scope/projects/sessions/session.hbs       |  2 +-
 .../scopes/scope/projects/settings.hbs        |  7 +--
 .../scopes/scope/projects/targets.hbs         |  7 +--
 .../scopes/scope/projects/targets/target.hbs  |  6 ++-
 .../components/branded-card-test.js           | 17 +++----
 101 files changed, 217 insertions(+), 583 deletions(-)

diff --git a/addons/core/tests/dummy/app/templates/smoke-test.hbs b/addons/core/tests/dummy/app/templates/smoke-test.hbs
index 25594f66b..918b8d17a 100644
--- a/addons/core/tests/dummy/app/templates/smoke-test.hbs
+++ b/addons/core/tests/dummy/app/templates/smoke-test.hbs
@@ -9,7 +9,7 @@
   Ember can start up and basic features work as intended.
 </Hds::Text::Body>
 
-<Hds::Text::Display @tag='h2'>{{t
+<Hds::Text::Display @tag='h2' class='remove-margin'>{{t
     'resources.account.title'
   }}</Hds::Text::Display>
 <Hds::Text::Body @tag='p'>{{t
diff --git a/addons/rose/addon/styles/hds/overrides.scss b/addons/rose/addon/styles/hds/overrides.scss
index b6fb09825..f21fb9c7c 100644
--- a/addons/rose/addon/styles/hds/overrides.scss
+++ b/addons/rose/addon/styles/hds/overrides.scss
@@ -3,6 +3,12 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
+// header margin override (HDS leaves this to implementers)
+:where(h1, h2, h3, h4, h5, h6)[class*='hds-typography-display-'] {
+  margin-top: 1rem;
+  margin-bottom: 0.5rem;
+}
+
 // field and button bottom margin (HDS leaves this to implementers)
 form {
   [class*='hds-form-field--layout'],
diff --git a/addons/rose/app/styles/rose/_typography.scss b/addons/rose/app/styles/rose/_typography.scss
index 0d40c22b8..985141d54 100644
--- a/addons/rose/app/styles/rose/_typography.scss
+++ b/addons/rose/app/styles/rose/_typography.scss
@@ -12,60 +12,27 @@ html {
 }
 
 body {
+  // Used by Rose::Tabs and '/' in breadcrumbs
+  // and link list panel
   font-family: typography.$family-primary;
 
-  // This is the only time we'll explicitly use pixels.  All other sizes are
-  // expressed in rem units.
-  font-size: typography.$base-font-size * 1px;
+  // these 3 are used across the app
   line-height: typography.line-height(m);
   color: var(--stark);
   background-color: var(--subtle);
 }
 
-input,
-textarea,
-button {
-  font-family: typography.$family-primary;
+// Many elements get margin by default
+// but if we want to remove it we can use this class
+.remove-margin {
+  margin: 0;
 }
 
-pre,
-code {
-  font-family: typography.$family-monospace;
-}
-
-h1,
-.h1 {
-  @include type-mixins.type(h1, bold);
-
-  margin-top: sizing.rems(m);
-  margin-bottom: sizing.rems(xs);
-}
-
-h2,
-.h2 {
-  @include type-mixins.type(h2, bold);
-
-  margin-top: sizing.rems(m);
-  margin-bottom: sizing.rems(xs);
-}
-
-h3,
-.h3 {
-  @include type-mixins.type(h3, bold);
-
-  margin-top: sizing.rems(m);
-  margin-bottom: sizing.rems(xs);
-}
-
-p,
 .p {
   margin-bottom: sizing.rems(m);
 }
 
+// once we move to Hds::Link::Standalone we can remove this
 a {
   color: var(--action);
 }
-
-time {
-  font-variant-numeric: tabular-nums;
-}
diff --git a/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs
index b3e075a1e..0a823bfc4 100644
--- a/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.account.title'}}
   <DocLink @doc='account' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
index 52b3a2515..8001fea5c 100644
--- a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.auth-method.title'}}
   {{#if @model.isPrimary}}
     &nbsp;
diff --git a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs
index ac4bcec50..9fef5798b 100644
--- a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.managed-group.title'}}
   <DocLink @doc='managed-groups' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/credential-stores/credential-store/header/index.hbs b/ui/admin/app/components/credential-stores/credential-store/header/index.hbs
index 1083631ea..ced2e1a74 100644
--- a/ui/admin/app/components/credential-stores/credential-store/header/index.hbs
+++ b/ui/admin/app/components/credential-stores/credential-store/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.credential-store.title'}}
   <DocLink @doc='credential-store' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/form/account/ldap/index.hbs b/ui/admin/app/components/form/account/ldap/index.hbs
index f94683655..fcd25ed03 100644
--- a/ui/admin/app/components/form/account/ldap/index.hbs
+++ b/ui/admin/app/components/form/account/ldap/index.hbs
@@ -79,7 +79,13 @@
 
       <F.Control>
         <div class='ldap-section'>
-          <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+          <Hds::Text::Display
+            @tag='h3'
+            @size='300'
+            @weight='bold'
+            class='remove-margin'
+          >
+            {{t 'resources.account.title'}}
             {{t 'form.other_fields.label'}}
           </Hds::Text::Display>
           <Hds::Form::HelperText @controlId='helper-text-for-section'>{{t
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs
index 3803389ba..64c37679d 100644
--- a/ui/admin/app/components/form/auth-method/ldap/index.hbs
+++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs
@@ -47,7 +47,13 @@
   </Hds::Form::Textarea::Field>
 
   <div class='ldap-section'>
-    <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+    <Hds::Text::Display
+      @tag='h3'
+      @size='300'
+      @weight='bold'
+      class='remove-margin'
+    >
+      {{t 'resources.account.title'}}
       {{t 'resources.auth-method.section.connection.title'}}
     </Hds::Text::Display>
     <Hds::Form::HelperText @controlId='for-connection'>{{t
@@ -215,7 +221,13 @@
   </Hds::Form::Toggle::Field>
 
   <div class='ldap-section'>
-    <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+    <Hds::Text::Display
+      @tag='h3'
+      @size='300'
+      @weight='bold'
+      class='remove-margin'
+    >
+      {{t 'resources.account.title'}}
       {{t 'resources.auth-method.section.authenticated-search.title'}}
     </Hds::Text::Display>
     <Hds::Form::HelperText @controlId='for-authenticated-search'>{{t
@@ -294,7 +306,13 @@
   </Hds::Form::TextInput::Field>
 
   <div class='ldap-section'>
-    <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+    <Hds::Text::Display
+      @tag='h3'
+      @size='300'
+      @weight='bold'
+      class='remove-margin'
+    >
+      {{t 'resources.account.title'}}
       {{t 'resources.auth-method.section.anonymous-search.title'}}
     </Hds::Text::Display>
     <Hds::Form::HelperText @controlId='for-anonymous-search'>{{t
@@ -331,7 +349,13 @@
   </Hds::Form::Toggle::Field>
 
   <div class='ldap-section'>
-    <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+    <Hds::Text::Display
+      @tag='h3'
+      @size='300'
+      @weight='bold'
+      class='remove-margin'
+    >
+      {{t 'resources.account.title'}}
       {{t 'resources.auth-method.section.user-entries.title'}}
     </Hds::Text::Display>
     <Hds::Form::HelperText @controlId='for-user-entries'>{{t
@@ -423,7 +447,13 @@
   </Form::Field::ListWrapper>
 
   <div class='ldap-section'>
-    <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
+    <Hds::Text::Display
+      @tag='h3'
+      @size='300'
+      @weight='bold'
+      class='remove-margin'
+    >
+      {{t 'resources.account.title'}}
       {{t 'resources.auth-method.section.group-entries.title'}}
     </Hds::Text::Display>
     <Hds::Form::HelperText @controlId='for-group-entries'>{{t
diff --git a/ui/admin/app/components/form/scope/add-storage-policy/create.hbs b/ui/admin/app/components/form/scope/add-storage-policy/create.hbs
index dd18c57cc..988ccec35 100644
--- a/ui/admin/app/components/form/scope/add-storage-policy/create.hbs
+++ b/ui/admin/app/components/form/scope/add-storage-policy/create.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.titles.new'}}</Hds::Text::Display>
   </page.header>
 
diff --git a/ui/admin/app/components/form/worker/create-worker-led/index.hbs b/ui/admin/app/components/form/worker/create-worker-led/index.hbs
index b9907975a..6f9806e7c 100644
--- a/ui/admin/app/components/form/worker/create-worker-led/index.hbs
+++ b/ui/admin/app/components/form/worker/create-worker-led/index.hbs
@@ -9,12 +9,7 @@
   @showEditToggle={{false}}
   as |form|
 >
-  <Hds::Text::Display
-    @tag='h3'
-    @size='300'
-    @weight='bold'
-    class='header-spacing'
-  >
+  <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
     {{t 'resources.worker.form.steps.1.title'}}
   </Hds::Text::Display>
   <div class='worker-create-section'>
@@ -186,12 +181,7 @@
     </Hds::Text::Body>
   </div>
 
-  <Hds::Text::Display
-    @tag='h3'
-    @size='300'
-    @weight='bold'
-    class='header-spacing'
-  >
+  <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
     {{t 'resources.worker.form.steps.2.title'}}
   </Hds::Text::Display>
   <div class='worker-create-section'>
@@ -216,12 +206,7 @@
     </Hds::Text::Body>
   </div>
 
-  <Hds::Text::Display
-    @tag='h3'
-    @size='300'
-    @weight='bold'
-    class='header-spacing'
-  >
+  <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>
     {{t 'resources.worker.form.steps.3.title'}}
   </Hds::Text::Display>
   <div class='worker-create-section'>
diff --git a/ui/admin/app/components/groups/group/header/index.hbs b/ui/admin/app/components/groups/group/header/index.hbs
index e8338b092..846d61991 100644
--- a/ui/admin/app/components/groups/group/header/index.hbs
+++ b/ui/admin/app/components/groups/group/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.group.title'}}
   <DocLink @doc='group' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs
index dfaafa78d..68773f2fd 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host-catalog.title'}}
   <DocLink @doc='host-catalog' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs
index e03f1ea2e..bd46567b1 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host-set.host.messages.add.title'}}
   <DocLink @doc='host-set.add-hosts' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs
index 038b6bf97..620f67fdd 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host-set.actions.create-and-add-host'}}
   <DocLink @doc='host.new' />
 </Hds::Text::Display>
\ No newline at end of file
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs
index c33d13eab..8394140fb 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host-set.title'}}
   <DocLink @doc='host-set' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/hosts/host/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/hosts/host/header/index.hbs
index 97c164c47..7c08bac6c 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/hosts/host/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/hosts/host/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host.title'}}
   <DocLink @doc='host' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs
index 95fe4a273..fe3ad3970 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host-set.titles.new'}}
   <DocLink @doc='host-set.new' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs
index 97c164c47..7c08bac6c 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host.title'}}
   <DocLink @doc='host' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs
index acd256ae6..75ab9cfb7 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.host.titles.new'}}
   <DocLink @doc='host.new' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/roles/role/header/index.hbs b/ui/admin/app/components/roles/role/header/index.hbs
index a155fce26..4d1863b64 100644
--- a/ui/admin/app/components/roles/role/header/index.hbs
+++ b/ui/admin/app/components/roles/role/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.role.title'}}
   <DocLink @doc='role' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/targets/target/header/index.hbs b/ui/admin/app/components/targets/target/header/index.hbs
index ae338963d..c86f0be15 100644
--- a/ui/admin/app/components/targets/target/header/index.hbs
+++ b/ui/admin/app/components/targets/target/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.target.title'}}
   <DocLink @doc='target' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/users/user/header/index.hbs b/ui/admin/app/components/users/user/header/index.hbs
index 71cef6d2b..a101c9b8c 100644
--- a/ui/admin/app/components/users/user/header/index.hbs
+++ b/ui/admin/app/components/users/user/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.user.title'}}
   <DocLink @doc='user' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/components/workers/worker/header/index.hbs b/ui/admin/app/components/workers/worker/header/index.hbs
index 7fb614487..3b582292c 100644
--- a/ui/admin/app/components/workers/worker/header/index.hbs
+++ b/ui/admin/app/components/workers/worker/header/index.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
+<Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
   {{t 'resources.worker.title'}}
   <DocLink @doc='worker' />
 </Hds::Text::Display>
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index e69ed09f4..4cdb61704 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -1031,11 +1031,6 @@
   }
 }
 
-.header-spacing {
-  margin-top: 1rem;
-  margin-bottom: 0.5rem;
-}
-
 // scope picker
 .scope-picker {
   &__toggle-button {
diff --git a/ui/admin/app/templates/account/change-password.hbs b/ui/admin/app/templates/account/change-password.hbs
index 0a922f3b6..4962a0150 100644
--- a/ui/admin/app/templates/account/change-password.hbs
+++ b/ui/admin/app/templates/account/change-password.hbs
@@ -12,12 +12,9 @@
       <Rose::Frame>
         <:header>
           <Hds::Icon @name='boundary-color' @size='24' @isInline={{true}} />
-          <Hds::Text::Display
-            @tag='h2'
-            @size='400'
-            @weight='bold'
-            class='header-spacing'
-          >{{t 'actions.change-password'}}</Hds::Text::Display>
+          <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+              'actions.change-password'
+            }}</Hds::Text::Display>
         </:header>
         <:body>
           <Form::Account::Password::ChangePassword
diff --git a/ui/admin/app/templates/index.hbs b/ui/admin/app/templates/index.hbs
index 87efac1c4..471ba5302 100644
--- a/ui/admin/app/templates/index.hbs
+++ b/ui/admin/app/templates/index.hbs
@@ -3,4 +3,8 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::Text::Display @tag='h1' @size='400'>{{app-name}}</Hds::Text::Display>
\ No newline at end of file
+<Hds::Text::Display
+  @tag='h1'
+  @size='400'
+  class='remove-margin'
+>{{app-name}}</Hds::Text::Display>
\ No newline at end of file
diff --git a/ui/admin/app/templates/onboarding/index.hbs b/ui/admin/app/templates/onboarding/index.hbs
index f0d1bc38f..3f5f3bc17 100644
--- a/ui/admin/app/templates/onboarding/index.hbs
+++ b/ui/admin/app/templates/onboarding/index.hbs
@@ -7,12 +7,9 @@
   <Rose::Frame class='create-resources'>
     <:header>
       <Hds::Icon @name='boundary-color' @size='24' @isInline={{true}} />
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >{{t 'onboarding.add-target.titles.have-a-target'}}</Hds::Text::Display>
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+          'onboarding.add-target.titles.have-a-target'
+        }}</Hds::Text::Display>
     </:header>
     <:body>
       <Hds::Text::Body @tag='p'>
diff --git a/ui/admin/app/templates/onboarding/success.hbs b/ui/admin/app/templates/onboarding/success.hbs
index 259a5a9c4..1c2829e8b 100644
--- a/ui/admin/app/templates/onboarding/success.hbs
+++ b/ui/admin/app/templates/onboarding/success.hbs
@@ -9,12 +9,9 @@
   <Rose::Frame class='create-resources'>
     <:header>
       <Hds::Icon @name='boundary-color' @size='24' @isInline={{true}} />
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >{{t 'onboarding.success.titles.connect'}}</Hds::Text::Display>
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+          'onboarding.success.titles.connect'
+        }}</Hds::Text::Display>
     </:header>
     <:body>
       {{! We have created }}
@@ -26,7 +23,12 @@
             class='hds-foreground-success'
             @isInline={{true}}
           />
-          <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>{{t
+          <Hds::Text::Display
+            @tag='h3'
+            @size='300'
+            @weight='bold'
+            class='remove-margin'
+          >{{t
               'onboarding.success.titles.creation-success'
             }}</Hds::Text::Display>
         </span>
@@ -38,9 +40,12 @@
       {{! Download Desktop client }}
       <div class='create-resources-item'>
         <span class='create-resources-item-header'>
-          <Hds::Text::Display @tag='h3' @size='300' @weight='bold'>{{t
-              'onboarding.success.titles.desktop'
-            }}</Hds::Text::Display>
+          <Hds::Text::Display
+            @tag='h3'
+            @size='300'
+            @weight='bold'
+            class='remove-margin'
+          >{{t 'onboarding.success.titles.desktop'}}</Hds::Text::Display>
         </span>
         <Hds::Text::Body @tag='p'>
           {{t 'onboarding.success.descriptions.download'}}
@@ -62,7 +67,7 @@
 
         {{! Controller }}
         <div class='create-resources-item-controller'>
-          <Hds::Text::Display @tag='h4'>
+          <Hds::Text::Display @tag='h4' class='remove-margin'>
             {{t 'onboarding.success.titles.controller'}}
           </Hds::Text::Display>
           <Hds::Text::Body @color='faint'>{{t
@@ -78,7 +83,7 @@
 
       {{! Developers }}
       <div class='create-resources-item'>
-        <Hds::Text::Display @tag='h4'>
+        <Hds::Text::Display @tag='h4' class='remove-margin'>
           {{t 'onboarding.success.titles.developers'}}
         </Hds::Text::Display>
         <Hds::Text::Body @tag='p'>
diff --git a/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs b/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs
index 734362e39..5f4b00052 100644
--- a/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs
+++ b/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.titles.new'}}
       <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs b/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs
index ae358094b..802cbebc4 100644
--- a/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs
@@ -14,12 +14,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.actions.add'}}
       <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
index 0cbe5ad06..1e69c38ec 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
@@ -8,12 +8,7 @@
     <Breadcrumbs::Container />
   </page.breadcrumbs>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.alias.title'}}
       <DocLink @doc='alias' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/aliases/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
index 681d6f9db..8e177326c 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.alias.title_plural'}}
       <DocLink @doc='alias' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/aliases/new.hbs b/ui/admin/app/templates/scopes/scope/aliases/new.hbs
index 839226985..29beba4b6 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/new.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.alias.titles.new'}}
       <DocLink @doc='alias' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
index 767b97923..788560943 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
@@ -16,12 +16,9 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >{{t 'resources.account.title'}}</Hds::Text::Display>
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+        'resources.account.title'
+      }}</Hds::Text::Display>
     <Hds::Text::Body @tag='p' @size='300' class='p'>
       {{t 'resources.account.messages.set-password.description'}}
     </Hds::Text::Body>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
index a1d74ade2..3d8f7e969 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.account.titles.new'}}
       <DocLink @doc='account.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
index 8a5134a0e..937a52e70 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.managed-group.titles.new'}}
       <DocLink @doc='managed-groups' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index d94e4311d..0c4d9c34a 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -5,12 +5,7 @@
 
 <Rose::Layout::Page as |page|>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.auth-method.title_plural'}}
       <DocLink @doc='auth-method' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
index 83e5f873f..9c5527db6 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
@@ -11,12 +11,7 @@
 
 <Rose::Layout::Page as |page|>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.auth-method.titles.new'}}
       <DocLink @doc='auth-method' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs
index 482d5519e..ff9b9142d 100644
--- a/ui/admin/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs
@@ -16,12 +16,9 @@
         <Rose::Frame>
           <:header>
             <Hds::Icon @name='boundary-color' @size='24' @isInline={{true}} />
-            <Hds::Text::Display
-              @tag='h2'
-              @size='400'
-              @weight='bold'
-              class='header-spacing'
-            >{{t 'actions.authenticate'}}</Hds::Text::Display>
+            <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+                'actions.authenticate'
+              }}</Hds::Text::Display>
           </:header>
           <:body>
             <Hds::Text::Body @tag='p'>{{t
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
index fb0798be3..b128582fd 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential-library.title'}}
       <DocLink @doc='credential-library' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
index 6bc8cb3a9..613cb9900 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential-library.titles.new'}}
       <DocLink @doc='credential-library' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
index cd0e5392c..86d6b0552 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential.title'}}
       <DocLink @doc='credential' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
index 1fa2dc5a3..2a061029a 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential.titles.new'}}
       <DocLink @doc='credential' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs
index 29aefb703..1ccd8e74d 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs
@@ -15,7 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display @tag='h2' @size='300' class='h2'>
+    <Hds::Text::Display @tag='h2' @size='300'>
       {{t 'actions.edit-worker-filter'}}
       <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
index 7cd844d19..b846363be 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential-store.title_plural'}}
       <DocLink @doc='credential-store' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
index a696ebcef..f75d39f4e 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.credential-store.titles.new'}}
       <DocLink @doc='credential-store' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index a1282175d..4a9df5175 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -21,12 +21,7 @@
 
   <page.header>
     {{#if @model.isGlobal}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.global.title'}}
         <DocLink @doc='global' />
       </Hds::Text::Display>
@@ -35,12 +30,7 @@
       </Hds::Text::Body>
     {{/if}}
     {{#if @model.isOrg}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.org.title'}}
         <DocLink @doc='org' />
       </Hds::Text::Display>
@@ -49,12 +39,7 @@
       </Hds::Text::Body>
     {{/if}}
     {{#if @model.isProject}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.project.title'}}
         <DocLink @doc='project' />
       </Hds::Text::Display>
@@ -113,7 +98,7 @@
       {{#if (can 'attachStoragePolicy scope' @model)}}
         <bc.Sidebar>
           <div class='policy-sidebar'>
-            <Hds::Text::Display @tag='h3'>
+            <Hds::Text::Display @tag='h3' class='remove-margin'>
               {{t 'resources.policy.title'}}
             </Hds::Text::Display>
 
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
index 0c5c42498..8efc08bb4 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.group.messages.add-members.title'}}
       <DocLink @doc='group.add-members' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs
index 9678fbfd5..38a992365 100644
--- a/ui/admin/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.group.title_plural'}}
       <DocLink @doc='group' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/groups/new.hbs b/ui/admin/app/templates/scopes/scope/groups/new.hbs
index f9a4f4ddb..455749ba6 100644
--- a/ui/admin/app/templates/scopes/scope/groups/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.group.titles.new'}}
       <DocLink @doc='group' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
index 695e9586b..86ec12589 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.host-catalog.title_plural'}}
       <DocLink @doc='host-catalog' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index b287d5b67..ff84dcc89 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.host-catalog.titles.new'}}
       <DocLink @doc='host-catalog.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/policies/index.hbs b/ui/admin/app/templates/scopes/scope/policies/index.hbs
index d7f0c387a..3d4375e64 100644
--- a/ui/admin/app/templates/scopes/scope/policies/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/index.hbs
@@ -8,12 +8,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.title_plural'}}
       <DocLink @doc='storage-policy' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/policies/new.hbs b/ui/admin/app/templates/scopes/scope/policies/new.hbs
index 4d199534a..520e95689 100644
--- a/ui/admin/app/templates/scopes/scope/policies/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/new.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.titles.new'}}
       <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs b/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs
index 6b6174802..4e7ef07d7 100644
--- a/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.policy.title'}}
       <DocLink @doc='storage-policy' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs
index da4f7c90e..ae18713e6 100644
--- a/ui/admin/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.title_plural'}}
       <DocLink @doc='role' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/new.hbs b/ui/admin/app/templates/scopes/scope/roles/new.hbs
index 0aedfbaf2..100a778a0 100644
--- a/ui/admin/app/templates/scopes/scope/roles/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/new.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.titles.new'}}
       <DocLink @doc='role' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
index 271e3da44..6032974b7 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.principal.messages.add-principals.title'}}
       <DocLink @doc='role.add-principals' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
index bb50a2753..73a5dcd1f 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.title'}}
       <DocLink @doc='role' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs
index d770e9b3c..de6ea44ec 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.scope.messages.manage-scopes.title'}}
       <DocLink @doc='role.add-grant-scopes' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs
index 2bf1d5ac7..284baca6b 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.scope.messages.manage-custom-scopes.title'}}
       <DocLink @doc='role.add-grant-scopes' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs
index 6c6736b62..142395313 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs
@@ -31,12 +31,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t
         'resources.role.scope.messages.manage-org-projects.title'
         orgDisplayName=@model.orgScope.displayName
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
index 1bd1c6b60..88d216b1b 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.title'}}
       <DocLink @doc='role' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs b/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs
index 8c1be4aa1..fcad9ef76 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.role.title'}}
       <DocLink @doc='role' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
index ad1fcde1b..c234fea68 100644
--- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
@@ -11,12 +11,7 @@
 
   <page.header>
     {{#if @model.currentScope.isGlobal}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.org.title_plural'}}
         <DocLink @doc='org' />
       </Hds::Text::Display>
@@ -26,12 +21,7 @@
         </Hds::Text::Body>
       {{/if}}
     {{else if @model.currentScope.isOrg}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.project.title_plural'}}
         <DocLink @doc='project' />
       </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/scopes/new.hbs b/ui/admin/app/templates/scopes/scope/scopes/new.hbs
index 564f0b221..316d80bf8 100644
--- a/ui/admin/app/templates/scopes/scope/scopes/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/scopes/new.hbs
@@ -24,12 +24,7 @@
 
   <page.header>
     {{#if @model.isOrg}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.org.titles.new'}}
         <DocLink @doc='org.new' />
       </Hds::Text::Display>
@@ -37,12 +32,7 @@
         {{t 'resources.org.description'}}
       </Hds::Text::Body>
     {{else if @model.isProject}}
-      <Hds::Text::Display
-        @tag='h2'
-        @size='400'
-        @weight='bold'
-        class='header-spacing'
-      >
+      <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
         {{t 'resources.project.titles.new'}}
         <DocLink @doc='project.new' />
       </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs
index 307adb887..84942ac4e 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs
@@ -9,12 +9,9 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >{{t 'resources.session-recording.title_plural'}}
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+        'resources.session-recording.title_plural'
+      }}
       <DocLink @doc='session-recording' />
     </Hds::Text::Display>
     <Hds::Text::Body @tag='p' @size='300' class='p'>
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
index a74bfec1d..419457e4e 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
@@ -19,12 +19,7 @@
   </page.breadcrumbs>
 
   <page.header class='channel-header'>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{reverse-indexed-display-name
         'resources.session-recording.channel.title_index'
         @model.channelRecording.connection_recording.channel_recordings
@@ -46,12 +41,7 @@
       <bc.Sidebar>
         {{! Channel details information }}
         <div class='section-details'>
-          <Hds::Text::Display
-            @tag='h2'
-            @size='400'
-            @weight='bold'
-            class='header-spacing'
-          >{{t
+          <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
               'resources.session-recording.channel.details'
             }}</Hds::Text::Display>
           <Rose::MetadataList @orientation='vertical' as |list|>
@@ -100,12 +90,9 @@
 
         {{! Related information }}
         <div>
-          <Hds::Text::Display
-            @tag='h2'
-            @size='400'
-            @weight='bold'
-            class='header-spacing'
-          >{{t 'resources.session-recording.related'}}</Hds::Text::Display>
+          <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+              'resources.session-recording.related'
+            }}</Hds::Text::Display>
           <LinkListPanel as |list|>
             {{! User name }}
             {{#if @model.sessionRecording.create_time_values.user}}
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
index 46754b88a..8b99fcafe 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
@@ -9,12 +9,9 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >{{t 'resources.session-recording.session.title'}}</Hds::Text::Display>
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+        'resources.session-recording.session.title'
+      }}</Hds::Text::Display>
   </page.header>
 
   <page.actions>
@@ -198,12 +195,9 @@
         </bc.Body>
         <bc.Sidebar>
           <div class='section-details'>
-            <Hds::Text::Display
-              @tag='h2'
-              @size='400'
-              @weight='bold'
-              class='header-spacing'
-            >{{t 'resources.session-recording.details'}}</Hds::Text::Display>
+            <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+                'resources.session-recording.details'
+              }}</Hds::Text::Display>
 
             <Rose::MetadataList @orientation='vertical' as |list|>
               {{! Session Recording Status }}
@@ -292,12 +286,9 @@
 
           {{! Related information }}
           <div>
-            <Hds::Text::Display
-              @tag='h2'
-              @size='400'
-              @weight='bold'
-              class='header-spacing'
-            >{{t 'resources.session-recording.related'}}</Hds::Text::Display>
+            <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+                'resources.session-recording.related'
+              }}</Hds::Text::Display>
             <LinkListPanel as |list|>
               {{! User name }}
               {{#if @model.sessionRecording.create_time_values.user}}
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 070d20480..ae91987fd 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.session.title_plural'}}
       <DocLink @doc='session' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
index b7aec77d8..62fa64036 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.storage-bucket.title_plural'}}
       <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs
index 95c853b88..fd61569cf 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.storage-bucket.titles.new'}}
       <DocLink @doc='storage-bucket.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs
index 25c347bfc..29de471a1 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.storage-bucket.title'}}
       <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/index.hbs b/ui/admin/app/templates/scopes/scope/targets/index.hbs
index 1a4110ece..cbeb5d9d5 100644
--- a/ui/admin/app/templates/scopes/scope/targets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/index.hbs
@@ -9,12 +9,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.title_plural'}}
       <DocLink @doc='target' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/new.hbs b/ui/admin/app/templates/scopes/scope/targets/new.hbs
index 5178f3545..3c202fdfd 100644
--- a/ui/admin/app/templates/scopes/scope/targets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.titles.new'}}
       <DocLink @doc='target.new' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-brokered-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-brokered-credential-sources.hbs
index fb8971ff9..b50328a95 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/add-brokered-credential-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/add-brokered-credential-sources.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.brokered-credential-source.messages.add.title'}}
     </Hds::Text::Display>
     <Hds::Text::Body @tag='p' @size='300' class='p'>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs
index 4bf85fcd1..7dc2181d7 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.host-source.messages.add.title'}}
       <DocLink @doc='target.add-host-sources' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs
index 8701628a0..9b961664b 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs
@@ -19,12 +19,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t
         'resources.target.injected-application-credential-source.messages.add.title'
       }}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs b/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs
index a065fa18e..533811c55 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.alias.titles.new'}}
       <DocLink @doc='alias' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
index 41b6d509d..c01f01fdd 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
@@ -15,12 +15,7 @@
     <Breadcrumbs::Container />
   </page.breadcrumbs>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.workers.edit-egress-worker-filter.title'}}
       <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
index 35bc04d7a..1d174bf91 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.workers.edit-ingress-worker-filter.title'}}
       <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs
index ca612ce81..235ddf6e2 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs
@@ -15,12 +15,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.storage-bucket.titles.new'}}
       <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs
index 632be35cd..817eefa44 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs
@@ -9,12 +9,9 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >{{t 'resources.target.enable-session-recording.messages.add.title'}}
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+        'resources.target.enable-session-recording.messages.add.title'
+      }}
       <DocLink @doc='target.enable-session-recording' />
     </Hds::Text::Display>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
index efd9108ec..4b59015d0 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs
@@ -35,7 +35,7 @@
       <bc.Sidebar>
         {{#if @model.aliases}}
           <div class='target-sidebar-aliases'>
-            <Hds::Text::Display @tag='h3'>
+            <Hds::Text::Display @tag='h3' class='remove-margin'>
               {{t 'resources.alias.title_plural'}}
             </Hds::Text::Display>
             <Hds::Text::Body @tag='p' @color='faint' class='p'>
@@ -93,7 +93,7 @@
         {{else}}
           {{#if (can 'create model' this.globalScope collection='aliases')}}
             <div class='target-sidebar-aliases'>
-              <Hds::Text::Display @tag='h3'>
+              <Hds::Text::Display @tag='h3' class='remove-margin'>
                 {{t 'resources.alias.title_plural'}}
               </Hds::Text::Display>
               <Hds::Text::Body @tag='p' @color='faint' class='p'>
@@ -111,7 +111,7 @@
         {{/if}}
         <div class='target-sidebar'>
           {{#if (and @model.isSSH (feature-flag 'ssh-session-recording'))}}
-            <Hds::Text::Display @tag='h3'>
+            <Hds::Text::Display @tag='h3' class='remove-margin'>
               {{t 'resources.target.form.sidebar.label'}}
             </Hds::Text::Display>
             <Hds::Text::Body @tag='p' @color='faint' class='p'>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs b/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs
index 9435bb29b..c853cd0d4 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs
@@ -13,12 +13,7 @@
     <Breadcrumbs::Container />
   </page.breadcrumbs>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.alias.title'}}
       <DocLink @doc='alias' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs
index 046346b3a..fb80c5888 100644
--- a/ui/admin/app/templates/scopes/scope/users/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.user.title_plural'}}
       <DocLink @doc='user' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/users/new.hbs b/ui/admin/app/templates/scopes/scope/users/new.hbs
index 7859d1eae..88ec1bd09 100644
--- a/ui/admin/app/templates/scopes/scope/users/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.user.titles.new'}}
       <DocLink @doc='user' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
index 6235905dd..445fdd299 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
@@ -16,12 +16,9 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >{{t 'resources.user.messages.add-accounts.title'}}</Hds::Text::Display>
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>{{t
+        'resources.user.messages.add-accounts.title'
+      }}</Hds::Text::Display>
     <Hds::Text::Body @tag='p' @size='300' class='p'>
       {{t 'resources.user.messages.add-accounts.description'}}
     </Hds::Text::Body>
diff --git a/ui/admin/app/templates/scopes/scope/workers/index.hbs b/ui/admin/app/templates/scopes/scope/workers/index.hbs
index 9539eddbc..a8f5e1e94 100644
--- a/ui/admin/app/templates/scopes/scope/workers/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/index.hbs
@@ -10,12 +10,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'titles.workers'}}
       <DocLink @doc='worker' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/workers/new.hbs b/ui/admin/app/templates/scopes/scope/workers/new.hbs
index 4b634f4a4..7dcf4844d 100644
--- a/ui/admin/app/templates/scopes/scope/workers/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/new.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.worker.titles.new'}}
       <DocLink @doc='worker' />
     </Hds::Text::Display>
diff --git a/ui/admin/app/templates/scopes/scope/workers/worker/create-tags.hbs b/ui/admin/app/templates/scopes/scope/workers/worker/create-tags.hbs
index 80682e8e0..883bf425b 100644
--- a/ui/admin/app/templates/scopes/scope/workers/worker/create-tags.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/worker/create-tags.hbs
@@ -16,12 +16,7 @@
   </page.breadcrumbs>
 
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.worker.tags.create.title'}}
       <DocLink @doc='worker.create-tags' />
     </Hds::Text::Display>
diff --git a/ui/desktop/app/components/branded-card/index.hbs b/ui/desktop/app/components/branded-card/index.hbs
index 7febf3b09..606352094 100644
--- a/ui/desktop/app/components/branded-card/index.hbs
+++ b/ui/desktop/app/components/branded-card/index.hbs
@@ -4,11 +4,7 @@
 }}
 
 <div class='branded-card'>
-  <Hds::Text::Display
-    @tag='h1'
-    @size='500'
-    class='branded-card-title'
-  >{{@title}}</Hds::Text::Display>
+  <Hds::Text::Display @tag='h1' @size='500'>{{@title}}</Hds::Text::Display>
   <Hds::Text::Body @tag='p' @size='300' class='branded-card-description'>
     {{@description}}
   </Hds::Text::Body>
diff --git a/ui/desktop/app/components/settings-card/index.hbs b/ui/desktop/app/components/settings-card/index.hbs
index 5694a12c1..fcaaab04a 100644
--- a/ui/desktop/app/components/settings-card/index.hbs
+++ b/ui/desktop/app/components/settings-card/index.hbs
@@ -6,7 +6,7 @@
 <Hds::Card::Container @level='mid' @hasBorder={{true}}>
   <div class='header-and-icon'>
     <Hds::IconTile @icon={{@icon}} @size='small' />
-    <Hds::Text::Display @tag='h4'>
+    <Hds::Text::Display @tag='h4' class='remove-margin'>
       {{@header}}
     </Hds::Text::Display>
 
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 63766f819..a9314db9f 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -206,11 +206,6 @@
     top: 0;
   }
 
-  .branded-card-title {
-    margin-top: 1rem;
-    margin-bottom: 0.5rem;
-  }
-
   .branded-card-description {
     margin-bottom: sizing.rems(l);
   }
@@ -498,8 +493,3 @@
     }
   }
 }
-
-.header-spacing {
-  margin-top: 1rem;
-  margin-bottom: 0.5rem;
-}
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
index 98cf16b05..3c9c52ce8 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
@@ -5,12 +5,7 @@
 
 <Rose::Layout::Page as |page|>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.session.title_plural'}}
       <DocLink @doc='sessions' />
     </Hds::Text::Display>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs
index f537c8e58..03b5edf98 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs
@@ -9,7 +9,7 @@
 
   <page.header class='session-details-info'>
     <Hds::IconTile @color='boundary' @icon='terminal' />
-    <Hds::Text::Display @tag='h1' @size='500'>
+    <Hds::Text::Display @tag='h1' @size='500' class='remove-margin'>
       {{@model.displayName}}
     </Hds::Text::Display>
     <Hds::Badge
diff --git a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
index b5c05c393..179db0227 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
@@ -5,12 +5,7 @@
 
 <Rose::Layout::Page class='settings-card' as |page|>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'titles.settings'}}
     </Hds::Text::Display>
   </page.header>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index dbf42839d..0ac60fdf0 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -7,12 +7,7 @@
 
 <Rose::Layout::Page as |page|>
   <page.header>
-    <Hds::Text::Display
-      @tag='h2'
-      @size='400'
-      @weight='bold'
-      class='header-spacing'
-    >
+    <Hds::Text::Display @tag='h2' @size='400' @weight='bold'>
       {{t 'resources.target.title_plural'}}
       <DocLink @doc='targets' />
     </Hds::Text::Display>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs
index 52be20959..65f7ebec9 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs
@@ -8,7 +8,11 @@
 <Rose::Layout::Page as |page|>
 
   <page.header>
-    <Hds::Text::Display @tag='h1' @size='500' class='target-details-header'>
+    <Hds::Text::Display
+      @tag='h1'
+      @size='500'
+      class='target-details-header remove-margin'
+    >
       <Hds::IconTile @color='boundary' @icon='target' />
       {{@model.target.displayName}}
     </Hds::Text::Display>
diff --git a/ui/desktop/tests/integration/components/branded-card-test.js b/ui/desktop/tests/integration/components/branded-card-test.js
index 99d15cd01..5a7969fba 100644
--- a/ui/desktop/tests/integration/components/branded-card-test.js
+++ b/ui/desktop/tests/integration/components/branded-card-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
+import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
 module('Integration | Component | branded-card', function (hooks) {
@@ -13,9 +13,10 @@ module('Integration | Component | branded-card', function (hooks) {
 
   test('it renders', async function (assert) {
     await render(hbs`<BrandedCard />`);
-    assert.ok(find('.branded-card'));
-    assert.ok(find('.branded-card-title'));
-    assert.ok(find('.branded-card-description'));
+
+    assert.dom('.branded-card').isVisible();
+    assert.dom('h1').exists();
+    assert.dom('.branded-card-description').exists();
   });
 
   test('it renders with content', async function (assert) {
@@ -23,10 +24,8 @@ module('Integration | Component | branded-card', function (hooks) {
       @title="title"
       @description="description"
     />`);
-    assert.strictEqual(find('.branded-card-title').textContent.trim(), 'title');
-    assert.strictEqual(
-      find('.branded-card-description').textContent.trim(),
-      'description',
-    );
+
+    assert.dom('h1').hasText('title');
+    assert.dom('.branded-card-description').hasText('description');
   });
 });