diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index f03ecfe3e..e0eb794a8 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -15,11 +15,11 @@
     {% if user.is_authenticated %}
       {% if doc.name in doc_is_tracked %}
         <a href="{% url "community_remove_track_document" doc.name %}" class="community-list-add-remove-doc" title="Remove from your personal ID list">
-          <span class="fa fa-bookmark-o"></span>
+          <span class="fa fa-bookmark"></span>
         </a>
       {% else %}
         <a href="{% url "community_add_track_document" doc.name %}" class="community-list-add-remove-doc" title="Add to your personal ID list">
-          <span class="fa fa-bookmark"></span>
+          <span class="fa fa-bookmark-o"></span>
         </a>
       {% endif %}
     {% endif %}
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index 9b0b8ffa1..10ca2759f 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -16,11 +16,7 @@
   <table class="table table-condensed table-striped">
     <thead>
       <tr>
-        <th>
-	  {% if show_add_to_list and user.is_authenticated %}
-	    <span class="fa fa-bookmark"></span>
-	  {% endif %}
-        </th>
+        <th></th>
 
         {% for h in meta.headers %}
           {% if h.title != "Title" %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 23da5b85c..75ae473a4 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -45,12 +45,7 @@
         <table class="table table-condensed table-striped ietf">
           <thead>
             <tr>
-	      <th>
-	        {% if show_add_to_list and user.is_authenticated %}
-	          <span class="fa fa-bookmark"></span>
-	        {% endif %}
-	      </th>
-
+	      <th></th>
 	      <th>Document</th>
 	      <th>Date</th>
 	      <th>Status</th>
diff --git a/static/js/ietf.js b/static/js/ietf.js
index 6e8583a7d..b40e1a24f 100644
--- a/static/js/ietf.js
+++ b/static/js/ietf.js
@@ -110,10 +110,14 @@ $(document).ready(function () {
 	    dataType: 'json',
 	    success: function(response){
 		if (response.success) {
-                    trigger.parent().find(".tooltip").remove();
-                    // it would be neater to swap in remove link
-                    trigger.replaceWith('<span class="fa fa-tag text-danger"></span>');
+                trigger.parent().find(".tooltip").remove();
+                trigger.find("span.fa").toggleClass("fa-bookmark fa-bookmark-o");
+                if (trigger.hasClass('btn')) {
+                    trigger.attr('disabled', true).blur();
+                } else {
+                    trigger.contents().unwrap().blur();
                 }
+            }
 	    }
 	});
     });