diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index c83c49bee..021cfa982 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -39,7 +39,7 @@
 	   {% if show_ical %}
              {% if s.meeting.type_id == 'ietf' %}
 	     {{s.time|date:"H:i"}}
-	     &nbsp;<a href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number session_id=s.id %}"><span class="fa fa-calendar"></span></a>
+	     &nbsp;<a href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number session_id=s.id %}"><span class="fa fa-calendar-o"></span></a>
 	     {% else %}
 	     <span class='invisible'>{{s.time|date:"H:i"}}</span>
 	     &nbsp;<a href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number acronym=s.group.acronym %}"><span class="fa fa-calendar"></span></a>
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index 9639fc614..8672c8d36 100644
--- a/ietf/templates/group/meetings.html
+++ b/ietf/templates/group/meetings.html
@@ -33,7 +33,7 @@
 {% if future %}
   <div class="panel panel-default" id="futuremeets">
     <div class="panel-heading">
-        Future Meetings 
+        Future Meetings
         <a class="regular pull-right" title="icalendar entry for all scheduled future {{group.acronym}} meetings" href="{% url 'ietf.meeting.views.upcoming_ical' %}?filters={{group.acronym}}"><span class="fa fa-calendar"></span></a>
     </div>
     <div class="panel-body">
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index 7d04b442d..411042af5 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -3,28 +3,28 @@
 {% load static %}
 {% load textfilters %}
 {% origin %}
