diff --git a/styles/elements/_accordions.scss b/styles/elements/_accordions.scss
index 75848f7a..4f56e9bb 100644
--- a/styles/elements/_accordions.scss
+++ b/styles/elements/_accordions.scss
@@ -50,5 +50,9 @@
 
   &-list {
     max-width: $max-panel-width;
+
+    &__collapse {
+      cursor: pointer;
+    }
   }
 }
diff --git a/templates/applications/index.html b/templates/applications/index.html
index 81509be5..00a9b0e8 100644
--- a/templates/applications/index.html
+++ b/templates/applications/index.html
@@ -1,4 +1,5 @@
 {% from "components/accordion.html" import Accordion %}
+{% from "components/accordion_list.html" import AccordionList %}
 {% from "components/empty_state.html" import EmptyState %}
 {% from "components/sticky_cta.html" import StickyCTA %}
 {% from "components/icon.html" import Icon %}
@@ -32,7 +33,7 @@
     ) }}
 
   {% else %}
-    <div class="usa-accordion">
+    {% call AccordionList() %}
       {% for application in portfolio.applications|sort(attribute='name') %}
         {% set section_name = "application-{}".format(application.id) %}
         {% set title = "Environments ({})".format(application.environments|length) %}
@@ -76,7 +77,7 @@
           {% endcall %}
         </div>
       {% endfor %}
-    </div>
+    {% endcall %}
   {% endif %}
 
 </div>
diff --git a/templates/components/accordion_list.html b/templates/components/accordion_list.html
index dab63e3d..216e51b1 100644
--- a/templates/components/accordion_list.html
+++ b/templates/components/accordion_list.html
@@ -1,8 +1,8 @@
 {% macro AccordionList() %}
   <accordion-list inline-template>
-    <div class="accordion-list">
+    <div class="accordion-list usa-accordion">
       <div class="action-group">
-        <a v-on:click="handleClick($event)">Collapse All</a>
+        <a v-on:click="handleClick($event)" class="accordion-list__collapse">Collapse All</a>
       </div>
       <!-- caller iterates over accordion vue components or Accordion jinja macros -->
       {{ caller() }}
diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html
index 441977a5..b9fed6da 100644
--- a/templates/task_orders/index.html
+++ b/templates/task_orders/index.html
@@ -14,7 +14,7 @@
 
 
 {% macro TaskOrderList(task_orders, status) %}
-  <div class="accordion usa-accordion">
+  <div class="accordion">
     {% call Accordion(title=status, id=status, heading_tag="h4") %}
       {% for task_order in task_orders %}
         {% set to_number %}