diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 88919ea65..abe831777 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -338,9 +338,9 @@
 	{% endif %}
 	{% if user.is_authenticated %}
 	    {% if tracking_document %}
-			<a class="btn btn-default btn-xs"  href="{% url "community_remove_track_document" doc.name %}" title="Remove from your personal ID list"><span class="fa fa-bookmark-o"></span> Untrack</a>
+                        <a class="btn btn-default btn-xs community-list-add-remove-doc" href="{% url "community_remove_track_document" doc.name %}" title="Remove from your personal ID list"><span class="fa fa-bookmark-o"></span> Untrack</a>
 	    {% else %}
-			<a class="btn btn-default btn-xs"  href="{% url "community_add_track_document" doc.name %}" title="Add to your personal ID list"><span class="fa fa-bookmark"></span> Track</a>
+                        <a class="btn btn-default btn-xs community-list-add-remove-doc" href="{% url "community_add_track_document" doc.name %}" title="Add to your personal ID list"><span class="fa fa-bookmark"></span> Track</a>
 	    {% endif %}
 	{% endif %}
 
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 2bfa5f5c2..3417a6cb9 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -6,12 +6,12 @@
 <td>
 	{% if user.is_authenticated %}
 		{% if not doc.name in have_doc_status %}
-		{% elif doc.name in doc_is_tracked %}
-	        <a href="{% url "community_remove_track_document" doc.name %}" title="Remove from your personal ID list">
-	            <span class="fa fa-bookmark-o"></span>
+                {% elif 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>
 	        </a>
 		{% else %}
-	        <a href="{% url "community_add_track_document" doc.name %}" title="Add to your personal ID list">
+                <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>
 	        </a>
 		{% endif %}
diff --git a/static/facelift/js/ietf.js b/static/facelift/js/ietf.js
index 25a74fa5d..a7f45a71b 100644
--- a/static/facelift/js/ietf.js
+++ b/static/facelift/js/ietf.js
@@ -100,7 +100,7 @@ $(document).ready(function () {
 	}
 
 	// search results
-	$('.addtolist a').click(function(e) {
+        $('.community-list-add-remove-doc').click(function(e) {
 		e.preventDefault();
 		var trigger = $(this);
 		$.ajax({
@@ -110,8 +110,10 @@ $(document).ready(function () {
 			dataType: 'json',
 			success: function(response){
 				if (response.success) {
-					trigger.replaceWith('<span class="fa fa-tag text-danger"></span>');
-				}
+                                    trigger.parent().find(".tooltip").remove();
+                                    // it would be neater to swap in remove link
+                                    trigger.replaceWith('<span class="fa fa-tag text-danger"></span>');
+                                }
 			}
 		});
 	});