diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index e10071f3d..da85cb5ba 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -108,9 +108,6 @@ p,
   box-shadow: none !important;
 }
 
-.multiple-choice [type='radio']:focus + label::before {
-  box-shadow: 0 0 0 3px color('blue-40v');
-}
 
 .usa-dark-background .pill-item__container {
   color: #fff;
diff --git a/app/templates/components/radios.html b/app/templates/components/radios.html
index b629bb871..22489e289 100644
--- a/app/templates/components/radios.html
+++ b/app/templates/components/radios.html
@@ -40,7 +40,7 @@
      <div class="radio-select" data-module="radio-select" data-categories="{{ field.categories|join(',') }}" data-show-now-as-default="{{ show_now_as_default|string|lower }}">
        <div class="radio-select-column">
        {% for option in field %}
-         <div class="multiple-choice">
+         <div class="usa-radio">
            {{ option }}
            <label for="{{ option.id }}">
              {{ option.label.text }}
diff --git a/app/templates/components/select-input.html b/app/templates/components/select-input.html
index be84aa232..e5d4d4ee5 100644
--- a/app/templates/components/select-input.html
+++ b/app/templates/components/select-input.html
@@ -9,18 +9,19 @@
 {% endmacro %}
 
 
-{% macro select_list(options, child_map, disable=[], option_hints={}, input="radio") %}
-    <ul>
+{% macro select_list(options, child_map, disable=[], option_hints={}, input="radio", indent_level=0) %}
     {% for option in options %}
       {% if child_map[option.data] %}
-        {% call select_input(option, disable, option_hints, as_list_item=True, input=input) %}
-          {{ select_list(child_map[option.data], child_map, disable, option_hints, input=input) }}
-        {% endcall %}
+        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level * 4 }}{% endif %}">
+          {{ select_input(option, disable, option_hints, as_list_item=False, input=input) }}
+        </div>
+        {{ select_list(child_map[option.data], child_map, disable, option_hints, input=input, indent_level=indent_level + 1) }}
       {% else %}
-          {{ select_input(option, disable, option_hints, as_list_item=True, input=input) }}
+        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level * 4 }}{% endif %}">
+          {{ select_input(option, disable, option_hints, as_list_item=False, input=input) }}
+        </div>
       {% endif %}
     {% endfor %}
-    </ul>
 {% endmacro %}
 
 
@@ -63,11 +64,7 @@
 {% endmacro %}
 
 {% macro select_input(option, disable=[], option_hints={}, data_target=None, as_list_item=False, input="radio") %}
-  {% if as_list_item %}
-  <li class="multiple-choice test-one" {% if data_target %}data-target="{{ data_target }}"{% endif %}>
-  {% else %}
   <div class="usa-radio" {% if data_target %}data-target="{{ data_target }}"{% endif %}>
-  {% endif %}
     <input
       id="{{ option.id }}" class="usa-radio__input" name="{{ option.name }}" type="{{ input }}" value="{{ option.data }}"
       {% if option.data in disable %}
@@ -80,17 +77,13 @@
     <label class="usa-radio__label" for="{{ option.id }}">
       {{ option.label.text }}
       {% if option_hints[option.data] %}
-        <div class="block-label-hint">
+        <span class="usa-hint">
           {{ option_hints[option.data] }}
-        </div>
+        </span>
       {% endif %}
     </label>
     {% if caller %}
         {{ caller() }}
     {% endif %}
-  {% if as_list_item %}
-  </li>
-  {% else %}
   </div>
