diff --git a/ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs
index ec74baae3..6a0f80770 100644
--- a/ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/accounts/account/actions/index.hbs
@@ -6,10 +6,8 @@
 {{#if (can 'delete account' @model)}}
   <Hds::Dropdown data-test-manage-account-auth-method as |dd|>
     <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
-    <dd.Interactive
-      @text={{t 'resources.account.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>{{t
+        'resources.account.actions.delete'
+      }}</dd.Interactive>
   </Hds::Dropdown>
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
index a8fbd12d8..5586c0a22 100644
--- a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
@@ -43,39 +43,37 @@
 <Hds::Dropdown data-test-manage-auth-method as |dd|>
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
   {{#if @model.isPrimary}}
-    <dd.Interactive
-      @text={{t 'resources.auth-method.actions.remove-as-primary'}}
-      {{on 'click' (fn @removeAsPrimary @model)}}
-    />
+    <dd.Interactive {{on 'click' (fn @removeAsPrimary @model)}}>
+      {{t 'resources.auth-method.actions.remove-as-primary'}}
+    </dd.Interactive>
   {{else}}
-    <dd.Interactive
-      @text={{t 'resources.auth-method.actions.make-primary'}}
-      {{on 'click' (fn @makePrimary @model)}}
-    />
+    <dd.Interactive {{on 'click' (fn @makePrimary @model)}}>
+      {{t 'resources.auth-method.actions.make-primary'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'create model' @model collection='accounts')}}
     <dd.Interactive
-      @text={{t 'resources.account.actions.create'}}
       @route='scopes.scope.auth-methods.auth-method.accounts.new'
       @model={{@model}}
-    />
+    >
+      {{t 'resources.account.actions.create'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'create model' @model collection='managed-groups')}}
     {{#if (or @model.isOIDC @model.isLDAP)}}
       <dd.Interactive
-        @text={{t 'resources.managed-group.actions.create'}}
         @route='scopes.scope.auth-methods.auth-method.managed-groups.new'
         @model={{@model}}
-      />
+      >
+        {{t 'resources.managed-group.actions.create'}}
+      </dd.Interactive>
     {{/if}}
   {{/if}}
 
   {{#if (can 'delete auth-method' @model)}}
     <dd.Separator />
-    <dd.Interactive
-      @text={{t 'resources.auth-method.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>
+      {{t 'resources.auth-method.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
index ce1240c41..84dfe9421 100644
--- a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/actions/index.hbs
@@ -6,10 +6,8 @@
 {{#if (can 'delete model' @model)}}
   <Hds::Dropdown data-test-managed-group-dropdown as |dd|>
     <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
-    <dd.Interactive
-      @text={{t 'resources.managed-group.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>{{t
+        'resources.managed-group.actions.delete'
+      }}</dd.Interactive>
   </Hds::Dropdown>
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs b/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
index fe93c9560..f205e1110 100644
--- a/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
+++ b/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
@@ -7,21 +7,21 @@
   {{#if (can 'create model' @model collection='credential-libraries')}}
     <dd.Interactive
       @route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
-      @text={{t 'resources.credential-library.actions.create'}}
-    />
+    >
+      {{t 'resources.credential-library.actions.create'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'create model' @model collection='credentials')}}
     <dd.Interactive
       @route='scopes.scope.credential-stores.credential-store.credentials.new'
-      @text={{t 'resources.credential.actions.create'}}
-    />
+    >
+      {{t 'resources.credential.actions.create'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'delete model' @model)}}
     <dd.Separator />
-    <dd.Interactive
-      @text={{t 'resources.credential-store.actions.delete'}}
-      @color='critical'
-      {{on 'click' @delete}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' @delete}}>
+      {{t 'resources.credential-store.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/groups/group/actions/index.hbs b/ui/admin/app/components/groups/group/actions/index.hbs
index 9c81696ff..813094ec1 100644
--- a/ui/admin/app/components/groups/group/actions/index.hbs
+++ b/ui/admin/app/components/groups/group/actions/index.hbs
@@ -6,18 +6,18 @@
 <Hds::Dropdown data-test-manage-group-dropdown as |dd|>
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
   {{#if (can 'addMembers group' @model)}}
-    <dd.Interactive
-      @route='scopes.scope.groups.group.add-members'
-      @text={{t 'resources.group.actions.add-members'}}
-    />
+    <dd.Interactive @route='scopes.scope.groups.group.add-members'>
+      {{t 'resources.group.actions.add-members'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'delete model' @model)}}
     <dd.Separator />
     <dd.Interactive
       @color='critical'
       @disabled={{@model.canSave}}
-      @text={{t 'resources.group.actions.delete'}}
       {{on 'click' @delete}}
-    />
+    >
+      {{t 'resources.group.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/actions/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/actions/index.hbs
index ee745943f..61d85b43d 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/actions/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/actions/index.hbs
@@ -9,22 +9,22 @@
     <dd.Interactive
       @route='scopes.scope.host-catalogs.host-catalog.hosts.new'
       @model={{@model}}
-      @text={{t 'resources.host.actions.create'}}
-    />
+    >
+      {{t 'resources.host.actions.create'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'create model' @model collection='host-sets')}}
     <dd.Interactive
       @route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
       @model={{@model}}
-      @text={{t 'resources.host-set.actions.create'}}
-    />
+    >
+      {{t 'resources.host-set.actions.create'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'delete model' @model)}}
     <dd.Separator />
-    <dd.Interactive
-      @text={{t 'resources.host-catalog.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>
+      {{t 'resources.host-catalog.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/actions/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/actions/index.hbs
index 932629510..d50ee384f 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/actions/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/actions/index.hbs
@@ -8,20 +8,20 @@
 
   {{#if (can 'addHosts hostSet' @model)}}
     <dd.Interactive
-      @text={{t 'resources.host-set.actions.create-and-add-host'}}
       @route='scopes.scope.host-catalogs.host-catalog.host-sets.host-set.create-and-add-host'
-    />
+    >
+      {{t 'resources.host-set.actions.create-and-add-host'}}
+    </dd.Interactive>
     <dd.Interactive
-      @text={{t 'resources.host-set.actions.add-hosts'}}
       @route='scopes.scope.host-catalogs.host-catalog.host-sets.host-set.add-hosts'
-    />
+    >
+      {{t 'resources.host-set.actions.add-hosts'}}
+    </dd.Interactive>
     <dd.Separator />
   {{/if}}
   {{#if (can 'delete model' @model)}}
-    <dd.Interactive
-      @text={{t 'resources.host-set.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>
+      {{t 'resources.host-set.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/actions/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/actions/index.hbs
index 631a7f321..3c77294cd 100644
--- a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/actions/index.hbs
+++ b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/actions/index.hbs
@@ -6,10 +6,8 @@
 {{#if (can 'delete model' @model)}}
   <Hds::Dropdown data-test-manage-hosts-dropdown as |dd|>
     <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
-    <dd.Interactive
-      @text={{t 'resources.host.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>{{t
+        'resources.host.actions.delete'
+      }}</dd.Interactive>
   </Hds::Dropdown>
 {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/roles/role/actions/index.hbs b/ui/admin/app/components/roles/role/actions/index.hbs
index caf919ce4..3f1aa3f0d 100644
--- a/ui/admin/app/components/roles/role/actions/index.hbs
+++ b/ui/admin/app/components/roles/role/actions/index.hbs
@@ -7,25 +7,28 @@
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
   {{#if (can 'addPrincipals role' @model)}}
     <dd.Interactive
-      @text={{t 'resources.role.principal.actions.add-principals'}}
       @route='scopes.scope.roles.role.add-principals'
       data-test-manage-dropdown-principals
-    />
+    >
+      {{t 'resources.role.principal.actions.add-principals'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'setGrantScopes role' @model)}}
     <dd.Interactive
-      @text={{t 'resources.role.scope.actions.manage-scopes'}}
       @route='scopes.scope.roles.role.manage-scopes'
       data-test-manage-dropdown-scopes
-    />
+    >
+      {{t 'resources.role.scope.actions.manage-scopes'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'delete model' @model)}}
     <dd.Separator />
     <dd.Interactive
-      @text={{t 'resources.role.actions.delete'}}
       @color='critical'
       @disabled={{@model.canSave}}
       {{on 'click' (fn @delete @model)}}
-    />
+    >
+      {{t 'resources.role.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/targets/target/actions/index.hbs b/ui/admin/app/components/targets/target/actions/index.hbs
index a4bc5d052..0ce7ac6da 100644
--- a/ui/admin/app/components/targets/target/actions/index.hbs
+++ b/ui/admin/app/components/targets/target/actions/index.hbs
@@ -6,35 +6,34 @@
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
 
   {{#if (can 'addHostSources target' @model)}}
-    <dd.Interactive
-      @route='scopes.scope.targets.target.add-host-sources'
-      @text={{t 'resources.target.actions.add-host-sources'}}
-    />
+    <dd.Interactive @route='scopes.scope.targets.target.add-host-sources'>
+      {{t 'resources.target.actions.add-host-sources'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'addBrokeredCredentialSources target' @model)}}
     <dd.Interactive
       @route='scopes.scope.targets.target.add-brokered-credential-sources'
-      @text={{t 'resources.target.actions.add-brokered-credential-sources'}}
       data-test-add-brokered-cred-sources-action
-    />
+    >
+      {{t 'resources.target.actions.add-brokered-credential-sources'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'addInjectedApplicationCredentialSources target' @model)}}
     <dd.Interactive
       @route='scopes.scope.targets.target.add-injected-application-credential-sources'
-      @text={{t
+      data-test-add-injected-cred-sources-action
+    >
+      {{t
         'resources.target.actions.add-injected-application-credential-sources'
       }}
-      data-test-add-injected-cred-sources-action
-    />
+    </dd.Interactive>
   {{/if}}
 
   {{#if (can 'delete model' @model)}}
     <dd.Separator />
-    <dd.Interactive
-      @text={{t 'resources.target.actions.delete'}}
-      @color='critical'
-      {{on 'click' (fn @delete @model)}}
-    />
+    <dd.Interactive @color='critical' {{on 'click' (fn @delete @model)}}>
+      {{t 'resources.target.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/users/user/actions/index.hbs b/ui/admin/app/components/users/user/actions/index.hbs
index 5ef7527ba..96ca3068f 100644
--- a/ui/admin/app/components/users/user/actions/index.hbs
+++ b/ui/admin/app/components/users/user/actions/index.hbs
@@ -6,10 +6,9 @@
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
 
   {{#if (can 'addAccounts user' @model)}}
-    <dd.Interactive
-      @route='scopes.scope.users.user.add-accounts'
-      @text={{t 'resources.user.actions.add-accounts'}}
-    />
+    <dd.Interactive @route='scopes.scope.users.user.add-accounts'>
+      {{t 'resources.user.actions.add-accounts'}}
+    </dd.Interactive>
   {{/if}}
 
   {{#if (can 'delete model' @model)}}
@@ -17,8 +16,9 @@
     <dd.Interactive
       @color='critical'
       @disabled={{@model.canSave}}
-      @text={{t 'resources.user.actions.delete'}}
       {{on 'click' (fn @delete @model)}}
-    />
+    >
+      {{t 'resources.user.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/components/workers/worker/actions/index.hbs b/ui/admin/app/components/workers/worker/actions/index.hbs
index 0b8a2abe1..cce6048f3 100644
--- a/ui/admin/app/components/workers/worker/actions/index.hbs
+++ b/ui/admin/app/components/workers/worker/actions/index.hbs
@@ -6,17 +6,17 @@
 <Hds::Dropdown data-test-manage-worker-dropdown as |dd|>
   <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
   {{#if (can 'setWorkerTags worker' @model)}}
-    <dd.Interactive
-      @text={{t 'resources.worker.actions.create_tags'}}
-      @route='scopes.scope.workers.worker.create-tags'
-    />
+    <dd.Interactive @route='scopes.scope.workers.worker.create-tags'>
+      {{t 'resources.worker.actions.create_tags'}}
+    </dd.Interactive>
   {{/if}}
   {{#if (can 'delete worker' @model)}}
     <dd.Interactive
       @icon='trash'
-      @text={{t 'resources.worker.actions.delete'}}
       @color='critical'
       {{on 'click' (fn @delete @model)}}
-    />
+    >
+      {{t 'resources.worker.actions.delete'}}
+    </dd.Interactive>
   {{/if}}
 </Hds::Dropdown>
\ No newline at end of file
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 80be0597b..bd97059fe 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs
@@ -37,17 +37,19 @@
           <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
           {{#if (and perms.canUpdate @model.destination_id)}}
             <dd.Interactive
-              @text={{t 'actions.clear'}}
               @color='action'
               {{on 'click' (fn this.aliases.clearAlias @model)}}
-            />
+            >
+              {{t 'actions.clear'}}
+            </dd.Interactive>
           {{/if}}
           {{#if perms.canDelete}}
             <dd.Interactive
               @color='critical'
-              @text={{t 'actions.delete'}}
               {{on 'click' (fn this.aliases.deleteAlias @model)}}
-            />
+            >
+              {{t 'actions.delete'}}
+            </dd.Interactive>
           {{/if}}
         </Hds::Dropdown>
 
diff --git a/ui/admin/app/templates/scopes/scope/aliases/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
index 2631db80d..d4cc1d7a3 100644
--- a/ui/admin/app/templates/scopes/scope/aliases/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/aliases/index.hbs
@@ -121,23 +121,26 @@
                         <dd.Interactive
                           @route='scopes.scope.aliases.alias'
                           @model={{B.data.alias.id}}
-                          @text={{t 'actions.edit'}}
-                        />
+                        >
+                          {{t 'actions.edit'}}
+                        </dd.Interactive>
                         {{#if B.data.alias.destination_id}}
                           <dd.Interactive
-                            @text={{t 'actions.clear'}}
                             @color='action'
                             {{on 'click' (fn this.clearAlias B.data.alias)}}
-                          />
+                          >
+                            {{t 'actions.clear'}}
+                          </dd.Interactive>
                         {{/if}}
                       {{/if}}
 
                       {{#if perms.canDelete}}
                         <dd.Interactive
                           @color='critical'
-                          @text={{t 'actions.delete'}}
                           {{on 'click' (fn this.deleteAlias B.data.alias)}}
-                        />
+                        >
+                          {{t 'actions.delete'}}
+                        </dd.Interactive>
                       {{/if}}
                     </Hds::Dropdown>
 
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 20b9e281d..4222f2cf2 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -21,21 +21,20 @@
       <Hds::Dropdown data-test-new-dropdown as |dd|>
         <dd.ToggleButton @text={{t 'titles.new'}} @color='secondary' />
         <dd.Interactive
-          @text={{t 'resources.auth-method.types.password'}}
           @route='scopes.scope.auth-methods.new'
           @query={{hash type='password'}}
-        />
+        >{{t 'resources.auth-method.types.password'}}</dd.Interactive>
         <dd.Interactive
-          @text={{t 'resources.auth-method.types.oidc'}}
           @route='scopes.scope.auth-methods.new'
           @query={{hash type='oidc'}}
-        />
+        >{{t 'resources.auth-method.types.oidc'}}</dd.Interactive>
         {{#if (feature-flag 'ldap-auth-methods')}}
           <dd.Interactive
-            @text={{t 'resources.auth-method.types.ldap'}}
             @route='scopes.scope.auth-methods.new'
             @query={{hash type='ldap'}}
-          />
+          >
+            {{t 'resources.auth-method.types.ldap'}}
+          </dd.Interactive>
         {{/if}}
       </Hds::Dropdown>
     {{/if}}
@@ -150,18 +149,18 @@
                     />
                     {{#unless B.data.isPrimary}}
                       <dd.Interactive
-                        @text={{t 'resources.auth-method.actions.make-primary'}}
                         data-test-make-primary-action
                         {{on 'click' (fn this.makePrimary B.data)}}
-                      />
+                      >
+                        {{t 'resources.auth-method.actions.make-primary'}}
+                      </dd.Interactive>
                     {{/unless}}
                     {{#if B.data.isPrimary}}
                       <dd.Interactive
-                        @text={{t
-                          'resources.auth-method.actions.remove-as-primary'
-                        }}
                         {{on 'click' (fn this.removeAsPrimary B.data)}}
-                      />
+                      >
+                        {{t 'resources.auth-method.actions.remove-as-primary'}}
+                      </dd.Interactive>
                     {{/if}}
                   </Hds::Dropdown>
                 {{/if}}
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 1abe1f856..8e361f4b2 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
@@ -34,10 +34,9 @@
         <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
 
         <dd.Interactive
-          @text={{t 'resources.credential-library.actions.delete'}}
           @color='critical'
           {{on 'click' (fn this.credentialLibraries.delete @model)}}
-        />
+        >{{t 'resources.credential-library.actions.delete'}}</dd.Interactive>
       </Hds::Dropdown>
     {{/if}}
   </page.actions>
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 a18aec87d..e746f628a 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
@@ -34,9 +34,8 @@
         <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
         <dd.Interactive
           @color='critical'
-          @text={{t 'resources.credential.actions.delete'}}
           {{on 'click' (fn this.credentials.delete @model)}}
-        />
+        >{{t 'resources.credential.actions.delete'}}</dd.Interactive>
       </Hds::Dropdown>
     {{/if}}
   </page.actions>
diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index a66fe154a..a9025bb54 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -60,15 +60,14 @@
         <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
         <dd.Interactive
           @color='critical'
-          @text={{t
+          {{on 'click' (fn this.scopes.delete @model)}}
+        >{{t
             (if
               @model.isOrg
               'resources.org.actions.delete'
               'resources.project.actions.delete'
             )
-          }}
-          {{on 'click' (fn this.scopes.delete @model)}}
-        />
+          }}</dd.Interactive>
       </Hds::Dropdown>
     </page.actions>
   {{/if}}
@@ -165,17 +164,15 @@
                       <dd.Interactive
                         @route='scopes.scope.policies.policy'
                         @model={{this.storage_policy.id}}
-                        @text={{t 'actions.view'}}
-                      />
+                      >{{t 'actions.view'}}</dd.Interactive>
                       <dd.Separator />
                       <dd.Interactive
-                        @text={{t 'resources.policy.actions.detach'}}
                         @color='critical'
                         {{on
                           'click'
                           (fn this.scopes.detachStoragePolicy @model)
                         }}
-                      />
+                      >{{t 'resources.policy.actions.detach'}}</dd.Interactive>
                     </Hds::Dropdown>
                   </P.Item>
                 {{/if}}
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
index 491548518..b10c84277 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
@@ -75,12 +75,11 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn this.groups.removeMember @model.group B.data)
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs
index fb7a08203..72f63cb50 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs
@@ -74,13 +74,12 @@
                     />
                     <dd.Interactive
                       data-test-host-set-hosts-dropdown-remove-host
-                      @text={{t 'actions.remove'}}
                       @color='critical'
                       {{on
                         'click'
                         (fn this.hostSets.removeHost @model.hostSet B.data)
                       }}
-                    />
+                    >{{t 'actions.remove'}}</dd.Interactive>
                   </Hds::Dropdown>
                 {{/if}}
               </B.Td>
diff --git a/ui/admin/app/templates/scopes/scope/policies/index.hbs b/ui/admin/app/templates/scopes/scope/policies/index.hbs
index e3c722755..34b5f8d99 100644
--- a/ui/admin/app/templates/scopes/scope/policies/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/policies/index.hbs
@@ -97,18 +97,20 @@
                       <dd.Interactive
                         @route='scopes.scope.policies.policy'
                         @model={{B.data.id}}
-                        @text={{t 'actions.edit'}}
-                      />
+                      >
+                        {{t 'actions.edit'}}
+                      </dd.Interactive>
                     {{/if}}
                     {{#if (and perms.canRead perms.canDelete)}}
                       <dd.Separator />
                     {{/if}}
                     {{#if perms.canDelete}}
                       <dd.Interactive
-                        @text={{t 'resources.policy.actions.delete'}}
                         @color='critical'
                         {{on 'click' (fn this.delete B.data)}}
-                      />
+                      >
+                        {{t 'resources.policy.actions.delete'}}
+                      </dd.Interactive>
                     {{/if}}
                   </Hds::Dropdown>
                 {{/if}}
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 b9a743432..ba293dd21 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -83,12 +83,11 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn this.roles.removePrincipal @model.role B.data)
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
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 70e76c213..087858f31 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
@@ -24,17 +24,17 @@
         />
 
         <dd.Interactive
-          @text={{t 'resources.policy.actions.update'}}
           {{on 'click' (fn this.reapplyStoragePolicy @model.sessionRecording)}}
-        />
+        >{{t 'resources.policy.actions.update'}}</dd.Interactive>
         {{#if (can 'delete session-recording' @model.sessionRecording)}}
           <dd.Separator />
           <dd.Interactive
             data-test-manage-dropdown-delete
             @color='critical'
-            @text={{t 'resources.policy.actions.delete_recording'}}
             {{on 'click' (fn this.delete @model.sessionRecording)}}
-          />
+          >
+            {{t 'resources.policy.actions.delete_recording'}}
+          </dd.Interactive>
         {{/if}}
       </Hds::Dropdown>
     {{/if}}
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 058e2ea2d..6104e2a1a 100644
--- a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
@@ -109,18 +109,20 @@
                       <dd.Interactive
                         @route='scopes.scope.storage-buckets.storage-bucket'
                         @model={{B.data.id}}
-                        @text={{t 'actions.edit'}}
-                      />
+                      >
+                        {{t 'actions.edit'}}
+                      </dd.Interactive>
                     {{/if}}
                     {{#if (and perms.canRead perms.canDelete)}}
                       <dd.Separator />
                     {{/if}}
                     {{#if perms.canDelete}}
                       <dd.Interactive
-                        @text={{t 'resources.storage-bucket.actions.delete'}}
                         @color='critical'
                         {{on 'click' (fn this.delete B.data)}}
-                      />
+                      >
+                        {{t 'resources.storage-bucket.actions.delete'}}
+                      </dd.Interactive>
                     {{/if}}
                   </Hds::Dropdown>
                 {{/if}}
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 b80fd22aa..746a4cd78 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
@@ -21,10 +21,9 @@
       <Hds::Dropdown as |dd|>
         <dd.ToggleButton @text={{t 'actions.manage'}} @color='secondary' />
         <dd.Interactive
-          @text={{t 'actions.delete'}}
           @color='critical'
           {{on 'click' (fn this.storageBuckets.delete @model)}}
-        />
+        >{{t 'actions.delete'}}</dd.Interactive>
       </Hds::Dropdown>
     </page.actions>
   {{/if}}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs
index a0e4f18fd..4adf3821a 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs
@@ -87,7 +87,6 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn
@@ -96,7 +95,7 @@
                         B.data
                       )
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
index 08e669d00..3b4524e16 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
@@ -77,12 +77,11 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn this.targets.removeHostSource @model B.data.model)
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs
index 9c63210ce..0a4e31f41 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs
@@ -91,7 +91,6 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn
@@ -100,7 +99,7 @@
                         B.data
                       )
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
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 8f48de53b..33717ccf1 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
@@ -44,17 +44,17 @@
             @color='secondary'
           />
           {{#if (and perms.canUpdate @model.destination_id)}}
-            <dd.Interactive
-              @text={{t 'actions.clear'}}
-              {{on 'click' (fn this.targets.clearAlias @model)}}
-            />
+            <dd.Interactive {{on 'click' (fn this.targets.clearAlias @model)}}>
+              {{t 'actions.clear'}}
+            </dd.Interactive>
           {{/if}}
           {{#if perms.canDelete}}
             <dd.Interactive
               @color='critical'
-              @text={{t 'actions.delete'}}
               {{on 'click' (fn this.targets.deleteAlias @model)}}
-            />
+            >
+              {{t 'actions.delete'}}
+            </dd.Interactive>
           {{/if}}
         </Hds::Dropdown>
       {{/if}}
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 f773afe14..b750196fc 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs
@@ -79,12 +79,11 @@
                   />
                   <dd.Interactive
                     @color='critical'
-                    @text={{t 'actions.remove'}}
                     {{on
                       'click'
                       (fn this.users.removeAccount @model.user B.data)
                     }}
-                  />
+                  >{{t 'actions.remove'}}</dd.Interactive>
                 </Hds::Dropdown>
               {{/if}}
             </B.Td>
diff --git a/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs b/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
index 37c4150cb..f20d21ad1 100644
--- a/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
@@ -87,16 +87,18 @@
                       />
                       {{#if perms.canEdit}}
                         <dd.Interactive
-                          @text={{t 'resources.worker.tags.edit.title'}}
                           {{on 'click' (fn this.toggleEditModal B.data)}}
-                        />
+                        >
+                          {{t 'resources.worker.tags.edit.title'}}
+                        </dd.Interactive>
                       {{/if}}
                       {{#if perms.canRemove}}
                         <dd.Interactive
-                          @text={{t 'resources.worker.tags.actions.remove'}}
                           @color='critical'
                           {{on 'click' (fn this.toggleRemoveModal B.data)}}
-                        />
+                        >
+                          {{t 'resources.worker.tags.actions.remove'}}
+                        </dd.Interactive>
                       {{/if}}
                     </Hds::Dropdown>
                   {{/if}}
diff --git a/ui/desktop/app/components/session/proxy-url/index.hbs b/ui/desktop/app/components/session/proxy-url/index.hbs
index 36b729fe2..e3cc015e4 100644
--- a/ui/desktop/app/components/session/proxy-url/index.hbs
+++ b/ui/desktop/app/components/session/proxy-url/index.hbs
@@ -7,7 +7,6 @@
   <Hds::Dropdown @listPosition='bottom-left' as |dd|>
     <dd.ToggleButton @color='secondary' @text={{this.selectedValue}} />
     <dd.Interactive
-      @text={{t 'resources.session.proxy-url.address-port'}}
       {{on
         'click'
         (fn
@@ -16,15 +15,14 @@
           dd.close
         )
       }}
-    />
+    >{{t 'resources.session.proxy-url.address-port'}}</dd.Interactive>
     <dd.Interactive
       data-test-ssh-option
-      @text={{t 'resources.session.proxy-url.ssh'}}
       {{on
         'click'
         (fn this.updateContent (t 'resources.session.proxy-url.ssh') dd.close)
       }}
-    />
+    >{{t 'resources.session.proxy-url.ssh'}}</dd.Interactive>
   </Hds::Dropdown>
   {{#if this.isAddressAndPort}}
     <Hds::Copy::Snippet