diff --git a/app/views/accounts/_auth_apps.html.erb b/app/views/accounts/_auth_apps.html.erb
index 4ebfaea727d..2d7658a7e3f 100644
--- a/app/views/accounts/_auth_apps.html.erb
+++ b/app/views/accounts/_auth_apps.html.erb
@@ -5,9 +5,11 @@
     </h2>
     <% if current_user.auth_app_configurations.count < Figaro.env.max_auth_apps_per_account.to_i %>
       <div class="right-align grid-col-6">
-        <div class="btn btn-account-action rounded-lg bg-light-blue">
-          <%= link_to t('forms.buttons.enable'), authenticator_setup_url %>
-        </div>
+        <%= link_to(
+          t('forms.buttons.enable'),
+          authenticator_setup_url,
+          class: 'btn btn-account-action rounded-lg bg-light-blue',
+        ) %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/accounts/_emails.html.erb b/app/views/accounts/_emails.html.erb
index d86112d15f1..901cba0c605 100644
--- a/app/views/accounts/_emails.html.erb
+++ b/app/views/accounts/_emails.html.erb
@@ -5,9 +5,11 @@
     </h2>
     <div class="right-align col col-6">
       <% if EmailPolicy.new(current_user).can_add_email? %>
-        <div class="btn btn-account-action rounded-lg bg-light-blue">
-          <%= link_to t('account.index.email_add'), add_email_path %>
-        </div>
+        <%= link_to(
+          t('account.index.email_add'),
+          add_email_path,
+          class: 'btn btn-account-action rounded-lg bg-light-blue',
+        ) %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/accounts/_phone.html.erb b/app/views/accounts/_phone.html.erb
index fbf564f219c..2d05259c301 100644
--- a/app/views/accounts/_phone.html.erb
+++ b/app/views/accounts/_phone.html.erb
@@ -5,9 +5,11 @@
     </h2>
     <div class="right-align grid-col-6">
       <% if EmailPolicy.new(current_user).can_add_email? %>
-        <div class="btn btn-account-action rounded-lg bg-light-blue">
-          <%= link_to t('account.index.phone_add'), add_phone_path %>
-        </div>
+        <%= link_to(
+          t('account.index.phone_add'),
+          add_phone_path,
+          class: 'btn btn-account-action rounded-lg bg-light-blue',
+        ) %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/accounts/_piv_cac.html.erb b/app/views/accounts/_piv_cac.html.erb
index 817cfd08f1a..4edaa31cece 100644
--- a/app/views/accounts/_piv_cac.html.erb
+++ b/app/views/accounts/_piv_cac.html.erb
@@ -5,9 +5,11 @@
     </h2>
     <% if current_user.piv_cac_configurations.count < Figaro.env.max_piv_cac_per_account.to_i %>
       <div class="right-align grid-col-6">
-        <div class="btn btn-account-action rounded-lg bg-light-blue">
-          <%= link_to t('forms.buttons.enable'), setup_piv_cac_url %>
-        </div>
+        <%= link_to(
+          t('forms.buttons.enable'),
+          setup_piv_cac_url,
+          class: 'btn btn-account-action rounded-lg bg-light-blue',
+        ) %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/accounts/_webauthn.html.erb b/app/views/accounts/_webauthn.html.erb
index d2c434122f0..9623a5b27cd 100644
--- a/app/views/accounts/_webauthn.html.erb
+++ b/app/views/accounts/_webauthn.html.erb
@@ -4,9 +4,11 @@
       <%= t('account.index.webauthn') %>
     </h2>
     <div class="right-align grid-col-6">
-      <div class="btn btn-account-action rounded-lg bg-light-blue">
-        <%= link_to t('account.index.webauthn_add'), webauthn_setup_path %>
-      </div>
+      <%= link_to(
+        t('account.index.webauthn_add'),
+        webauthn_setup_path,
+        class: 'btn btn-account-action rounded-lg bg-light-blue',
+      ) %>
     </div>
   </div>