-  {% endif %}
 {% endmacro %}
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png
new file mode 100644
index 000000000..1710a11c7
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png
new file mode 100644
index 000000000..b2e7c30fc
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png
new file mode 100644
index 000000000..ed36e8bc1
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png
new file mode 100644
index 000000000..f36e2d62c
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png
new file mode 100644
index 000000000..ccf200f46
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png
new file mode 100644
index 000000000..a1e7939ae
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png
new file mode 100644
index 000000000..81a6f823a
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png
new file mode 100644
index 000000000..65094dfbf
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png
new file mode 100644
index 000000000..fd2d21ca6
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png differ
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index 3a781bda5..a62c21487 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -54,7 +54,7 @@ def test_get_should_not_render_radios_if_org_type_known(
     page = client_request.get("main.add_service")
     assert page.select_one("h1").text.strip() == "About your service"
     assert page.select_one("input[name=name]").get("value") is None
-    assert not page.select(".multiple-choice")
+    assert not page.select(".usa-radio")
 
 
 def test_show_different_page_if_user_org_type_is_local(
diff --git a/tests/javascripts/templateFolderForm.test.js b/tests/javascripts/templateFolderForm.test.js
index c9fbdf734..d12a40748 100644
--- a/tests/javascripts/templateFolderForm.test.js
+++ b/tests/javascripts/templateFolderForm.test.js
@@ -12,17 +12,17 @@ function setFixtures (hierarchy, newTemplateDataModules = "") {
       nodes
         .filter(node => node.type === 'folder')
         .forEach(node => {
-          result += `<li class="multiple-choice">
+          result += `<div class="usa-radio">
                       <input id="node-${count}" name="move_to" type="radio" value="node-${count}">
                       <label class="usa-label" for="node-${count}">
                         ${node.label}
                       </label>
                       ${node.children ? foldersCheckboxesHTML(node.children) : ''}
-                    </li>`;
+                    </div>`;
           count++;
         });
 
-      return `<ul>${result}</ul>`;
+      return `<div>${result}</div>`;
     };
 
   }();
@@ -83,25 +83,25 @@ function setFixtures (hierarchy, newTemplateDataModules = "") {
                       <legend class="form-label">
                         New template
                       </legend>
-                      <div class="multiple-choice">
+                      <div class="usa-radio">
                         <input id="add_template_by_template_type-0" name="add_template_by_template_type" type="radio" value="email">
                         <label class="usa-label" for="add_template_by_template_type-0">
                           Email
                         </label>
                       </div>
-                      <div class="multiple-choice">
+                      <div class="usa-radio">
                         <input id="add_template_by_template_type-1" name="add_template_by_template_type" type="radio" value="sms">
                         <label class="usa-label" for="add_template_by_template_type-1">
                           Text message
                         </label>
                       </div>
-                      <div class="multiple-choice">
+                      <div class="usa-radio">
                         <input id="add_template_by_template_type-2" name="add_template_by_template_type" type="radio" value="letter">
                         <label class="usa-label" for="add_template_by_template_type-2">
                           Letter
                         </label>
                       </div>
-                      <div class="multiple-choice">
+                      <div class="usa-radio">
                         <input id="add_template_by_template_type-3" name="add_template_by_template_type" type="radio" value="copy-existing">
                         <label class="usa-label" for="add_template_by_template_type-3">
                           Copy an existing template
diff --git a/urls.js b/urls.js
index 9bec7b113..e47d8931a 100644
--- a/urls.js
+++ b/urls.js
@@ -21,6 +21,43 @@ const routes = {
       label: 'API Keys',
       path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/api/keys',
     },
+    // Pages to test radio buttons before converting govukRadios to USWDS
+    {
+      label: 'API Keys Create',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/api/keys/create',
+    },
+    {
+      label: 'Change User Auth',
+      path: '/users/6af522d0-2915-4e52-83a3-3690455a5fe6/change_auth',
+    },
+    {
+      label: 'User Profile Timezone',
+      path: '/user-profile/preferred_timezone',
+    },
+    {
+      label: 'Service Settings',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings',
+    },
+    {
+      label: 'Service Send Files By Email',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings/send-files-by-email',
+    },
+    {
+      label: 'Service SMS Prefix',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings/sms-prefix',
+    },
+    {
+      label: 'Send One Off Step 2',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/send/a4e530e7-cae2-4e24-a1e9-752141a0b58e/one-off/step-2',
+    },
+    {
+      label: 'Choose Template',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/templates',
+    },
+    {
+      label: 'Team Members',
+      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/users',
+    },
   ],
 
   // Using Notify section