diff --git a/.erb-lint.yml b/.erb-lint.yml
index d4efff7188d..c21c7a97183 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -66,13 +66,13 @@ linters:
           - 'flex-(column|none)'
           - '(items|self|justify|content)-(start|end|center|baseline|stretch)'
           - 'order-([0-3]|last)'
-          - 'not-rounded'
-          - 'rounded-(top|right|bottom|left)'
+          - 'circle'
+          - '(not-)?rounded(-(top|right|bottom|left|lg))?'
           - '((sm|md|lg)-)?hide'
           - '(sm|md|lg)-show'
           - 'btn(-(small|big|narrow|wide|link|primary|secondary|danger|disabled|big|narrow|transparent))?'
           - ':not(label).btn-border'
-          - 'border-(black|gray|white|aqua|orange|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])'
+          - 'border-(none|black|gray|white|aqua|orange|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])'
           - 'h3'
         suggestion: 'Use USWDS classes instead of BassCSS.'
       - deprecated:
diff --git a/app/assets/stylesheets/_vendor.scss b/app/assets/stylesheets/_vendor.scss
index 8486e419148..d253180cb6f 100644
--- a/app/assets/stylesheets/_vendor.scss
+++ b/app/assets/stylesheets/_vendor.scss
@@ -13,7 +13,6 @@
 @import 'basscss-sass/positions';
 @import 'basscss-sass/grid';
 @import 'basscss-sass/flex-object';
-@import 'basscss-sass/borders';
 @import 'basscss-sass/colors';
 @import 'basscss-sass/background-colors';
 @import 'basscss-sass/background-images';
diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss
index 50e74e0cf7b..b5c59b4ba08 100644
--- a/app/assets/stylesheets/components/_btn.scss
+++ b/app/assets/stylesheets/components/_btn.scss
@@ -1,6 +1,6 @@
 .btn-border {
   border-color: $border-color;
-  border-radius: $border-radius-lg;
+  border-radius: 8px;
   border-style: solid;
   border-width: $border-width;
   box-sizing: border-box;
diff --git a/app/assets/stylesheets/components/_list.scss b/app/assets/stylesheets/components/_list.scss
index 613928658ad..34aeef3e211 100644
--- a/app/assets/stylesheets/components/_list.scss
+++ b/app/assets/stylesheets/components/_list.scss
@@ -18,6 +18,7 @@
 }
 
 .circle-number {
+  border-radius: 50%;
   font-size: 1rem;
   font-weight: bold;
   height: 1.6rem;
diff --git a/app/assets/stylesheets/utilities/_border.scss b/app/assets/stylesheets/utilities/_border.scss
index fdb2bc43990..6a6591979ba 100644
--- a/app/assets/stylesheets/utilities/_border.scss
+++ b/app/assets/stylesheets/utilities/_border.scss
@@ -1,5 +1,4 @@
 .border-dashed { border-style: dashed; }
 
-.rounded-lg { border-radius: $border-radius-lg; }
 .rounded-xl { border-radius: $border-radius-xl; }
 .rounded-xxl { border-radius: $border-radius-xxl; }
diff --git a/app/assets/stylesheets/variables/_app.scss b/app/assets/stylesheets/variables/_app.scss
index ce9c1271948..1bea6810e77 100644
--- a/app/assets/stylesheets/variables/_app.scss
+++ b/app/assets/stylesheets/variables/_app.scss
@@ -71,9 +71,7 @@ $lighten-3: rgba(255, 255, 255, .25) !default;
 $lighten-4: rgba(255, 255, 255, .5) !default;
 
 $border-width: 1px !default;
-$border-radius: 2px !default;
 $border-radius-md: 6px !default;
-$border-radius-lg: 8px !default;
 $border-radius-xl: 16px !default;
 $border-radius-xxl: 24px !default;
 $border-color: #cedced !default;
diff --git a/app/views/account_reset/confirm_delete_account/show.html.erb b/app/views/account_reset/confirm_delete_account/show.html.erb
index e1a255e8410..3da2d3bbecc 100644
--- a/app/views/account_reset/confirm_delete_account/show.html.erb
+++ b/app/views/account_reset/confirm_delete_account/show.html.erb
@@ -1,5 +1,5 @@
 <% title t('account_reset.confirm_delete_account.title') %>
-<div class="margin-y-2 padding-4 tablet:padding-x-6 border border-red rounded rounded-xl relative">
+<div class="margin-y-2 padding-4 tablet:padding-x-6 border border-red rounded-xl relative">
   <%= image_tag(asset_url('alert/fail-x.svg'),
                 size: '48x48',
                 alt: '',
diff --git a/app/views/accounts/_personal_key.html.erb b/app/views/accounts/_personal_key.html.erb
index f17307bc6cb..a757ac96739 100644
--- a/app/views/accounts/_personal_key.html.erb
+++ b/app/views/accounts/_personal_key.html.erb
@@ -6,7 +6,7 @@
   <p>
     <%= t('idv.messages.personal_key') %>
   </p>
-  <div class="margin-bottom-1 padding-y-1 padding-x-2 inline-block fs-20p text-normal monospace bg-white rounded">
+  <div class="margin-bottom-1 padding-y-1 padding-x-2 inline-block fs-20p text-normal monospace bg-white radius-sm">
     <%= view_model.personal_key %>
   </div>
 <% end %>
diff --git a/app/views/idv/doc_auth/welcome.html.erb b/app/views/idv/doc_auth/welcome.html.erb
index ecb5bce8102..1063c800435 100644
--- a/app/views/idv/doc_auth/welcome.html.erb
+++ b/app/views/idv/doc_auth/welcome.html.erb
@@ -9,7 +9,7 @@
 
   <ul class='list-reset'>
     <li class='padding-top-2 padding-bottom-1'>
-      <div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
+      <div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
         <%= step += 1 %>
       </div>
       <div class='margin-right-1 inline-block'>
@@ -24,7 +24,7 @@
     </li>
     <% if liveness_checking_enabled? %>
       <li class='padding-top-2 padding-bottom-1'>
-        <div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
+        <div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
           <%= step += 1 %>
         </div>
         <div class='margin-right-1 inline-block'>
@@ -40,7 +40,7 @@
     <% end %>
     <li class='padding-top-2 padding-bottom-1'>
       <div class="grid-row">
-        <div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
+        <div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
           <%= step += 1 %>
         </div>
         <div class='grid-col-10'>
@@ -56,7 +56,7 @@
     </li>
     <li class='padding-top-2 padding-bottom-1'>
       <div class="grid-row">
-        <div class='grid-col-2 margin-right-2 text-top circle circle-number bg-blue white'>
+        <div class='grid-col-2 margin-right-2 text-top circle-number bg-blue white'>
           <%= step += 1 %>
         </div>
         <div class='grid-col-10'>
diff --git a/app/views/idv/otp_delivery_method/new.html.erb b/app/views/idv/otp_delivery_method/new.html.erb
index 8e2787c48d5..dc774df6463 100644
--- a/app/views/idv/otp_delivery_method/new.html.erb
+++ b/app/views/idv/otp_delivery_method/new.html.erb
@@ -23,7 +23,7 @@
       method: :put
     ) do |f| %>
 
-  <fieldset class="margin-bottom-4 padding-0 border-none">
+  <fieldset class="margin-bottom-4 padding-0 border-0">
     <label class="btn-border col-12 margin-bottom-1">
       <div class="radio">
         <%= radio_button_tag 'otp_delivery_preference', :sms, false, class: :otp_delivery_preference_sms %>
diff --git a/app/views/shared/_footer_lite.html.erb b/app/views/shared/_footer_lite.html.erb
index e9eaeb7d1e0..e7d7aeb5608 100644
--- a/app/views/shared/_footer_lite.html.erb
+++ b/app/views/shared/_footer_lite.html.erb
@@ -9,7 +9,7 @@
       <div class='container cntnr-wide padding-y-1 padding-x-2 desktop:padding-x-0 h5'>
         <div class='i18n-mobile-toggle flex flex-align-center flex-justify-center'>
             <button class='block text-decoration-none blue fs-13p language-mobile-button' aria-expanded='false'>
-              <%= image_tag asset_url('globe-blue.svg'), width: 12, 
+              <%= image_tag asset_url('globe-blue.svg'), width: 12,
               class: 'margin-right-1', alt: '', 'aria-hidden': 'true' %><%= t('i18n.language') %><span class='caret inline-block ml-tiny' aria-hidden='true'>&#9662;</span>
             </button>
         </div>
@@ -51,8 +51,8 @@
         <% if show_language_dropdown %>
           <ul class='list-reset display-none tablet:display-block margin-bottom-0'>
             <li class="i18n-desktop-toggle flex margin-y-1 margin-x-2 relative">
-              <button class='white text-decoration-none border border-blue rounded-lg padding-x-1 py-tiny language-desktop-button' aria-expanded='false'>
-                <%= image_tag asset_url('globe-white.svg'), width: 12, 
+              <button class='white text-decoration-none border border-blue radius-lg padding-x-1 py-tiny language-desktop-button' aria-expanded='false'>
+                <%= image_tag asset_url('globe-white.svg'), width: 12,
                 class: 'margin-right-1', alt: '' %><%= t('i18n.language') %>
                 <span class='caret inline-block ml-tiny' aria-hidden='true'>&#9662;</span>
               </button>
diff --git a/app/views/shared/_personal_key_confirmation_modal.html.erb b/app/views/shared/_personal_key_confirmation_modal.html.erb
index 2e26d6d232b..fccacfaf9e0 100644
--- a/app/views/shared/_personal_key_confirmation_modal.html.erb
+++ b/app/views/shared/_personal_key_confirmation_modal.html.erb
@@ -1,6 +1,6 @@
 <div id="personal-key-confirm" class="display-none">
   <%= render layout: '/shared/modal_layout' do %>
-    <div class="padding-y-8 padding-x-2 tablet:padding-x-8 cntnr-skinny border-box bg-white rounded rounded-lg key-badge">
+    <div class="padding-y-8 padding-x-2 tablet:padding-x-8 cntnr-skinny border-box bg-white radius-lg key-badge">
       <h2 class="margin-top-0 margin-bottom-2">
         <%= t('forms.personal_key.title') %>
       </h2>
diff --git a/app/views/test/piv_cac_authentication_test_subject/new.html.erb b/app/views/test/piv_cac_authentication_test_subject/new.html.erb
index 6a2bd2cc601..38fb0c0ad07 100644
--- a/app/views/test/piv_cac_authentication_test_subject/new.html.erb
+++ b/app/views/test/piv_cac_authentication_test_subject/new.html.erb
@@ -19,7 +19,7 @@
         <%= text_field_tag(:subject, '', class: 'block col-12 field monospace') %>
       </div>
       <div class="margin-bottom-4">
-        <fieldset class="margin-0 padding-0 border-none">
+        <fieldset class="margin-0 padding-0 border-0">
           <legend class="margin-bottom-1">
             Error Conditions
           </legend>
diff --git a/app/views/two_factor_authentication/options/index.html.erb b/app/views/two_factor_authentication/options/index.html.erb
index 7aa55a8982a..93db1210979 100644
--- a/app/views/two_factor_authentication/options/index.html.erb
+++ b/app/views/two_factor_authentication/options/index.html.erb
@@ -13,7 +13,7 @@
         method: :post,
         url: login_two_factor_options_path) do |f| %>
   <div class="margin-bottom-4">
