diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 9b7e35b91..0c52d2157 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -58,8 +58,8 @@
         </p>
     {% endif %}
     {% include 'meeting/tz-display.html' with meeting_timezone=timezone only %}
-    {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Personalize the agenda view..." always_show=personalize %}
-    {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting only %}
+    {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Filter this agenda view..." always_show=personalize %}
+    {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting personalize=personalize only %}
     <div class="input-group mb-3">
         <button class="btn btn-outline-primary dropdown-toggle"
                 type="button"
@@ -327,7 +327,9 @@
 {% endfor %}
 </tbody>
 </table>
-{% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting only %}
+{% if personalize %}{# only show second copy of buttons for the personalize tab #}
+    {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting personalize=personalize only %}
+{% endif %}
 {% endcache %}
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/meeting/agenda_filter.html b/ietf/templates/meeting/agenda_filter.html
index 44f401411..124032ee4 100644
--- a/ietf/templates/meeting/agenda_filter.html
+++ b/ietf/templates/meeting/agenda_filter.html
@@ -7,7 +7,7 @@ Optional parameters:
   customize_button_text - text to show on the "Customize" button (defaults to "Customize...")
 {% endcomment %}
 {% load agenda_filter_tags %}
-<div class="accordion" id="accordion">
+<div class="accordion mb-3" id="accordion">
     <div class="accordion-item">
         <h2 class="accordion-header" id="heading">
             <button class="accordion-button {% if not always_show %}collapsed{% endif %}"
diff --git a/ietf/templates/meeting/agenda_personalize_buttonlist.html b/ietf/templates/meeting/agenda_personalize_buttonlist.html
index e614d9642..55acb9337 100644
--- a/ietf/templates/meeting/agenda_personalize_buttonlist.html
+++ b/ietf/templates/meeting/agenda_personalize_buttonlist.html
@@ -1,20 +1,24 @@
 {% comment %}
 Buttons for the agenda_personalize.html template
 
-Required parameter: meeting - meeting being displayed
+Required parameters:
+  meeting - meeting being displayed
+  personalize - if True, show buttons relevant only for personalize tab
 {% endcomment %}
 {% load agenda_custom_tags %}
 <div class="mb-3 buttonlist">
-    <a class="btn btn-sm btn-outline-primary d-none ical-link agenda-link filterable"
+    <a class="btn btn-sm btn-outline-primary ical-link agenda-link filterable"
        href="{% webcal_url 'ietf.meeting.views.agenda_ical' num=meeting.number %}">
-        Subscribe to personal agenda
+        Subscribe to filtered agenda
     </a>
-    <a class="d-none btn btn-sm btn-outline-primary ical-link agenda-link filterable"
+    <a class="btn btn-sm btn-outline-primary ical-link agenda-link filterable"
        href="{% url "ietf.meeting.views.agenda_ical" num=meeting.number %}">
-        Download .ics of personal agenda
-    </a>
-    <a class="btn btn-sm btn-outline-primary d-none ical-link agenda-link filterable"
-       href="{% url 'ietf.meeting.views.agenda' num=meeting.number %}">
-        View personal agenda
+        Download .ics of filtered agenda
     </a>
+    {% if personalize %}
+        <a class="btn btn-sm btn-outline-primary agenda-link filterable"
+           href="{% url 'ietf.meeting.views.agenda' num=meeting.number %}">
+            View personal agenda
+        </a>
+    {% endif %}
 </div>
\ No newline at end of file