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 d108ee0de..92000d9e8 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
@@ -2,9 +2,7 @@
   {{t 'resources.auth-method.title'}}
   {{#if @model.isPrimary}}
      
-    <Rose::Badge @style='success-outline'>
-      {{t 'states.primary'}}
-    </Rose::Badge>
+    <Hds::Badge @text={{t 'states.primary'}} @color='success' />
     &nbsp;
   {{/if}}
   <DocLink @doc='auth-method' @iconSize='large' />
diff --git a/ui/admin/app/components/cred-source-type-badge/index.hbs b/ui/admin/app/components/cred-source-type-badge/index.hbs
index b9900a7ba..1ebfcae7c 100644
--- a/ui/admin/app/components/cred-source-type-badge/index.hbs
+++ b/ui/admin/app/components/cred-source-type-badge/index.hbs
@@ -1,13 +1,9 @@
 {{#if @model.isUnknown}}
-  <Rose::Badge>
-    {{t 'resources.credential.types.unknown'}}
-  </Rose::Badge>
+  <Hds::Badge @text={{t 'resources.credential.types.unknown'}} />
 {{else if @model.isVault}}
-  <Rose::Badge>
-    {{t (concat 'resources.credential-library.types.' @model.type)}}
-  </Rose::Badge>
+  <Hds::Badge
+    @text={{t (concat 'resources.credential-library.types.' @model.type)}}
+  />
 {{else}}
-  <Rose::Badge>
-    {{t (concat 'resources.credential.types.' @model.type)}}
-  </Rose::Badge>
+  <Hds::Badge @text={{t (concat 'resources.credential.types.' @model.type)}} />
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index b82aca3cb..79ff09c78 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -61,7 +61,7 @@
                   {{account.attributes.full_name}}
                 </row.cell>
                 <row.cell>
-                  <Rose::Badge>{{account.type}}</Rose::Badge>
+                  <Hds::Badge @text={{account.type}} />
                 </row.cell>
                 <row.cell>
                   <Copyable
@@ -106,7 +106,7 @@
                   {{account.attributes.login_name}}
                 </row.cell>
                 <row.cell>
-                  <Rose::Badge>{{account.type}}</Rose::Badge>
+                  <Hds::Badge @text={{account.type}} />
                 </row.cell>
                 <row.cell>
                   <Copyable
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
index 54f0780cc..c8ef552a1 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/index.hbs
@@ -45,7 +45,7 @@
               </row.headerCell>
               <row.cell>{{managed-group.description}}</row.cell>
               <row.cell>
-                <Rose::Badge>{{managed-group.type}}</Rose::Badge>
+                <Hds::Badge @text={{managed-group.type}} />
               </row.cell>
               <row.cell>
                 <Copyable
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
index 5111f1838..24e028ed3 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.hbs
@@ -58,7 +58,7 @@
                 {{member.attributes.full_name}}
               </row.cell>
               <row.cell>
-                <Rose::Badge>{{member.type}}</Rose::Badge>
+                <Hds::Badge @text={{member.type}} />
               </row.cell>
               <row.cell>
                 <Copyable
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 dfab5d793..18a09958c 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -128,9 +128,11 @@
                 <p>{{authMethod.description}}</p>
               </row.headerCell>
               <row.cell>
-                <Rose::Badge>
-                  {{t (concat 'resources.auth-method.types.' authMethod.type)}}
-                </Rose::Badge>
+                <Hds::Badge
+                  @text={{t
+                    (concat 'resources.auth-method.types.' authMethod.type)
+                  }}
+                />
               </row.cell>
               <row.cell>
                 <Copyable
@@ -143,9 +145,7 @@
               </row.cell>
               <row.cell>
                 {{#if authMethod.isPrimary}}
-                  <Rose::Badge @style='success-outline'>
-                    {{t 'states.primary'}}
-                  </Rose::Badge>
+                  <Hds::Badge @text={{t 'states.primary'}} @color='success' />
                 {{/if}}
               </row.cell>
               <row.cell>
diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs
index 756637a59..fd1ad44da 100644
--- a/ui/admin/app/templates/scopes/scope/users/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/index.hbs
@@ -47,7 +47,7 @@
                   {{user.displayName}}
                 {{/if}}
                 {{#if user.accountName}}
-                  <br /><Rose::Badge>{{user.accountName}}</Rose::Badge>
+                  <br /><Hds::Badge @text={{user.accountName}} />
                 {{/if}}
                 <p>{{user.description}}</p>
               </row.headerCell>
diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
index f0d232570..97156defc 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
@@ -38,9 +38,11 @@
                 <p>{{account.description}}</p>
               </row.headerCell>
               <row.cell>
-                <Rose::Badge>
-                  {{t (concat 'resources.auth-method.types.' account.type)}}
-                </Rose::Badge>
+                <Hds::Badge
+                  @text={{t
+                    (concat 'resources.auth-method.types.' account.type)
+                  }}
+                />
               </row.cell>
               <row.cell>
                 <Copyable
diff --git a/ui/admin/app/templates/scopes/scope/workers/index.hbs b/ui/admin/app/templates/scopes/scope/workers/index.hbs
index a42af5e8e..fde2d14c0 100644
--- a/ui/admin/app/templates/scopes/scope/workers/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/index.hbs
@@ -121,12 +121,13 @@
                 {{/if}}
                 {{#if worker.tagCount}}
                   <div>
-                    <Rose::Badge @icon='flight-icons/svg/tag-16'>
-                      {{t
+                    <Hds::Badge
+                      @icon='tag'
+                      @text={{t
                         'resources.worker.table.tag_count'
                         tagCount=worker.tagCount
                       }}
-                    </Rose::Badge>
+                    />
                   </div>
                 {{/if}}
               </row.headerCell>