-    <fieldset class="margin-0 padding-0 border-none">
+    <fieldset class="margin-0 padding-0 border-0">
       <legend class="margin-bottom-2">
         <%= @presenter.label %>
       </legend>
diff --git a/app/views/two_factor_authentication/totp_verification/show.html.erb b/app/views/two_factor_authentication/totp_verification/show.html.erb
index 3a33c780428..860f64d8212 100644
--- a/app/views/two_factor_authentication/totp_verification/show.html.erb
+++ b/app/views/two_factor_authentication/totp_verification/show.html.erb
@@ -20,7 +20,7 @@
       class: 'col-12',
     ) %>
   </div>
-  <div class="border border-primary-light rounded-lg padding-y-1 margin-top-2 margin-bottom-6 tablet:margin-y-2 col-12 sm-col-7">
+  <div class="border border-primary-light radius-lg padding-y-1 margin-top-2 margin-bottom-6 tablet:margin-y-2 col-12 sm-col-7">
     <%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
     <%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?,
                       class: 'margin-right-1 margin-left-2' %>
diff --git a/app/views/two_factor_authentication/webauthn_verification/show.html.erb b/app/views/two_factor_authentication/webauthn_verification/show.html.erb
index 9699e77b616..c644e9eadeb 100644
--- a/app/views/two_factor_authentication/webauthn_verification/show.html.erb
+++ b/app/views/two_factor_authentication/webauthn_verification/show.html.erb
@@ -47,7 +47,7 @@
     <p class="half-center">
       <%= t('two_factor_authentication.webauthn_verified.info') %>
     </p>
