diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js
index e415b386a..ff4420bd8 100644
--- a/app/assets/javascripts/templateFolderForm.js
+++ b/app/assets/javascripts/templateFolderForm.js
@@ -327,7 +327,9 @@
             <button class="usa-button usa-button--event" value="add-new-template" aria-expanded="false">
               New template
             </button>
-            <button class="usa-button usa-button--event" value="add-new-folder" aria-expanded="false">New folder</button>
+            <button class="usa-button usa-button--outline usa-button--event" value="add-new-folder" aria-expanded="false">
+              New folder
+            </button>
           </div>
           <div class="template-list-selected-counter">
             <span class="template-list-selected-counter__count" aria-hidden="true">
@@ -345,10 +347,12 @@
             <button class="usa-button usa-button--event" value="move-to-existing-folder" aria-expanded="false">
               Move<span class="usa-sr-only"> selection to folder</span>
             </button>
-            <button class="usa-button usa-button--event" value="move-to-new-folder" aria-expanded="false">Add to new folder</button>
+            <button class="usa-button usa-button--outline usa-button--event" value="move-to-new-folder" aria-expanded="false">
+              Add to new folder
+            </button>
           </div>
           <div class="template-list-selected-counter" aria-hidden="true">
-            <span class="template-list-selected-counter__count" aria-hidden="true">
+            <span class="template-list-selected-counter__count text-base" aria-hidden="true">
               ${this.selectionStatus.selected(1)}
             </span>
           </div>
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index e29131473..5f4b1fddc 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -15,13 +15,15 @@
 {%- endmacro %}
 
 {% if template_list.template_folder_id and not template_list.templates_to_show %}
-<p class="template-list-empty">
-  {% if template_list.folder_is_empty %}
-  This folder is empty
-  {% else %}
-  There are no {{ 1|message_count_label(template_type, suffix='') }} templates in this folder
-  {% endif %}
-</p>
+<div>
+  <p class="text-base">
+    {% if template_list.folder_is_empty %}
+    This folder is empty
+    {% else %}
+    There are no {{ 1|message_count_label(template_type, suffix='') }} templates in this folder
+    {% endif %}
+  </p>
+</div>
 {% else %}
 <nav id="template-list" aria-label="Template list">
   {% set checkboxes_data = [] %}
@@ -85,7 +87,7 @@
     {% set checkbox_config = {
     "html": label_content,
     "label": {
-    "classes": "template-list-item-label margin-top-05",
+    "classes": "template-list-item-label margin-top-1",
     },
     "id": "templates-or-folder-" ~ item.id,
     "classes": "template-list-item template-list-item-with-checkbox {}".format(
@@ -100,7 +102,7 @@
     <li
       class="template-list-item {%- if item.ancestors %} template-list-item-hidden-by-default {%- else %} template-list-item-without-ancestors{%- endif %}">
       {{ item_link_content }}
-      <p class="template-list-item-hint">
+      <p class="usa-hint margin-top-1">
         {{ item.hint }}
       </p>
     </li>
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 91b51269d..43fa21c0f 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -31,36 +31,42 @@
 
   {% else %}
 
-    <div class="grid-row flex-column">
-      <h1 class="font-body-2xl line-height-sans-2 margin-bottom-1 margin-top-0" id="page-title">{{page_title}}</h1>
-      <div class="{% if current_user.has_permissions(ServicePermission.MANAGE_TEMPLATES) %} grid-col-10 {% else %} grid-col-12 {% endif %}">
-        <p class="margin-top-0 margin-bottom-4" id="page-description">
-          Every message starts with a template. To send, choose or create a template.
-        </p>
-        {{ folder_path(
-          folders=template_folder_path,
-          service_id=current_service.id,
-          template_type=template_type,
-          current_user=current_user
-        ) }}
-      </div>
-      {% if current_user.has_permissions(ServicePermission.MANAGE_TEMPLATES) and current_template_folder_id and user_has_template_folder_permission %}
-        <div class="grid-col-2">
-          <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link folder-heading-manage-link">Manage this folder<span class="usa-sr-only">Manage this folder</span></a>
+    <div class="grid-row">
+      <div class="grid-col-12">
+        <h2 class="font-body-2xl line-height-sans-2 margin-0" id="page-title">{{page_title}}</h2>
+        <div class="grid-row">
+          <div class="{% if current_user.has_permissions(ServicePermission.MANAGE_TEMPLATES) and current_template_folder_id and user_has_template_folder_permission %}grid-col-10{% else %}grid-col-12{% endif %}">
+            <p class="margin-bottom-4" id="page-description">
+              Every message starts with a template. To send, choose or create a template.
+            </p>
+            {{ folder_path(
+              folders=template_folder_path,
+              service_id=current_service.id,
+              template_type=template_type,
+              current_user=current_user
+            ) }}
+          </div>
+          {% if current_user.has_permissions(ServicePermission.MANAGE_TEMPLATES) and current_template_folder_id and user_has_template_folder_permission %}
+            <div class="grid-col-2 text-right">
+              <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link">Manage this folder</a>
+            </div>
+          {% endif %}
         </div>
-      {% endif %}
+      </div>
     </div>
   {% endif %}
     {% if show_template_nav %}
-      <div class="bottom-gutter-2-3">
+      <div class="margin-y-3">
         {{ pill(template_nav_items, current_value=template_type, show_count=False) }}
       </div>
     {% endif %}
 
     {{ live_search(target_selector='#template-list .template-list-item', show=show_search_box, form=search_form) }}
 
-    <div class="js-live-search-no-results js-hidden">
-      <p class="usa-body margin-top-2">No templates found</p>
+    <div class="js-live-search-no-results js-hidden margin-top-3">
+      <div class="padding-3 bg-base-lightest radius-md">
+        <p class="text-base margin-0">No templates found</p>
+      </div>
     </div>
 
     {% if current_user.has_permissions(ServicePermission.MANAGE_TEMPLATES) and user_has_template_folder_permission %}
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 a4c2fbd41..3e6ac1647 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_Choose_Template_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png
index 16477aaf9..49e73ba37 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png 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_Email_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png
index 2d91ffbb2..d03050780 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_Establish_Trust_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png
index e3c06c069..6185e7efa 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_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 16c830f02..a023ecd00 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_Text_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png
index 16c830f02..d03050780 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