diff --git a/addons/core/README.md b/addons/core/README.md
index 829db93dd..7a67b13ac 100644
--- a/addons/core/README.md
+++ b/addons/core/README.md
@@ -98,7 +98,7 @@ To render doc links in your application, be sure to configure the links in your
 Ember config (see admin).  Then reference doc links by keys:
 
 ```html
-<DocLink @doc="account" @iconSize="large" />
+<DocLink @doc="account" @iconSize="24" />
 ```
 
 ## Loading Helper
diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs
index 8ea58edae..6e69bb4b4 100644
--- a/addons/core/addon/components/doc-link/index.hbs
+++ b/addons/core/addon/components/doc-link/index.hbs
@@ -10,5 +10,5 @@
   rel='noreferrer noopener'
   title={{t 'actions.get-topic-help'}}
 >
-  <Rose::Icon @name='flight-icons/svg/help-24' @size={{@iconSize}} />
+  <Hds::Icon @name='help' @size={{or @iconSize 24}} @isInline={{true}} />
 </a>
\ No newline at end of file
diff --git a/addons/core/tests/integration/components/doc-link.js b/addons/core/tests/integration/components/doc-link.js
index e5a3fda2d..0bc9e6c35 100644
--- a/addons/core/tests/integration/components/doc-link.js
+++ b/addons/core/tests/integration/components/doc-link.js
@@ -5,14 +5,14 @@
 
 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 | doc-link', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
-    await render(hbs`<DocLink @doc='account' @iconSize='large' />`);
-    assert.ok(find('.doc-link .rose-icon.large'));
+    await render(hbs`<DocLink @doc='account' />`);
+    assert.dom('.doc-link .hds-icon').isVisible();
   });
 });
diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs
index 23c8579bd..1a5d49547 100644
--- a/addons/rose/addon/components/rose/button/index.hbs
+++ b/addons/rose/addon/components/rose/button/index.hbs
@@ -15,7 +15,7 @@
 
   <span class='rose-button-wrapper'>
     {{#if @iconLeft}}
-      <Rose::Icon @name={{@iconLeft}} @size='medium' />
+      <Hds::Icon @name={{@iconLeft}} @isInline={{true}} />
     {{/if}}
 
     <span class='rose-button-body'>
@@ -23,11 +23,11 @@
     </span>
 
     {{#if @iconOnly}}
-      <Rose::Icon @name={{@iconOnly}} @size='medium' />
+      <Hds::Icon @name={{@iconOnly}} @isInline={{true}} />
     {{/if}}
 
     {{#if @iconRight}}
-      <Rose::Icon @name={{@iconRight}} @size='medium' />
+      <Hds::Icon @name={{@iconRight}} @isInline={{true}} />
     {{/if}}
   </span>
 </button>
\ No newline at end of file
diff --git a/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs b/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs
index eb89fd333..04e94a7d5 100644
--- a/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs
+++ b/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs
@@ -27,7 +27,7 @@
       class='rose-code-editor-toolbar__copy-button'
       data-test-code-editor-toolbar-copy-button
     >
-      <Rose::Icon @name={{this.copyIconType}} @size='medium' />
+      <Hds::Icon @name={{this.copyIconType}} @isInline={{true}} />
       Copy code
     </CopyButton>
   </div>
diff --git a/addons/rose/addon/components/rose/code-editor/toolbar/index.js b/addons/rose/addon/components/rose/code-editor/toolbar/index.js
index 8ae9da2b5..ea3e0f5b4 100644
--- a/addons/rose/addon/components/rose/code-editor/toolbar/index.js
+++ b/addons/rose/addon/components/rose/code-editor/toolbar/index.js
@@ -8,8 +8,8 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
 
-export const COPY_ICON_TYPE = 'flight-icons/svg/clipboard-copy-16';
-export const COPIED_ICON_TYPE = 'flight-icons/svg/clipboard-checked-16';
+export const COPY_ICON_TYPE = 'clipboard-copy';
+export const COPIED_ICON_TYPE = 'clipboard-checked';
 
 export default class RoseCodeEditorToolbarComponent extends Component {
   @tracked copyIconType = COPY_ICON_TYPE;
diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs
index 693f7bc81..5935cc7ea 100644
--- a/addons/rose/addon/components/rose/dialog/index.hbs
+++ b/addons/rose/addon/components/rose/dialog/index.hbs
@@ -20,7 +20,7 @@
     <header class='rose-dialog-header' id={{concat 'dialog-header-' this.id}}>
 
       {{#if @icon}}
-        <Rose::Icon @name={{@icon}} @size='medium' />
+        <Hds::Icon @name={{@icon}} />
       {{/if}}
 
       <Hds::Text::Display
@@ -34,7 +34,7 @@
         title={{@dismissButtonText}}
         {{on 'click' (fn this.dismiss @dismiss)}}
       >
-        <Rose::Icon @name='flight-icons/svg/x-16' @size='small' />
+        <Hds::Icon @name='x' />
       </button>
 
     </header>
@@ -65,7 +65,7 @@
       <header class='rose-dialog-header'>
 
         {{#if @icon}}
-          <Rose::Icon @name={{@icon}} @size='medium' />
+          <Hds::Icon @name={{@icon}} />
         {{/if}}
 
         <Hds::Text::Display
@@ -79,7 +79,7 @@
           title={{@dismissButtonText}}
           {{on 'click' (fn this.dismiss @dismiss)}}
         >
-          <Rose::Icon @name='flight-icons/svg/x-16' @size='small' />
+          <Hds::Icon @name='x' />
         </button>
 
       </header>
diff --git a/addons/rose/addon/components/rose/dropdown/button/index.hbs b/addons/rose/addon/components/rose/dropdown/button/index.hbs
index 1d28db548..88ad67cca 100644
--- a/addons/rose/addon/components/rose/dropdown/button/index.hbs
+++ b/addons/rose/addon/components/rose/dropdown/button/index.hbs
@@ -17,7 +17,7 @@
     </Hds::Text::Body>
 
     {{#if @iconOnly}}
-      <Rose::Icon @name={{@iconOnly}} @size='medium' />
+      <Hds::Icon @name={{@iconOnly}} @isInline={{true}} />
     {{/if}}
   </span>
 </button>
\ No newline at end of file
diff --git a/addons/rose/addon/components/rose/dropdown/index.hbs b/addons/rose/addon/components/rose/dropdown/index.hbs
index 8ac2f1bb1..7c7c8a8ab 100644
--- a/addons/rose/addon/components/rose/dropdown/index.hbs
+++ b/addons/rose/addon/components/rose/dropdown/index.hbs
@@ -19,7 +19,7 @@
   >
 
     {{#if @icon}}
-      <Rose::Icon @name={{@icon}} @size='medium' />
+      <Hds::Icon @name={{@icon}} @isInline={{true}} />
     {{/if}}
 
     <span class='rose-dropdown-trigger-text'>
diff --git a/addons/rose/addon/components/rose/dropdown/section/index.hbs b/addons/rose/addon/components/rose/dropdown/section/index.hbs
index 78d37a5cb..d3173830c 100644
--- a/addons/rose/addon/components/rose/dropdown/section/index.hbs
+++ b/addons/rose/addon/components/rose/dropdown/section/index.hbs
@@ -14,7 +14,7 @@
       class='rose-dropdown-section-title'
     >
       {{#if @icon}}
-        <Rose::Icon @name={{@icon}} @size='medium' />
+        <Hds::Icon @name={{@icon}} @isInline={{true}} />
       {{/if}}
       {{@title}}
     </Hds::Text::Display>
diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs
index fc7f3388a..5919022a7 100644
--- a/addons/rose/addon/components/rose/form/errors/message/index.hbs
+++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs
@@ -4,6 +4,6 @@
 }}
 
 <p class='rose-form-error-message' ...attributes>
-  <Rose::Icon @name='flight-icons/svg/x-square-16' @size='medium' />
+  <Hds::Icon @name='x-square' @isInline={{true}} />
   {{yield}}
 </p>
\ No newline at end of file
diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs
index c37e75ed8..2b3098437 100644
--- a/addons/rose/addon/components/rose/form/input/index.hbs
+++ b/addons/rose/addon/components/rose/form/input/index.hbs
@@ -46,7 +46,7 @@
 
     <div class='rose-input-wrapper'>
       {{#if @icon}}
-        <Rose::Icon @name={{@icon}} @size='medium' />
+        <Hds::Icon @name={{@icon}} @isInline={{true}} />
       {{/if}}
       <Rose::Form::Input::Input
         ...attributes
diff --git a/addons/rose/app/styles/rose/components/code-editor/_index.scss b/addons/rose/app/styles/rose/components/code-editor/_index.scss
index 91442f8db..f419925ab 100644
--- a/addons/rose/app/styles/rose/components/code-editor/_index.scss
+++ b/addons/rose/app/styles/rose/components/code-editor/_index.scss
@@ -78,8 +78,8 @@
     height: sizing.rems(xl);
     white-space: nowrap;
 
-    &-icon {
-      margin-right: sizing.rems(xs);
+    .hds-icon {
+      vertical-align: top;
     }
   }
 }
diff --git a/addons/rose/app/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/app/styles/rose/components/dropdown/_dropdown.scss
index 1c308c56e..80ceb3fcc 100644
--- a/addons/rose/app/styles/rose/components/dropdown/_dropdown.scss
+++ b/addons/rose/app/styles/rose/components/dropdown/_dropdown.scss
@@ -38,6 +38,8 @@ $chevron-grey: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%236
 
     cursor: default;
     overflow: hidden;
+    display: flex;
+    align-items: center;
 
     $y-padding: sizing.rems(xxs) + sizing.rems(xxxs);
 
@@ -63,7 +65,7 @@ $chevron-grey: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%236
       background-color: var(--ui-gray-subtler-5);
     }
 
-    &:not(.has-icon-only) .rose-icon:first-child {
+    &:not(.has-icon-only) .hds-icon:first-child {
       margin-left: -(sizing.rems(xs));
       margin-right: sizing.rems(xxs);
     }
diff --git a/addons/rose/app/styles/rose/components/dropdown/_section.scss b/addons/rose/app/styles/rose/components/dropdown/_section.scss
index d7e3a680c..1e3693237 100644
--- a/addons/rose/app/styles/rose/components/dropdown/_section.scss
+++ b/addons/rose/app/styles/rose/components/dropdown/_section.scss
@@ -19,5 +19,9 @@
 
     line-height: $line-height;
     color: var(--ui-gray);
+
+    .hds-icon {
+      vertical-align: text-top;
+    }
   }
 }
diff --git a/addons/rose/app/styles/rose/components/layout/_page.scss b/addons/rose/app/styles/rose/components/layout/_page.scss
index d3c5b1ef1..b0ca8ceaf 100644
--- a/addons/rose/app/styles/rose/components/layout/_page.scss
+++ b/addons/rose/app/styles/rose/components/layout/_page.scss
@@ -22,6 +22,16 @@
 
   .rose-layout-page-header {
     grid-area: header;
+
+    h2 {
+      display: flex;
+      gap: sizing.rems(xxs);
+
+      .doc-link {
+        display: flex;
+        align-items: center;
+      }
+    }
   }
 
   .rose-layout-page-actions {
diff --git a/addons/rose/app/styles/rose/components/nav/_sidebar.scss b/addons/rose/app/styles/rose/components/nav/_sidebar.scss
index 31976d89d..cf7f0f729 100644
--- a/addons/rose/app/styles/rose/components/nav/_sidebar.scss
+++ b/addons/rose/app/styles/rose/components/nav/_sidebar.scss
@@ -48,8 +48,9 @@
     padding: 0 sizing.rems(m);
     border-right: $three-px solid transparent;
 
-    .rose-icon {
+    .hds-icon {
       opacity: 0.65;
+      vertical-align: text-bottom;
     }
 
     &:hover {
diff --git a/addons/rose/app/styles/rose/utilities/_button.scss b/addons/rose/app/styles/rose/utilities/_button.scss
index f561cc279..26561c6ee 100644
--- a/addons/rose/app/styles/rose/utilities/_button.scss
+++ b/addons/rose/app/styles/rose/utilities/_button.scss
@@ -23,12 +23,12 @@
     flex-direction: row;
   }
 
-  &.has-icon-left .rose-icon:first-child {
+  &.has-icon-left .hds-icon:first-child {
     margin-left: -(sizing.rems(xs));
     margin-right: sizing.rems(xxs);
   }
 
-  &.has-icon-right .rose-icon:last-child {
+  &.has-icon-right .hds-icon:last-child {
     margin-left: sizing.rems(xxs);
     margin-right: -(sizing.rems(xs));
   }
diff --git a/addons/rose/tests/integration/components/rose/button-test.js b/addons/rose/tests/integration/components/rose/button-test.js
index 39cf528bd..c8e1ebaf2 100644
--- a/addons/rose/tests/integration/components/rose/button-test.js
+++ b/addons/rose/tests/integration/components/rose/button-test.js
@@ -39,20 +39,14 @@ module('Integration | Component | rose/button', function (hooks) {
   });
 
   test('it supports left and right icons', async function (assert) {
-    await render(
-      hbs`<Rose::Button @iconLeft="flight-icons/svg/chevron-left-16" />`,
-    );
-    assert.ok(find('.has-icon-left .rose-icon'));
-    await render(
-      hbs`<Rose::Button @iconRight="flight-icons/svg/chevron-left-16" />`,
-    );
-    assert.ok(find('.has-icon-right .rose-icon'));
+    await render(hbs`<Rose::Button @iconLeft="chevron-left" />`);
+    assert.dom('.has-icon-left .hds-icon').isVisible();
+    await render(hbs`<Rose::Button @iconRight="chevron-left" />`);
+    assert.dom('.has-icon-right .hds-icon').isVisible();
   });
 
   test('it supports an icon-only type', async function (assert) {
-    await render(
-      hbs`<Rose::Button @iconOnly="flight-icons/svg/chevron-left-16" />`,
-    );
-    assert.ok(find('.has-icon-only .rose-icon'));
+    await render(hbs`<Rose::Button @iconOnly="chevron-left" />`);
+    assert.dom('.has-icon-only .hds-icon').isVisible();
   });
 });
diff --git a/addons/rose/tests/integration/components/rose/dropdown-test.js b/addons/rose/tests/integration/components/rose/dropdown-test.js
index c628c4dfd..d2bf35e54 100644
--- a/addons/rose/tests/integration/components/rose/dropdown-test.js
+++ b/addons/rose/tests/integration/components/rose/dropdown-test.js
@@ -37,10 +37,8 @@ module('Integration | Component | rose/dropdown', function (hooks) {
   });
 
   test('it supports an icon', async function (assert) {
-    await render(
-      hbs`<Rose::Dropdown @icon="flight-icons/svg/user-circle-16" />`,
-    );
-    assert.ok(find('svg'));
+    await render(hbs`<Rose::Dropdown @icon="user-circle" />`);
+    assert.dom('svg').isVisible();
   });
 
   test('it supports icon-only display', async function (assert) {
diff --git a/addons/rose/tests/integration/components/rose/dropdown/button-test.js b/addons/rose/tests/integration/components/rose/dropdown/button-test.js
index c8b177d49..1e9b63add 100644
--- a/addons/rose/tests/integration/components/rose/dropdown/button-test.js
+++ b/addons/rose/tests/integration/components/rose/dropdown/button-test.js
@@ -37,9 +37,7 @@ module('Integration | Component | rose/dropdown/button', function (hooks) {
   });
 
   test('it supports an icon-only type', async function (assert) {
-    await render(
-      hbs`<Rose::Dropdown::Button @iconOnly="flight-icons/svg/chevron-left-16" />`,
-    );
-    assert.ok(find('.has-icon-only .rose-icon'));
+    await render(hbs`<Rose::Dropdown::Button @iconOnly="chevron-left" />`);
+    assert.dom('.has-icon-only .hds-icon').isVisible();
   });
 });
diff --git a/addons/rose/tests/integration/components/rose/form/input-test.js b/addons/rose/tests/integration/components/rose/form/input-test.js
index c783edcf7..0809cfe76 100644
--- a/addons/rose/tests/integration/components/rose/form/input-test.js
+++ b/addons/rose/tests/integration/components/rose/form/input-test.js
@@ -67,8 +67,8 @@ module('Integration | Component | rose/form/input', function (hooks) {
   });
 
   test('it supports an icon using @icon', async function (assert) {
-    await render(hbs`<Rose::Form::Input @icon="flight-icons/svg/search-16" />`);
-    assert.ok(find('.rose-icon'));
+    await render(hbs`<Rose::Form::Input @icon="search" />`);
+    assert.dom('.hds-icon').isVisible();
   });
 
   test('it supports readonly attribute', async function (assert) {
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 d4baa7325..fa4b023f8 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.account.title'}}
-  <DocLink @doc='account' @iconSize='large' />
+  <DocLink @doc='account' />
 </Hds::Text::Display>
 <p>{{t 'resources.account.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 7410f07fc..c9a305574 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
@@ -10,7 +10,7 @@
     <Hds::Badge @text={{t 'states.primary'}} @color='success' />
     &nbsp;
   {{/if}}
-  <DocLink @doc='auth-method' @iconSize='large' />
+  <DocLink @doc='auth-method' />
 </Hds::Text::Display>
 <p>{{t 'resources.auth-method.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 5c3cb4ac2..6ceb38878 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.managed-group.title'}}
-  <DocLink @doc='managed-groups' @iconSize='large' />
+  <DocLink @doc='managed-groups' />
 </Hds::Text::Display>
 <p>{{t 'resources.managed-group.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 b5ab0894f..838faedfa 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.credential-store.title'}}
-  <DocLink @doc='credential-store' @iconSize='large' />
+  <DocLink @doc='credential-store' />
 </Hds::Text::Display>
 <p>{{t 'resources.credential-store.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/components/form/field/json-secret/index.hbs b/ui/admin/app/components/form/field/json-secret/index.hbs
index dc194d1ae..14af0e2a8 100644
--- a/ui/admin/app/components/form/field/json-secret/index.hbs
+++ b/ui/admin/app/components/form/field/json-secret/index.hbs
@@ -6,7 +6,7 @@
 <div class='secret-editor'>
   {{#if this.isDisabled}}
     <Form::Field::JsonSecret::Skeleton>
-      <Rose::Icon @name='flight-icons/svg/eye-off-16' @size='medium' />
+      <Hds::Icon @name='eye-off' @isInline={{true}} />
       {{t 'form.secret-editor.details'}}
     </Form::Field::JsonSecret::Skeleton>
   {{else if this.isActionable}}
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 bddafa188..58069038a 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
@@ -263,13 +263,14 @@
     {{#unless @model.isNew}}
       <div class='worker-success'>
         <div>
-          <Rose::Icon @name='flight-icons/svg/cpu-16' @size='medium' />
+          <Hds::Icon @name='cpu' @color='success' @isInline={{true}} />
           <p>{{this.generatedWorkerAuthToken}}</p>
         </div>
         <div>
-          <Rose::Icon
-            @name='flight-icons/svg/check-circle-fill-16'
-            @size='medium'
+          <Hds::Icon
+            @name='check-circle-fill'
+            @color='success'
+            @isInline={{true}}
           />
           <p>{{t 'resources.worker.form.steps.3.registered'}}</p>
         </div>
diff --git a/ui/admin/app/components/groups/group/header/index.hbs b/ui/admin/app/components/groups/group/header/index.hbs
index 9f5873e7d..d23964d3f 100644
--- a/ui/admin/app/components/groups/group/header/index.hbs
+++ b/ui/admin/app/components/groups/group/header/index.hbs
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.group.title'}}
-  <DocLink @doc='group' @iconSize='large' />
+  <DocLink @doc='group' />
 </Hds::Text::Display>
 <p>{{t 'resources.group.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/components/header-nav/index.hbs b/ui/admin/app/components/header-nav/index.hbs
index afd1d1312..ed3d99b67 100644
--- a/ui/admin/app/components/header-nav/index.hbs
+++ b/ui/admin/app/components/header-nav/index.hbs
@@ -9,11 +9,7 @@
     (t 'titles.global')
     this.scope.org.displayName
   }}
-  @icon={{if
-    this.scope.org.isGlobal
-    'flight-icons/svg/globe-16'
-    'flight-icons/svg/org-16'
-  }}
+  @icon={{if this.scope.org.isGlobal 'globe' 'org'}}
   as |dropdown|
 >
   {{#if this.session.data.authenticated.isGlobal}}
@@ -32,7 +28,7 @@
 {{#if this.scope.project}}
   <Rose::Dropdown
     @text={{this.scope.project.displayName}}
-    @icon='flight-icons/svg/grid-16'
+    @icon='grid'
     as |dropdown|
   >
     {{#each this.scope.projectsList as |project|}}
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 5726b1d1d..4aceb2d10 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host-catalog.title'}}
-  <DocLink @doc='host-catalog' @iconSize='large' />
+  <DocLink @doc='host-catalog' />
 </Hds::Text::Display>
 <p>{{t 'resources.host-catalog.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 5977bd1cf..72a812039 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
@@ -5,6 +5,6 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host-set.host.messages.add.title'}}
-  <DocLink @doc='host-set.add-hosts' @iconSize='large' />
+  <DocLink @doc='host-set.add-hosts' />
 </Hds::Text::Display>
 <p>{{t 'resources.host-set.host.messages.add.description'}}</p>
\ No newline at end of file
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 cb6d889ff..038b6bf97 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
@@ -5,5 +5,5 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host-set.actions.create-and-add-host'}}
-  <DocLink @doc='host.new' @iconSize='large' />
+  <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 0be4387c8..10155d0fa 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host-set.title'}}
-  <DocLink @doc='host-set' @iconSize='large' />
+  <DocLink @doc='host-set' />
 </Hds::Text::Display>
 <p>{{t 'resources.host-set.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 51f86865b..63195916c 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host.title'}}
-  <DocLink @doc='host' @iconSize='large' />
+  <DocLink @doc='host' />
 </Hds::Text::Display>
 <p>{{t 'resources.host.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 79356951f..594addbbb 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
@@ -5,6 +5,6 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host-set.titles.new'}}
-  <DocLink @doc='host-set.new' @iconSize='large' />
+  <DocLink @doc='host-set.new' />
 </Hds::Text::Display>
 <p>{{t 'resources.host-set.description'}}</p>
\ No newline at end of file
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 51f86865b..63195916c 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
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host.title'}}
-  <DocLink @doc='host' @iconSize='large' />
+  <DocLink @doc='host' />
 </Hds::Text::Display>
 <p>{{t 'resources.host.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
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 058532fcb..308be31b3 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
@@ -5,6 +5,6 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.host.titles.new'}}
-  <DocLink @doc='host.new' @iconSize='large' />
+  <DocLink @doc='host.new' />
 </Hds::Text::Display>
 <p>{{t 'resources.host.description'}}</p>
\ No newline at end of file
diff --git a/ui/admin/app/components/roles/role/header/index.hbs b/ui/admin/app/components/roles/role/header/index.hbs
index 75f422e0c..0ebf0a83e 100644
--- a/ui/admin/app/components/roles/role/header/index.hbs
+++ b/ui/admin/app/components/roles/role/header/index.hbs
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.role.title'}}
-  <DocLink @doc='role' @iconSize='large' />
+  <DocLink @doc='role' />
 </Hds::Text::Display>
 <p>{{t 'resources.role.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/components/targets/target/header/index.hbs b/ui/admin/app/components/targets/target/header/index.hbs
index 8bdc1b8d9..4f0a57bb1 100644
--- a/ui/admin/app/components/targets/target/header/index.hbs
+++ b/ui/admin/app/components/targets/target/header/index.hbs
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.target.title'}}
-  <DocLink @doc='target' @iconSize='large' />
+  <DocLink @doc='target' />
 </Hds::Text::Display>
 <p>{{t 'resources.target.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/components/users/user/header/index.hbs b/ui/admin/app/components/users/user/header/index.hbs
index b9774cc48..27afb526a 100644
--- a/ui/admin/app/components/users/user/header/index.hbs
+++ b/ui/admin/app/components/users/user/header/index.hbs
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.user.title'}}
-  <DocLink @doc='user' @iconSize='large' />
+  <DocLink @doc='user' />
 </Hds::Text::Display>
 <p>{{t 'resources.user.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/components/workers/worker/header/index.hbs b/ui/admin/app/components/workers/worker/header/index.hbs
index 14db98bc5..a0aa5fa9f 100644
--- a/ui/admin/app/components/workers/worker/header/index.hbs
+++ b/ui/admin/app/components/workers/worker/header/index.hbs
@@ -5,7 +5,7 @@
 
 <Hds::Text::Display @tag='h2' @size='400' @weight='bold' class='header-spacing'>
   {{t 'resources.worker.title'}}
-  <DocLink @doc='worker' @iconSize='large' />
+  <DocLink @doc='worker' />
 </Hds::Text::Display>
 <p>{{t 'resources.worker.description'}}</p>
 <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
\ No newline at end of file
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index 3bdb2c057..210677eac 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -38,7 +38,7 @@
     margin-top: 0;
   }
 
-  .rose-icon {
+  .hds-icon {
     margin-right: sizing.rems(xs);
   }
 }
@@ -296,10 +296,6 @@
         }
       }
     }
-
-    .rose-icon {
-      color: var(--success);
-    }
   }
 }
 
@@ -424,6 +420,9 @@
     left: 50%;
     position: absolute;
     top: 50%;
+    display: flex;
+    align-items: center;
+    gap: sizing.rems(xxxs);
 
     // centers message with editor body and gutter
     transform: translate(-50%, -50%);
@@ -431,7 +430,6 @@
   }
 
   .secret-editor-skeleton-button {
-    
     @media (prefers-color-scheme: light) {
       .ember-application:not(.rose-theme-dark) & {
         background: var(--token-color-palette-neutral-600);
@@ -439,7 +437,7 @@
         border-color: var(--token-color-palette-neutral-50);
       }
     }
-    
+
     .ember-application.rose-theme-light & {
       background: var(--token-color-palette-neutral-600);
       color: var(--token-color-palette-neutral-50);
@@ -1078,10 +1076,6 @@
 .header-spacing {
   margin-top: 1rem;
   margin-bottom: 0.5rem;
-
-  .doc-link {
-    vertical-align: middle;
-  }
 }
 
 // scope picker
@@ -1094,4 +1088,4 @@
   li.indentation {
     margin-left: 1.5rem;
   }
-}
\ No newline at end of file
+}
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 7b51ce383..61e95b359 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
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.policy.titles.new'}}
-      <DocLink @doc='storage-policy.new' @iconSize='large' />
+      <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
     <p>{{t 'resources.policy.description'}}</p>
   </page.header>
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 9b0a30a59..ae358094b 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
@@ -21,7 +21,7 @@
       class='header-spacing'
     >
       {{t 'resources.policy.actions.add'}}
-      <DocLink @doc='storage-policy.new' @iconSize='large' />
+      <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
   </page.header>
 
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 4e3e8e0db..63dba52b6 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
@@ -15,7 +15,7 @@
       class='header-spacing'
     >
       {{t 'resources.alias.title'}}
-      <DocLink @doc='alias' @iconSize='large' />
+      <DocLink @doc='alias' />
     </Hds::Text::Display>
     <p>{{t 'resources.alias.description'}}</p>
     <Hds::Copy::Snippet @color='secondary' @textToCopy={{@model.id}} />
diff --git a/ui/admin/app/templates/scopes/scope/aliases/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
index 6d6708de2..eda67dd89 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.alias.title_plural'}}
-      <DocLink @doc='alias' @iconSize='large' />
+      <DocLink @doc='alias' />
     </Hds::Text::Display>
     <p>{{t 'resources.alias.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/aliases/new.hbs b/ui/admin/app/templates/scopes/scope/aliases/new.hbs
index 5e7b7898c..44a1b1a9f 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/new.hbs
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.alias.titles.new'}}
-      <DocLink @doc='alias' @iconSize='large' />
+      <DocLink @doc='alias' />
     </Hds::Text::Display>
     <p>{{t 'resources.alias.description'}}</p>
 
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 bf3ca954e..76cfc2d06 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.account.titles.new'}}
-      <DocLink @doc='account.new' @iconSize='large' />
+      <DocLink @doc='account.new' />
     </Hds::Text::Display>
     <p>{{t 'resources.account.description'}}</p>
   </page.header>
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 29923e391..2073b1200 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.managed-group.titles.new'}}
-      <DocLink @doc='managed-groups' @iconSize='large' />
+      <DocLink @doc='managed-groups' />
     </Hds::Text::Display>
     <p>{{t 'resources.managed-group.description'}}</p>
   </page.header>
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 e3e0178a2..4844481fb 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -12,7 +12,7 @@
       class='header-spacing'
     >
       {{t 'resources.auth-method.title_plural'}}
-      <DocLink @doc='auth-method' @iconSize='large' />
+      <DocLink @doc='auth-method' />
     </Hds::Text::Display>
     <p>{{t 'resources.auth-method.description'}}</p>
   </page.header>
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 5410aaae7..881cf2c2d 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
@@ -18,7 +18,7 @@
       class='header-spacing'
     >
       {{t 'resources.auth-method.titles.new'}}
-      <DocLink @doc='auth-method' @iconSize='large' />
+      <DocLink @doc='auth-method' />
     </Hds::Text::Display>
     <p>{{t 'resources.auth-method.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs
index d34b96b5e..27ef3f5df 100644
--- a/ui/admin/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs
@@ -31,7 +31,7 @@
 
             <Rose::Dropdown
               @text={{t 'actions.choose-different-org'}}
-              @icon='flight-icons/svg/org-16'
+              @icon='org'
               as |dropdown|
             >
               <dropdown.link @route='scopes.scope.authenticate' @model='global'>
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 067c6c3a1..f68e6e65c 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
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential-library.title'}}
-      <DocLink @doc='credential-library' @iconSize='large' />
+      <DocLink @doc='credential-library' />
     </Hds::Text::Display>
     <p>{{t 'resources.credential-library.description'}}</p>
     <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
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 521823302..799362478 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential-library.titles.new'}}
-      <DocLink @doc='credential-library' @iconSize='large' />
+      <DocLink @doc='credential-library' />
     </Hds::Text::Display>
     <p>{{t 'resources.credential-library.description'}}</p>
   </page.header>
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 90b7172e0..de9fe8004 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
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential.title'}}
-      <DocLink @doc='credential' @iconSize='large' />
+      <DocLink @doc='credential' />
     </Hds::Text::Display>
     <p>{{t 'resources.credential.description'}}</p>
     <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
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 cd7a01133..6c6fc8401 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential.titles.new'}}
-      <DocLink @doc='credential' @iconSize='large' />
+      <DocLink @doc='credential' />
     </Hds::Text::Display>
     <p>{{t 'resources.credential.description'}}</p>
   </page.header>
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 ec1f89d48..29aefb703 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
@@ -17,7 +17,7 @@
   <page.header>
     <Hds::Text::Display @tag='h2' @size='300' class='h2'>
       {{t 'actions.edit-worker-filter'}}
-      <DocLink @doc='worker-filters-format' @iconSize='large' />
+      <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
     <Hds::Text::Body @tag='p' @size='300'>
       {{t 'resources.credential-store.worker-filter.messages.edit.description'}}
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 0340f8563..a78495feb 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential-store.title_plural'}}
-      <DocLink @doc='credential-store' @iconSize='large' />
+      <DocLink @doc='credential-store' />
     </Hds::Text::Display>
     {{#if @model.doCredentialStoresExist}}
       <p>{{t 'resources.credential-store.description'}}</p>
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 e8f1073d4..364c75bf4 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.credential-store.titles.new'}}
-      <DocLink @doc='credential-store' @iconSize='large' />
+      <DocLink @doc='credential-store' />
     </Hds::Text::Display>
     <p>{{t 'resources.credential-store.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index 48eff7bfe..c29a89975 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -28,7 +28,7 @@
         class='header-spacing'
       >
         {{t 'resources.global.title'}}
-        <DocLink @doc='global' @iconSize='large' />
+        <DocLink @doc='global' />
       </Hds::Text::Display>
       <p>{{t 'resources.global.description'}}</p>
     {{/if}}
@@ -40,7 +40,7 @@
         class='header-spacing'
       >
         {{t 'resources.org.title'}}
-        <DocLink @doc='org' @iconSize='large' />
+        <DocLink @doc='org' />
       </Hds::Text::Display>
       <p>{{t 'resources.org.description'}}</p>
     {{/if}}
@@ -52,7 +52,7 @@
         class='header-spacing'
       >
         {{t 'resources.project.title'}}
-        <DocLink @doc='project' @iconSize='large' />
+        <DocLink @doc='project' />
       </Hds::Text::Display>
       <p>{{t 'resources.project.description'}}</p>
     {{/if}}
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 a2e01c441..5a7214242 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.group.messages.add-members.title'}}
-      <DocLink @doc='group.add-members' @iconSize='large' />
+      <DocLink @doc='group.add-members' />
     </Hds::Text::Display>
     <p>{{t 'resources.group.messages.add-members.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs
index b6623a682..eb4294eef 100644
--- a/ui/admin/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.group.title_plural'}}
-      <DocLink @doc='group' @iconSize='large' />
+      <DocLink @doc='group' />
     </Hds::Text::Display>
     {{#if @model.doGroupsExist}}
       <p>{{t 'resources.group.description'}}</p>
diff --git a/ui/admin/app/templates/scopes/scope/groups/new.hbs b/ui/admin/app/templates/scopes/scope/groups/new.hbs
index 779f1eaa0..b8fb52df5 100644
--- a/ui/admin/app/templates/scopes/scope/groups/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/new.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.group.titles.new'}}
-      <DocLink @doc='group' @iconSize='large' />
+      <DocLink @doc='group' />
     </Hds::Text::Display>
     <p>{{t 'resources.group.description'}}</p>
   </page.header>
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 8fe70db1d..f33a92150 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.host-catalog.title_plural'}}
-      <DocLink @doc='host-catalog' @iconSize='large' />
+      <DocLink @doc='host-catalog' />
     </Hds::Text::Display>
     {{#if @model.doHostCatalogsExist}}
       <p>{{t 'resources.host-catalog.description'}}</p>
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 f4e0a51bb..46d11fb00 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.host-catalog.titles.new'}}
-      <DocLink @doc='host-catalog.new' @iconSize='large' />
+      <DocLink @doc='host-catalog.new' />
     </Hds::Text::Display>
     <p>{{t 'resources.host-catalog.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/policies/index.hbs b/ui/admin/app/templates/scopes/scope/policies/index.hbs
index eed966f00..6728cc7d2 100644
--- a/ui/admin/app/templates/scopes/scope/policies/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/index.hbs
@@ -15,7 +15,7 @@
       class='header-spacing'
     >
       {{t 'resources.policy.title_plural'}}
-      <DocLink @doc='storage-policy' @iconSize='large' />
+      <DocLink @doc='storage-policy' />
     </Hds::Text::Display>
     <p>{{t 'resources.policy.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/policies/new.hbs b/ui/admin/app/templates/scopes/scope/policies/new.hbs
index 97b954489..34ca5a366 100644
--- a/ui/admin/app/templates/scopes/scope/policies/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/new.hbs
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.policy.titles.new'}}
-      <DocLink @doc='storage-policy.new' @iconSize='large' />
+      <DocLink @doc='storage-policy.new' />
     </Hds::Text::Display>
     <p>{{t 'resources.policy.description'}}</p>
   </page.header>
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 b362937d0..907a14ffb 100644
--- a/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.policy.title'}}
-      <DocLink @doc='storage-policy' @iconSize='large' />
+      <DocLink @doc='storage-policy' />
     </Hds::Text::Display>
     <p>{{t 'resources.policy.description'}}</p>
     <Hds::Copy::Snippet @color='secondary' @textToCopy={{@model.id}} />
diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs
index 6840a60f3..ca6b45012 100644
--- a/ui/admin/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.title_plural'}}
-      <DocLink @doc='role' @iconSize='large' />
+      <DocLink @doc='role' />
     </Hds::Text::Display>
     {{#if @model.doRolesExist}}
       <p>{{t 'resources.role.description'}}</p>
diff --git a/ui/admin/app/templates/scopes/scope/roles/new.hbs b/ui/admin/app/templates/scopes/scope/roles/new.hbs
index 95ee4a7b8..4a30c6668 100644
--- a/ui/admin/app/templates/scopes/scope/roles/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/new.hbs
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.titles.new'}}
-      <DocLink @doc='role' @iconSize='large' />
+      <DocLink @doc='role' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.description'}}</p>
   </page.header>
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 35035421d..b8f029dbe 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.principal.messages.add-principals.title'}}
-      <DocLink @doc='role.add-principals' @iconSize='large' />
+      <DocLink @doc='role.add-principals' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.principal.messages.add-principals.description'}}</p>
   </page.header>
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 bc66d7bdb..63d744be5 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.title'}}
-      <DocLink @doc='role' @iconSize='large' />
+      <DocLink @doc='role' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.grant.description'}}</p>
     <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
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 6036c9e1a..215e4e296 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
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.scope.messages.manage-scopes.title'}}
-      <DocLink @doc='role.add-grant-scopes' @iconSize='large' />
+      <DocLink @doc='role.add-grant-scopes' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.scope.messages.manage-scopes.description'}}</p>
   </page.header>
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 60df6dae2..6e6b5c48e 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.scope.messages.manage-custom-scopes.title'}}
-      <DocLink @doc='role.add-grant-scopes' @iconSize='large' />
+      <DocLink @doc='role.add-grant-scopes' />
     </Hds::Text::Display>
     <p>{{t
         'resources.role.scope.messages.manage-custom-scopes.description'
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 5b75cd2dc..55bf3fa06 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
@@ -41,7 +41,7 @@
         'resources.role.scope.messages.manage-org-projects.title'
         orgDisplayName=@model.orgScope.displayName
       }}
-      <DocLink @doc='role.add-grant-scopes' @iconSize='large' />
+      <DocLink @doc='role.add-grant-scopes' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.scope.messages.manage-org-projects.description'}}</p>
   </page.header>
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 a114cecaf..a17358f21 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.title'}}
-      <DocLink @doc='role' @iconSize='large' />
+      <DocLink @doc='role' />
     </Hds::Text::Display>
     <p>{{t 'resources.role.principal.description'}}</p>
     <Hds::Copy::Snippet @textToCopy={{@model.role.id}} @color='secondary' />
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 13964b325..26bf89114 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.role.title'}}
-      <DocLink @doc='role' @iconSize='large' />
+      <DocLink @doc='role' />
     </Hds::Text::Display>
     <p>
       {{#if @model.role.scope.isOrg}}
diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
index 52c0fd32c..35a4da2f0 100644
--- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
@@ -18,7 +18,7 @@
         class='header-spacing'
       >
         {{t 'resources.org.title_plural'}}
-        <DocLink @doc='org' @iconSize='large' />
+        <DocLink @doc='org' />
       </Hds::Text::Display>
       {{#if @model.doScopesExist}}
         <p>{{t 'resources.org.description'}}</p>
@@ -31,7 +31,7 @@
         class='header-spacing'
       >
         {{t 'resources.project.title_plural'}}
-        <DocLink @doc='project' @iconSize='large' />
+        <DocLink @doc='project' />
       </Hds::Text::Display>
       {{#if @model.doScopesExist}}
         <p>{{t 'resources.project.description'}}</p>
diff --git a/ui/admin/app/templates/scopes/scope/scopes/new.hbs b/ui/admin/app/templates/scopes/scope/scopes/new.hbs
index 73f4aa586..ed41bc5dd 100644
--- a/ui/admin/app/templates/scopes/scope/scopes/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/scopes/new.hbs
@@ -31,7 +31,7 @@
         class='header-spacing'
       >
         {{t 'resources.org.titles.new'}}
-        <DocLink @doc='org.new' @iconSize='large' />
+        <DocLink @doc='org.new' />
       </Hds::Text::Display>
       <p>{{t 'resources.org.description'}}</p>
     {{else if @model.isProject}}
@@ -42,7 +42,7 @@
         class='header-spacing'
       >
         {{t 'resources.project.titles.new'}}
-        <DocLink @doc='project.new' @iconSize='large' />
+        <DocLink @doc='project.new' />
       </Hds::Text::Display>
       <p>{{t 'resources.project.description'}}</p>
     {{/if}}
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 f4bb7ccef..6fb807295 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs
@@ -15,7 +15,7 @@
       @weight='bold'
       class='header-spacing'
     >{{t 'resources.session-recording.title_plural'}}
-      <DocLink @doc='session-recording' @iconSize='large' />
+      <DocLink @doc='session-recording' />
     </Hds::Text::Display>
     <p>{{t 'resources.session-recording.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index f89cff933..c378ce90f 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.session.title_plural'}}
-      <DocLink @doc='session' @iconSize='large' />
+      <DocLink @doc='session' />
     </Hds::Text::Display>
     <p>{{t 'resources.session.description'}}</p>
   </page.header>
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 19ffa56dd..a7521b285 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.storage-bucket.title_plural'}}
-      <DocLink @doc='storage-bucket' @iconSize='large' />
+      <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
     <p>{{t 'resources.storage-bucket.description'}}</p>
   </page.header>
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 e1e194266..95c853b88 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.storage-bucket.titles.new'}}
-      <DocLink @doc='storage-bucket.new' @iconSize='large' />
+      <DocLink @doc='storage-bucket.new' />
     </Hds::Text::Display>
   </page.header>
 
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 b1602ad92..25c347bfc 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
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.storage-bucket.title'}}
-      <DocLink @doc='storage-bucket' @iconSize='large' />
+      <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
     <Hds::Copy::Snippet @textToCopy={{@model.id}} @color='secondary' />
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/targets/index.hbs b/ui/admin/app/templates/scopes/scope/targets/index.hbs
index 9ee9341ba..93a3b0012 100644
--- a/ui/admin/app/templates/scopes/scope/targets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/index.hbs
@@ -16,7 +16,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.title_plural'}}
-      <DocLink @doc='target' @iconSize='large' />
+      <DocLink @doc='target' />
     </Hds::Text::Display>
     {{#if @model.doTargetsExist}}
       <p>{{t 'resources.target.description'}}</p>
diff --git a/ui/admin/app/templates/scopes/scope/targets/new.hbs b/ui/admin/app/templates/scopes/scope/targets/new.hbs
index 32038a471..b2be52cc9 100644
--- a/ui/admin/app/templates/scopes/scope/targets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/new.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.titles.new'}}
-      <DocLink @doc='target.new' @iconSize='large' />
+      <DocLink @doc='target.new' />
     </Hds::Text::Display>
     <p>{{t 'resources.target.description'}}</p>
   </page.header>
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 6a92fc533..3b3f65d39 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.host-source.messages.add.title'}}
-      <DocLink @doc='target.add-host-sources' @iconSize='large' />
+      <DocLink @doc='target.add-host-sources' />
     </Hds::Text::Display>
     <p>{{t 'resources.target.host-source.messages.add.description'}}</p>
   </page.header>
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 e68374885..cfdf4fd0f 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
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.alias.titles.new'}}
-      <DocLink @doc='alias' @iconSize='large' />
+      <DocLink @doc='alias' />
     </Hds::Text::Display>
     <p>{{t 'resources.alias.description'}}</p>
 
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 c44f616fd..f470853db 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
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.workers.edit-egress-worker-filter.title'}}
-      <DocLink @doc='worker-filters-format' @iconSize='large' />
+      <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
     <p>{{t
         'resources.target.workers.edit-egress-worker-filter.description'
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 955364e29..ed6086a39 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.workers.edit-ingress-worker-filter.title'}}
-      <DocLink @doc='worker-filters-format' @iconSize='large' />
+      <DocLink @doc='worker-filters-format' />
     </Hds::Text::Display>
     <p>{{t
         'resources.target.workers.edit-ingress-worker-filter.description'
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 c426ebda7..ca612ce81 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
@@ -22,7 +22,7 @@
       class='header-spacing'
     >
       {{t 'resources.storage-bucket.titles.new'}}
-      <DocLink @doc='storage-bucket' @iconSize='large' />
+      <DocLink @doc='storage-bucket' />
     </Hds::Text::Display>
   </page.header>
 
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 201d4f3f3..632be35cd 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
@@ -15,7 +15,7 @@
       @weight='bold'
       class='header-spacing'
     >{{t 'resources.target.enable-session-recording.messages.add.title'}}
-      <DocLink @doc='target.enable-session-recording' @iconSize='large' />
+      <DocLink @doc='target.enable-session-recording' />
     </Hds::Text::Display>
   </page.header>
 
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 53af431b8..2574fff96 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
@@ -20,7 +20,7 @@
       class='header-spacing'
     >
       {{t 'resources.alias.title'}}
-      <DocLink @doc='alias' @iconSize='large' />
+      <DocLink @doc='alias' />
     </Hds::Text::Display>
     <p>{{t 'resources.alias.description'}}</p>
     <Hds::Copy::Snippet @color='secondary' @textToCopy={{@model.id}} />
diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs
index 2ddc8623b..a474a40b7 100644
--- a/ui/admin/app/templates/scopes/scope/users/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'resources.user.title_plural'}}
-      <DocLink @doc='user' @iconSize='large' />
+      <DocLink @doc='user' />
     </Hds::Text::Display>
     {{#if @model.doUsersExist}}
       <p>{{t 'resources.user.description'}}</p>
diff --git a/ui/admin/app/templates/scopes/scope/users/new.hbs b/ui/admin/app/templates/scopes/scope/users/new.hbs
index 6e96b22bc..e84b64f68 100644
--- a/ui/admin/app/templates/scopes/scope/users/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/new.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.user.titles.new'}}
-      <DocLink @doc='user' @iconSize='large' />
+      <DocLink @doc='user' />
     </Hds::Text::Display>
     <p>{{t 'resources.user.description'}}</p>
   </page.header>
diff --git a/ui/admin/app/templates/scopes/scope/workers/index.hbs b/ui/admin/app/templates/scopes/scope/workers/index.hbs
index 54d93db97..879ffb9bb 100644
--- a/ui/admin/app/templates/scopes/scope/workers/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/index.hbs
@@ -17,7 +17,7 @@
       class='header-spacing'
     >
       {{t 'titles.workers'}}
-      <DocLink @doc='worker' @iconSize='large' />
+      <DocLink @doc='worker' />
     </Hds::Text::Display>
   </page.header>
 
@@ -52,10 +52,7 @@
                     (group-by 'key' filter.allowedValues)
                     as |key tags|
                   }}
-                    <dropdown.section
-                      @title={{key}}
-                      @icon='flight-icons/svg/tag-16'
-                    />
+                    <dropdown.section @title={{key}} @icon='tag' />
                     <form.checkboxGroup
                       @name={{key}}
                       @items={{tags}}
diff --git a/ui/admin/app/templates/scopes/scope/workers/new.hbs b/ui/admin/app/templates/scopes/scope/workers/new.hbs
index 696a81157..4b634f4a4 100644
--- a/ui/admin/app/templates/scopes/scope/workers/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/new.hbs
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.worker.titles.new'}}
-      <DocLink @doc='worker' @iconSize='large' />
+      <DocLink @doc='worker' />
     </Hds::Text::Display>
   </page.header>
   <page.body>
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 b43d61c32..80682e8e0 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
@@ -23,7 +23,7 @@
       class='header-spacing'
     >
       {{t 'resources.worker.tags.create.title'}}
-      <DocLink @doc='worker.create-tags' @iconSize='large' />
+      <DocLink @doc='worker.create-tags' />
     </Hds::Text::Display>
     {{t 'resources.worker.tags.create.description'}}
     <Hds::Link::Inline @color='secondary' @href={{doc-url 'worker'}}>
diff --git a/ui/admin/tests/acceptance/roles/selectors.js b/ui/admin/tests/acceptance/roles/selectors.js
index 428b12e44..31b27891a 100644
--- a/ui/admin/tests/acceptance/roles/selectors.js
+++ b/ui/admin/tests/acceptance/roles/selectors.js
@@ -49,8 +49,7 @@ export const FIELD_NEW_GRANT = 'form:nth-child(1) [name="grant"]';
 export const FIELD_NEW_GRANT_ADD_BTN = 'form:nth-child(1) [type="submit"]';
 export const FIELD_GRANT = 'form:nth-child(2) [name="grant"]';
 export const FIELD_GRANT_VALUE = 'ids=123,action=delete';
-export const FIELD_GRANT_REMOVE_BTN =
-  'form:nth-child(2) button[type="button"]';
+export const FIELD_GRANT_REMOVE_BTN = 'form:nth-child(2) button[type="button"]';
 export const GRANTS_FORM = 'form:nth-child(2)';
 // We need to use a different selector for the grants form because the
 // grants form has multiple submit buttons
diff --git a/ui/desktop/app/components/card/index.hbs b/ui/desktop/app/components/card/index.hbs
index ebe5c0013..48ff67736 100644
--- a/ui/desktop/app/components/card/index.hbs
+++ b/ui/desktop/app/components/card/index.hbs
@@ -14,7 +14,7 @@
           class='header-spacing'
         >
           {{#if @icon}}
-            <Rose::Icon @name={{@icon}} @size='medium' />
+            <Hds::Icon @name={{@icon}} />
           {{/if}}
           {{@heading}}
         </Hds::Text::Display>
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 5cb5b718c..a9526680c 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -59,7 +59,7 @@
     margin-top: 0;
   }
 
-  .rose-icon {
+  .hds-icon {
     margin-right: sizing.rems(xs);
   }
 }
@@ -296,7 +296,7 @@
       padding: sizing.rems(xxs) + sizing.rems(xxxs) 0;
     }
 
-    .rose-icon {
+    .hds-icon {
       margin-right: sizing.rems(xxxs);
     }
   }
@@ -588,8 +588,4 @@
 .header-spacing {
   margin-top: 1rem;
   margin-bottom: 0.5rem;
-
-  .doc-link {
-    vertical-align: middle;
-  }
 }
diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs
index e59862787..e9ab1b8d5 100644
--- a/ui/desktop/app/templates/application.hbs
+++ b/ui/desktop/app/templates/application.hbs
@@ -22,21 +22,21 @@
       <header.utilities as |utilities|>
         {{#if this.showWindowActions}}
           <Rose::Button
-            @iconOnly='flight-icons/svg/x-16'
+            @iconOnly='x'
             @style='warning'
             class='button-window-close'
             title={{t 'actions.close'}}
             {{on 'click' this.close}}
           />
           <Rose::Button
-            @iconOnly='flight-icons/svg/square-16'
+            @iconOnly='square'
             @style='secondary'
             class='button-window-fullscreen'
             title={{t 'actions.fullscreen'}}
             {{on 'click' this.toggleFullScreen}}
           />
           <Rose::Button
-            @iconOnly='flight-icons/svg/minus-16'
+            @iconOnly='minus'
             @style='secondary'
             class='button-window-minimize'
             title={{t 'actions.minimize'}}
@@ -47,7 +47,7 @@
         {{#if this.session.isAuthenticated}}
           <utilities.dropdown
             @text={{this.session.data.authenticated.username}}
-            @icon='flight-icons/svg/user-circle-16'
+            @icon='user-circle'
             as |dropdown|
           >
             <dropdown.button {{on 'click' this.invalidateSession}}>
diff --git a/ui/desktop/app/templates/scopes/scope.hbs b/ui/desktop/app/templates/scopes/scope.hbs
index 53ad8d322..378a038ce 100644
--- a/ui/desktop/app/templates/scopes/scope.hbs
+++ b/ui/desktop/app/templates/scopes/scope.hbs
@@ -9,11 +9,7 @@
   <EmberWormhole @to='header-nav'>
     <Rose::Dropdown
       @text={{this.scopes.selectedOrg.displayName}}
-      @icon={{if
-        this.scopes.selectedOrg.isGlobal
-        'flight-icons/svg/globe-16'
-        'flight-icons/svg/org-16'
-      }}
+      @icon={{if this.scopes.selectedOrg.isGlobal 'globe' 'org'}}
       as |dropdown|
     >
       {{!-- {{#if this.session.data.authenticated.isGlobal}} --}}
diff --git a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs
index 0e779a41a..92cbbcfc5 100644
--- a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs
+++ b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs
@@ -5,11 +5,7 @@
 
 <Rose::Dropdown
   @text={{this.scopes.selectedOrg.displayName}}
-  @icon={{if
-    this.scopes.selectedOrg.isGlobal
-    'flight-icons/svg/globe-16'
-    'flight-icons/svg/org-16'
-  }}
+  @icon={{if this.scopes.selectedOrg.isGlobal 'globe' 'org'}}
   as |dropdown|
 >
   {{!-- {{#if this.session.data.authenticated.isGlobal}} --}}
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
index fd675e3a4..ad4b498e2 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -19,7 +19,7 @@
 
       <Rose::Dropdown
         @text={{t 'actions.choose-different-org'}}
-        @icon='flight-icons/svg/org-16'
+        @icon='org'
         as |dropdown|
       >
         <dropdown.link @route='scopes.scope.authenticate' @model='global'>
diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs
index 93ea576cc..c23827127 100644
--- a/ui/desktop/app/templates/scopes/scope/projects.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects.hbs
@@ -7,16 +7,16 @@
   <sidebarLayout.sidebar>
     <Rose::Nav::Sidebar as |nav|>
       <nav.link @route='scopes.scope.projects.targets'>
-        <Rose::Icon @name='flight-icons/svg/crosshair-16' @size='medium' />
+        <Hds::Icon @name='crosshair' @isInline={{true}} />
         {{t 'resources.target.title_plural'}}
       </nav.link>
 
       <nav.link @route='scopes.scope.projects.sessions'>
-        <Rose::Icon @name='flight-icons/svg/entry-point-16' @size='medium' />
+        <Hds::Icon @name='entry-point' @isInline={{true}} />
         {{t 'resources.session.title_plural'}}
       </nav.link>
       <nav.link @route='scopes.scope.projects.settings'>
-        <Rose::Icon @name='flight-icons/svg/settings-16' @size='medium' />
+        <Hds::Icon @name='settings' @isInline={{true}} />
         {{t 'titles.settings'}}
       </nav.link>
     </Rose::Nav::Sidebar>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
index 5d9359355..65d4831dd 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs
@@ -12,7 +12,7 @@
       class='header-spacing'
     >
       {{t 'resources.session.title_plural'}}
-      <DocLink @doc='sessions' @iconSize='large' />
+      <DocLink @doc='sessions' />
     </Hds::Text::Display>
     <p>{{t 'resources.session.description'}}</p>
   </page.header>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
index 2a164ebfb..b5c05c393 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs
@@ -12,8 +12,6 @@
       class='header-spacing'
     >
       {{t 'titles.settings'}}
-      {{! TODO: Add a link to the settings documentation }}
-      {{! <DocLink @doc='setting' @iconSize='large' /> }}
     </Hds::Text::Display>
   </page.header>
   <page.body>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index 2df9bc505..c313afc2f 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -14,7 +14,7 @@
       class='header-spacing'
     >
       {{t 'resources.target.title_plural'}}
-      <DocLink @doc='targets' @iconSize='large' />
+      <DocLink @doc='targets' />
     </Hds::Text::Display>
     <p>{{t 'resources.target.description'}}</p>
   </page.header>
diff --git a/ui/desktop/tests/integration/components/card-test.js b/ui/desktop/tests/integration/components/card-test.js
index 186c5bfe2..93c5a6d56 100644
--- a/ui/desktop/tests/integration/components/card-test.js
+++ b/ui/desktop/tests/integration/components/card-test.js
@@ -35,16 +35,16 @@ module('Integration | Component | card', function (hooks) {
     await render(hbs`
       <Card
         @heading='This is a heading test'
-        @icon='flight-icons/svg/key-16'>
+        @icon='key'>
         <:header></:header>
         <:body></:body>
         <:footer></:footer>
       </Card>
     `);
 
-    assert.ok(find('.card'));
-    assert.ok(find('.card-header'));
-    assert.ok(find('.card-header .rose-icon'));
+    assert.dom('.card').exists();
+    assert.dom('.card-header').exists();
+    assert.dom('.card-header .hds-icon').isVisible();
     assert.strictEqual(
       this.element.textContent.trim(),
       'This is a heading test',