-    <div class="border border-primary-light rounded-lg padding-x-2 padding-y-1 margin-top-4">
+    <div class="border border-primary-light radius-lg padding-x-2 padding-y-1 margin-top-4">
       <%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
       <%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?, class: 'margin-y-2 margin-left-2 margin-right-1' %>
       <%= label_tag 'remember_device',
diff --git a/app/views/users/edit_phone/_delivery_preference_selection.html.erb b/app/views/users/edit_phone/_delivery_preference_selection.html.erb
index 0ff8f1943af..f05805248e0 100644
--- a/app/views/users/edit_phone/_delivery_preference_selection.html.erb
+++ b/app/views/users/edit_phone/_delivery_preference_selection.html.erb
@@ -1,5 +1,5 @@
 <div class="margin-bottom-4">
-  <fieldset class="margin-0 padding-0 border-none">
+  <fieldset class="margin-0 padding-0 border-0">
     <legend class="margin-bottom-1">
       <%= t('two_factor_authentication.otp_delivery_preference.title') %>
     </legend>
diff --git a/app/views/users/edit_phone/_make_default_number.html.erb b/app/views/users/edit_phone/_make_default_number.html.erb
index 8b05bc6be14..d29c27d27fb 100644
--- a/app/views/users/edit_phone/_make_default_number.html.erb
+++ b/app/views/users/edit_phone/_make_default_number.html.erb
@@ -1,5 +1,5 @@
 <div class="margin-bottom-4">
-  <fieldset class="margin-0 padding-0 border-none">
+  <fieldset class="margin-0 padding-0 border-0">
     <legend class="margin-bottom-1">
       <%= t('two_factor_authentication.otp_make_default_number.title') %>
     </legend>
diff --git a/app/views/users/piv_cac_authentication_setup/new.html.erb b/app/views/users/piv_cac_authentication_setup/new.html.erb
index 9d73e5a53b7..fb455d8b67b 100644
--- a/app/views/users/piv_cac_authentication_setup/new.html.erb
+++ b/app/views/users/piv_cac_authentication_setup/new.html.erb
@@ -6,7 +6,7 @@
 <%= form_tag(submit_new_piv_cac_url) do %>
 <ul class='list-reset'>
   <li class='padding-top-0 padding-bottom-1'>
-    <div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
+    <div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
       1
     </div>
     <label class="h1 margin-right-1 inline-block margin-bottom-1 bold" for="nickname">
@@ -21,7 +21,7 @@
     <hr>
   </li>
   <li class='padding-top-1 padding-bottom-1'>
-    <div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
+    <div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
       2
     </div>
     <div class='margin-right-1 inline-block margin-bottom-2'>
@@ -32,7 +32,7 @@
     <hr>
   </li>
   <li class='padding-top-1 padding-bottom-1'>
-    <div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
+    <div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
       3
     </div>
     <div class='margin-right-1 inline-block'>
diff --git a/app/views/users/shared/_otp_delivery_preference_selection.html.erb b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
index 14ec8c0c707..1f300771341 100644
--- a/app/views/users/shared/_otp_delivery_preference_selection.html.erb
+++ b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
@@ -6,7 +6,7 @@
 %>
 
 <div class="margin-bottom-4">
-  <fieldset class="margin-0 padding-0 border-none">
+  <fieldset class="margin-0 padding-0 border-0">
     <legend class="margin-bottom-1">
       <%= t('two_factor_authentication.otp_delivery_preference.title') %>
     </legend>
diff --git a/app/views/users/shared/_otp_make_default_number.html.erb b/app/views/users/shared/_otp_make_default_number.html.erb
index 4f59a60e8d1..e9f2b727bbc 100644
--- a/app/views/users/shared/_otp_make_default_number.html.erb
+++ b/app/views/users/shared/_otp_make_default_number.html.erb
@@ -4,7 +4,7 @@
 %>
 
 <div class="margin-bottom-4">
