diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index d58223790..0a7a9074c 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -8,12 +8,16 @@
       <!-- agenda pop-up button -->
       <a class="" data-toggle="modal" data-target="#modal-{{item.slug}}" title="Show meeting materials"><span class="fa fa-fw fa-arrows-alt"></span></a>
       <!-- materials tar file -->
-      <a class="" href="/meeting/{{meeting.number}}/agenda/{{session.group.acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="fa fa-fw fa-file-archive-o"></span></a>
+      <a class="" href="/meeting/{{meeting.number}}/agenda/{{session.historic_group.acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="fa fa-fw fa-file-archive-o"></span></a>
       <!-- materials PDF file -->
-      <a class="" href="/meeting/{{ meeting.number }}/agenda/{{session.group.acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-fw fa-file-pdf-o"></span></a>
+      <a class="" href="/meeting/{{ meeting.number }}/agenda/{{session.historic_group.acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-fw fa-file-pdf-o"></span></a>
     {% endif %}
       <!-- etherpad -->
-      <a class="" href="https://etherpad.ietf.org:9009/p/notes-ietf-{{ meeting.number }}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
+    {% if item.timeslot.type.slug == 'plenary' %}
+      <a class="" href="https://etherpad.ietf.org:9009/p/notes-ietf-{{ meeting.number }}-plenary?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
+    {% else %}
+      <a class="" href="https://etherpad.ietf.org:9009/p/notes-ietf-{{ meeting.number }}-{{session.historic_group.acronym}}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
+    {% endif %}
 
   {# show stream buttons up till end of session, then show archive buttons #}
   {% if now < item.timeslot.end_time %}
@@ -28,22 +32,23 @@
       {% elif session.remote_instructions|first_url %}
 	<a class=""
 	  href="{{ session.remote_instructions|first_url }}"
-	  title="Webex session"><span class="fa fa-fw fa-phone"></span>
+	  title="Session call-in"><span class="fa fa-fw fa-phone"></span>
 	</a>
       {% elif item.timeslot.location.webex_url %}
 	  <a class=""
 	    href="{{item.timeslot.location.webex_url|format:session }}"
 	    title="Webex session"><span class="fa fa-fw fa-phone"></span>
 	  </a>
+      <!-- Video stream (meetecho) -->
       {% elif item.timeslot.location.video_stream_url %}
 	  <a class=""
 	    href="{{item.timeslot.location.video_stream_url|format:session }}"
-	    title="Webex session"><span class="fa fa-fw fa-video-camera"></span>
+	    title="Meetecho video stream"><span class="fa fa-fw fa-video-camera"></span>
 	  </a>
       {% else %}
 	<span class="">
 	  <span class="fa fa-fw fa-phone" style="color: #ddd;"
-		title="No webex info found in remote instructions or agenda note"></span>
+		title="No webex or meetecho info found in remote instructions or agenda note"></span>
 	</span>
       {% endif %}
   {% else %}
@@ -72,6 +77,10 @@
             <a class="" href="{{ href }}" title="{{ r.title }}"><span class="fa fa-fw fa-file-o"></span></a>
           {% endif %}
         {% endwith %}{% endfor %}
+      {% elif item.timeslot.location.video_stream_url %}
+          <a class=""
+             href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{session.historic_group.acronym.upper}}"
+             title="Meetecho session recording"><span class="fd fa-fw fd-meetecho"></span></a>
       {% elif show_empty  %}
         <span class="fa fa-fw"></span>
       {% endif %}