diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index f5bbbeb15..ec5d97b0f 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -156,17 +156,42 @@ td.table-empty-message {
    box-shadow: none;
 }
 
+.template-list-item-without-ancestors a.template-list-folder:first-of-type {
+   background-image: url(../images/folder-blue-bold.svg);
+   background-size: 30px 30px;
+}
+
 .folder-heading a.folder-heading-folder,
-.folder-heading-folder,
 .template-list-folder {
-   background-image: none;
-   padding-left: 0;
-   text-indent: 0;
+   background-image: url(../images/folder-blue-bold.svg);
    &:hover {
       color: color("blue-warm-70v");
+      background-image: url(../images/folder-blue-bold.svg);
    }
 }
 
-.template-list-item-without-ancestors a.template-list-folder:first-of-type {
-   text-indent: 0;
+.folder-heading-folder {
+   background-image: url(../images/folder-black.svg);
+}
+
+.folder-heading a.folder-heading-folder-truncated {
+   background-position: 0;
+}
+
+.usa-template-list-template {
+   background: url(../img/material-icons/description.svg) no-repeat;
+   padding-left: 40px;
+   background-size: 30px 30px;
+}
+
+.js-enabled .live-search {
+   display: flex;
+   margin-bottom: units(2);
+   .usa-form-group {
+      @include u-width("mobile-lg");
+   }
+   input#search {
+      width: 100%;
+      border: 1px solid color("gray-60");
+   }
 }
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 01eb809c5..ffb055a74 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -50,7 +50,7 @@
       </div>
       {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
         <div class="govuk-grid-column-one-sixth">
-          <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="govuk-link govuk-link--no-visited-state folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a>
+          <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<span class="usa-sr-only"> this folder</span></a>
         </div>
       {% endif %}
     </div>