-  <fieldset class="margin-0 padding-0 border-none">
+  <fieldset class="margin-0 padding-0 border-0">
     <legend class="margin-bottom-1">
       <%= t('two_factor_authentication.otp_make_default_number.title') %>
     </legend>
diff --git a/app/views/users/totp_setup/new.html.erb b/app/views/users/totp_setup/new.html.erb
index 2aed9edc558..1472486ae2a 100644
--- a/app/views/users/totp_setup/new.html.erb
+++ b/app/views/users/totp_setup/new.html.erb
@@ -8,7 +8,7 @@
   <ul class="list-reset">
     <li class="padding-y-2 border-top border-primary-light">
       <div class="margin-bottom-2">
-        <div class="margin-right-1 inline-block circle circle-number bg-blue white">1</div>
+        <div class="margin-right-1 inline-block circle-number bg-blue white">1</div>
         <div class="inline-block bold" id="totp-nickname"><%= t('forms.totp_setup.totp_step_1') %></div>
         <div class="inline-block margin-left-4"><%= t('forms.totp_setup.totp_step_1a') %></div>
       </div>
@@ -22,12 +22,12 @@
       </div>
     </li>
     <li class="padding-y-2 border-top border-primary-light">
-      <div class="margin-right-1 inline-block circle circle-number bg-blue white">2</div>
+      <div class="margin-right-1 inline-block circle-number bg-blue white">2</div>
       <div class="inline-block bold"><%= t('forms.totp_setup.totp_step_2') %></div>
     </li>
     <li class="padding-y-2 border-top border-primary-light">
       <div class="margin-bottom-2">
-        <div class="margin-right-1 inline-block circle circle-number bg-blue white">3</div>
+        <div class="margin-right-1 inline-block circle-number bg-blue white">3</div>
         <div class="inline-block bold"><%= t('forms.totp_setup.totp_step_3') %></div>
       </div>
       <div class="sm-col-9 sm-ml-28p">
@@ -49,7 +49,7 @@
     </li>
     <li class="padding-y-2 border-top border-primary-light">
       <div class="margin-bottom-2">
-        <div class="margin-right-1 inline-block circle circle-number bg-blue white">4</div>
+        <div class="margin-right-1 inline-block circle-number bg-blue white">4</div>
         <div class="inline-block bold" id="totp-label"><%= t('forms.totp_setup.totp_step_4') %></div>
       </div>
       <div class="sm-col-9 sm-ml-28p">
diff --git a/app/views/users/two_factor_authentication_setup/index.html.erb b/app/views/users/two_factor_authentication_setup/index.html.erb
index 9be4b6a8a9d..706acc48fec 100644
--- a/app/views/users/two_factor_authentication_setup/index.html.erb
+++ b/app/views/users/two_factor_authentication_setup/index.html.erb
@@ -17,7 +17,7 @@
                        method: :patch,
                        url: two_factor_options_path do |f| %>
   <div class="margin-bottom-4">
-    <fieldset class="margin-0 padding-0 border-none">
+    <fieldset class="margin-0 padding-0 border-0">
       <legend class="margin-bottom-2"><%= t('forms.two_factor_choice.legend') %>:</legend>
       <% @presenter.options.each do |option| %>
         <%= label_tag "two_factor_options_form_selection_#{option.type}",
diff --git a/app/views/users/webauthn_setup/new.html.erb b/app/views/users/webauthn_setup/new.html.erb
index 14946c2436c..9205fdc3144 100644
--- a/app/views/users/webauthn_setup/new.html.erb
+++ b/app/views/users/webauthn_setup/new.html.erb
@@ -24,7 +24,7 @@
       <%= label_tag 'code', t('forms.webauthn_setup.nickname'), class: 'block bold', for: 'nickname' %>
       <%= text_field_tag :name, '', required: true, aria: { invalid: false }, id: 'nickname',
             class: 'block col-12 field monospace', size: 16, maxlength: 20 %>
-     <div class='border border-primary-light rounded-lg padding-x-2 padding-y-1 margin-top-4'>
+     <div class='border border-primary-light radius-lg padding-x-2 padding-y-1 margin-top-4'>
        <%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
        <%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?, class: 'margin-y-2 margin-left-2 margin-right-1' %>
        <%= label_tag 'remember_device',