diff --git a/app/assets/javascripts/listEntry.js b/app/assets/javascripts/listEntry.js
index 15c7405fe..321b944c0 100644
--- a/app/assets/javascripts/listEntry.js
+++ b/app/assets/javascripts/listEntry.js
@@ -27,7 +27,7 @@
   };
   ListEntry.optionalAttributes = ['aria-describedby'];
   ListEntry.prototype.entryTemplate = Hogan.compile(
-    '<div class="list-entry margin-bottom-2">' +
+    '<div class="list-entry">' +
       '<label for="{{{id}}}" class="usa-label">' +
         '<span class="usa-sr-only">{{listItemName}} number </span>{{number}}.' +
       '</label>' +
@@ -39,14 +39,14 @@
         ' {{{sharedAttributes}}}' +
       '/>' +
       '{{#button}}' +
-        '<button type="button" class="usa-button--unstyled text-primary margin-top-1 input-list__button--remove">' +
+        '<button type="button" class="usa-button usa-button--secondary input-list__button--remove">' +
           'Remove<span class="usa-sr-only"> {{listItemName}} number {{number}}</span>' +
         '</button>' +
       '{{/button}}' +
     '</div>'
   );
   ListEntry.prototype.addButtonTemplate = Hogan.compile(
-    '<button type="button" class="usa-button usa-button--outline input-list__button--add margin-top-2">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
+    '<button type="button" class="usa-button usa-button--outline input-list__button--add">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
   );
   ListEntry.prototype.getSharedAttributes = function () {
     var $inputs = this.$wrapper.find('input'),
@@ -101,15 +101,8 @@
     if ($firstInput.length) {
       var classList = $firstInput.attr('class');
       if (classList) {
-        // Remove any GOV.UK or USA numbered classes, keep others
-        this.additionalClasses = classList
-          .split(' ')
-          .filter(function(cls) {
-            return cls &&
-                   !cls.match(/^(govuk-input|usa-input)/) &&
-                   cls !== 'usa-input--numbered';
-          })
-          .join(' ');
+        // Preserve any additional classes from the original input
+        this.additionalClasses = classList;
       } else {
         this.additionalClasses = '';
       }
diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index f8c40f2ad..029aaa22f 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1093,7 +1093,13 @@ nav.nav {
   margin-top: 0;
 }
 
-// Global styling for radio button legends
-fieldset legend.usa-legend {
+// Radio button and checkbox legends
+.usa-radio legend.usa-legend,
+.usa-checkbox legend.usa-legend,
+.api-key-radios legend.usa-legend,
+.login-auth-radios legend.usa-legend,
+.auth-type-radios legend.usa-legend,
+.notification-type-radios legend.usa-legend,
+.organizations-radios legend.usa-legend {
   font-weight: 700;
 }
diff --git a/app/templates/components/select-input.html b/app/templates/components/select-input.html
index 0c7fd59ea..0af11021c 100644
--- a/app/templates/components/select-input.html
+++ b/app/templates/components/select-input.html
@@ -12,12 +12,12 @@
 {% macro select_list(options, child_map, disable=[], option_hints={}, input="radio", indent_level=0) %}
     {% for option in options %}
       {% if child_map[option.data] %}
-        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level * 4 }}{% endif %}">
+        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level + 2 }}{% 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 %}
-        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level * 4 }}{% endif %}">
+        <div class="{% if indent_level > 0 %}margin-left-{{ indent_level + 2 }}{% endif %}">
           {{ select_input(option, disable, option_hints, as_list_item=False, input=input) }}
         </div>
       {% endif %}
diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html
index f7cd002d2..260264bef 100644
--- a/app/templates/views/api/keys/create.html
+++ b/app/templates/views/api/keys/create.html
@@ -20,8 +20,7 @@
 
   {% call form_wrapper() %}
     {{ form.key_name }}
-    <div class="margin-top-4 margin-bottom-3">
-      <div class="api-key-radios">
+    <div class="api-key-radios margin-top-5">
         {% if current_service.trial_mode %}
           {{ radios(
             form.key_type,
@@ -31,7 +30,6 @@
         {% else %}
           {{ radios(form.key_type) }}
         {% endif %}
-      </div>
     </div>
     {{ page_footer('Continue') }}
   {% endcall %}
diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html
index e2bbb4851..c01bb9c34 100644
--- a/app/templates/views/manage-users/permissions.html
+++ b/app/templates/views/manage-users/permissions.html
@@ -11,7 +11,7 @@
 {% endif %}
 
 {% if service_has_email_auth %}
-  <div class="login-auth-radios margin-top-4">
+  <div class="login-auth-radios">
     {% if not mobile_number %}
       {{ radios(
         form.login_authentication,
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
index 00125b5b6..13ae82a9a 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png 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_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png
index d514c2f0f..dbe602059 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png
index 6f873ed87..8fc083c3b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png
index b0fdfd898..73a73d913 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png
index 6f873ed87..8fc083c3b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png
index 3b2a0db92..249a537f2 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png
index e96632104..4de5b957e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png
index 6f873ed87..669f1202a 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png
index a2e89fa15..084a92fa1 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png differ