-{% with session.official_timeslotassignment as item %}
+{% with item=session.official_timeslotassignment acronym=session.historic_group.acronym %}
     {% if session.agenda and show_agenda %}
       {% include "meeting/session_agenda_include.html" %}
       <!-- 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.historic_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/{{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.historic_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/{{acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-fw fa-file-pdf-o"></span></a>
     {% endif %}
       <!-- etherpad -->
     {% if use_codimd %}
       {% if item.timeslot.type.slug == 'plenary' %}
         <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-plenary title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
       {% else %}
-        <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-{{session.historic_group.acronym}}" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
+        <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-{{acronym}}" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
       {% endif %}
     {% else %}
       {% 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>
+        <a class="" href="https://etherpad.ietf.org:9009/p/notes-ietf-{{ meeting.number }}-{{acronym}}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
       {% endif %}
     {% endif %}
 
@@ -36,17 +36,17 @@
       {% if session.agenda_note|first_url|conference_url %}
 	<a class=""
 	  href="{{ session.agenda_note|first_url }}"
-	  title="Online conference"><span class="fa fa-fw fd-users"></span>
+	  title="Online conference"><span class="fa fa-fw fd-group"></span>
 	</a>
       {% elif session.remote_instructions|first_url|conference_url %}
 	<a class=""
 	  href="{{ session.remote_instructions|first_url }}"
-	  title="Online conference"><span class="fa fa-fw fd-users"></span>
+	  title="Online conference"><span class="fa fa-fw fd-group"></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 fd-users"></span>
+	    title="Webex session"><span class="fa fa-fw fd-group"></span>
 	  </a>
       <!-- Video stream (meetecho) -->
       {% elif item.timeslot.location.video_stream_url %}
@@ -56,10 +56,16 @@
 	  </a>
       {% else %}
 	<span class="">
-	  <span class="fa fa-fw fd-users" style="color: #ddd;"
+	  <span class="fa fa-fw fd-group" style="color: #ddd;"
 		title="No online conference info found in remote instructions or agenda note"></span>
 	</span>
       {% endif %}
+      <!-- iCalendar item -->
+      <a
+        href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
+        title="icalendar entry for {{acronym}} session on {{item.timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
+            <span class="fa fa-fw fa-calendar-o"></span>
+      </a>
   {% else %}
     <!-- Jabber -->
     <a class="" href="https://www.ietf.org/jabber/logs/{{session.jabber_room_name}}?C=M;O=D" title="Jabber logs for {{session.jabber_room_name}}">
@@ -88,7 +94,7 @@
         {% 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}}"
+             href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
              title="Meetecho session recording"><span class="fd fa-fw fd-meetecho"></span></a>
       {% elif show_empty  %}
         <span class="fa fa-fw"></span>
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index 7e5a5b9ce..88c70776c 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -5,14 +5,15 @@
 {% origin %}
 
 <span id="session-buttons-{{session.pk}}">
+  {% with acronym=session.historic_group.acronym %}
   {% if session.agenda and show_agenda %}
     {% include "meeting/session_agenda_include.html" %}
     <!-- 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.historic_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/{{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.historic_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/{{acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-fw fa-file-pdf-o"></span></a>
   {% endif %}
 
   <!-- etherpad -->
@@ -20,13 +21,13 @@
     {% if item.timeslot.type.slug == 'plenary' %}
       <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-plenary title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
     {% else %}
-      <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-{{session.historic_group.acronym}}" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
+      <a class="" href="https://codimd.ietf.org/notes-ietf-{{ meeting.number }}-{{acronym}}" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
     {% endif %}
   {% else %}
     {% 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>
+      <a class="" href="https://etherpad.ietf.org:9009/p/notes-ietf-{{ meeting.number }}-{{acronym}}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-fw fa-edit"></span></a>
     {% endif %}
   {% endif %}
 
@@ -54,19 +55,25 @@
     {% if session.agenda_note|first_url|conference_url %}
       <a class=""
         href="{{ session.agenda_note|first_url }}"
-        title="Online conference"><span class="fa fa-fw fd-users"></span>
+        title="Online conference"><span class="fa fa-fw fd-group"></span>
       </a>
     {% elif session.remote_instructions|first_url|conference_url %}
       <a class=""
         href="{{ session.remote_instructions|first_url }}"
-        title="Online conference"><span class="fa fa-fw fd-users"></span>
+        title="Online conference"><span class="fa fa-fw fd-group"></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 fd-users"></span>
+          title="Webex session"><span class="fa fa-fw fd-group"></span>
         </a>
     {% endif %}
+    <!-- iCalendar item -->
+    <a
+      href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
+      title="icalendar entry for {{acronym}} session on {{item.timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
+        <span class="fa fa-fw fa-calendar-o"></span>
+    </a>
   {% else %}
     <!-- Jabber logs -->
     {% if meeting.number|add:"0" >= 60 %}
@@ -101,9 +108,10 @@
       {% endwith %}
       {% if item.timeslot.location.video_stream_url %}
         <a class=""
-          href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{session.historic_group.acronym.upper}}"
+          href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
          title="Meetecho session recording"><span class="fd fa-fw fd-meetecho"></span></a>
       {% endif %}
     {% endif %}
   {% endif %}
+  {% endwith %}
 </span>
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 688860c81..702362ea5 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -15,10 +15,6 @@
                  {% include "meeting/session_buttons_include.html" %}
                {% endwith %}
              {% endif %}
-             <!-- iCalendar item -->
-             {% if now < item.timeslot.end_time %}
-               <a title="icalendar entry for {{acronym}} session {{ forloop.counter }}" href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"><span class="fa fa-fw fa-calendar-o"></span> </a>
-             {% endif %}
            </span>
          {% endif %}
       </h2>
@@ -43,12 +39,12 @@
          {% if session.agenda_note|first_url|conference_url %}
            <a class=""
              href="{{ session.agenda_note|first_url }}"
-             title="Online conference"><span class="fa fa-fw fd-users"></span>
+             title="Online conference"><span class="fa fa-fw fd-group"></span>
            </a>
          {% elif session.remote_instructions|first_url|conference_url %}
            <a class=""
              href="{{ session.remote_instructions|first_url }}"
-             title="Online conference"><span class="fa fa-fw fd-users"></span>
+             title="Online conference"><span class="fa fa-fw fd-group"></span>
            </a>
          {% endif %}
          {{ session.remote_instructions }}