diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss
index 352a4d16bc5..2161b1ec17a 100644
--- a/app/assets/stylesheets/components/_btn.scss
+++ b/app/assets/stylesheets/components/_btn.scss
@@ -96,18 +96,23 @@
   cursor: not-allowed;
 }
 
-.btn-account-action {
+.account-action-button {
+  @include u-radius('lg');
+  background-color: color('primary-lighter');
   border: 0;
   color: $blue;
+  display: inline-block;
   font-size: .8125rem;
   font-weight: normal;
+  line-height: 1.375rem;
   margin-bottom: -3px;
   margin-top: -3px;
   padding: .5rem;
   padding-bottom: .125rem;
   padding-top: .125rem;
 
-  a {
+  &,
+  &:hover {
     text-decoration: none;
   }
 }
diff --git a/app/views/accounts/_auth_apps.html.erb b/app/views/accounts/_auth_apps.html.erb
index f9e75c708bc..f9ea4e81455 100644
--- a/app/views/accounts/_auth_apps.html.erb
+++ b/app/views/accounts/_auth_apps.html.erb
@@ -8,7 +8,7 @@
         <%= link_to(
           prefix_with_plus(t('account.index.auth_app_add')),
           authenticator_setup_url,
-          class: 'btn btn-account-action rounded-lg bg-light-blue',
+          class: 'account-action-button',
         ) %>
       </div>
     <% end %>
diff --git a/app/views/accounts/_emails.html.erb b/app/views/accounts/_emails.html.erb
index 8c98fe7a9d6..3f16e8e9762 100644
--- a/app/views/accounts/_emails.html.erb
+++ b/app/views/accounts/_emails.html.erb
@@ -8,7 +8,7 @@
         <%= link_to(
           prefix_with_plus(t('account.index.email_add')),
           add_email_path,
-          class: 'btn btn-account-action rounded-lg bg-light-blue',
+          class: 'account-action-button',
         ) %>
       <% end %>
     </div>
diff --git a/app/views/accounts/_phone.html.erb b/app/views/accounts/_phone.html.erb
index 304adaea584..652ee5a435a 100644
--- a/app/views/accounts/_phone.html.erb
+++ b/app/views/accounts/_phone.html.erb
@@ -8,7 +8,7 @@
         <%= link_to(
           prefix_with_plus(t('account.index.phone_add')),
           add_phone_path,
-          class: 'btn btn-account-action rounded-lg bg-light-blue',
+          class: 'account-action-button',
         ) %>
       <% end %>
     </div>
diff --git a/app/views/accounts/_piv_cac.html.erb b/app/views/accounts/_piv_cac.html.erb
index 2d471bc57d0..64dafb15192 100644
--- a/app/views/accounts/_piv_cac.html.erb
+++ b/app/views/accounts/_piv_cac.html.erb
@@ -8,7 +8,7 @@
         <%= link_to(
           prefix_with_plus(t('account.index.piv_cac_add')),
           setup_piv_cac_url,
-          class: 'btn btn-account-action rounded-lg bg-light-blue',
+          class: 'account-action-button',
         ) %>
       </div>
     <% end %>
diff --git a/app/views/accounts/_webauthn.html.erb b/app/views/accounts/_webauthn.html.erb
index bafa1f26ebb..2cd64b59d57 100644
--- a/app/views/accounts/_webauthn.html.erb
+++ b/app/views/accounts/_webauthn.html.erb
@@ -7,7 +7,7 @@
       <%= link_to(
         prefix_with_plus(t('account.index.webauthn_add')),
         webauthn_setup_path,
-        class: 'btn btn-account-action rounded-lg bg-light-blue',
+        class: 'account-action-button',
       ) %>
     </div>
   </div>
diff --git a/app/views/accounts/actions/_generate_backup_codes.html.erb b/app/views/accounts/actions/_generate_backup_codes.html.erb
index 2cf34502815..b032a32e775 100644
--- a/app/views/accounts/actions/_generate_backup_codes.html.erb
+++ b/app/views/accounts/actions/_generate_backup_codes.html.erb
@@ -1,3 +1,3 @@
 <%= link_to prefix_with_plus(t('forms.backup_code.generate')),
             backup_code_create_path,
-            class: 'btn btn-account-action rounded-lg bg-light-blue' %>
+            class: 'account-action-button' %>
diff --git a/app/views/accounts/actions/_regenerate_backup_codes.html.erb b/app/views/accounts/actions/_regenerate_backup_codes.html.erb
index b5519654d83..bfacaa02eee 100644
--- a/app/views/accounts/actions/_regenerate_backup_codes.html.erb
+++ b/app/views/accounts/actions/_regenerate_backup_codes.html.erb
@@ -1,3 +1,3 @@
-<%= link_to backup_code_regenerate_path, class: 'btn btn-account-action rounded-lg bg-light-blue' do %>
+<%= link_to backup_code_regenerate_path, class: 'account-action-button' do %>
   <%= prefix_with_plus(t('forms.backup_code.regenerate')) %>
 <% end %>