diff --git a/static/quiz_item.coffee b/static/quiz_item.coffee
index d8adbbb..7d85459 100644
--- a/static/quiz_item.coffee
+++ b/static/quiz_item.coffee
@@ -133,15 +133,15 @@ $("#get-help").click (e) ->
 
 $("#api-refresh").click (e) ->
   e.preventDefault();
-  $("#api-refresh").find('span').addClass('glyphicon-spin');
+  $("#api-refresh").find('img').addClass('glyphicon-spin');
   $.post("/refresh").success(() ->
     refreshQuestion();
-    $("#api-refresh").find('span').removeClass('glyphicon-spin');
+    $("#api-refresh").find('img').removeClass('glyphicon-spin');
     $('#success-area').show();
   ).fail(() ->
     $('#error-area').show();
     $('#error-text').text("Cannot refresh API. Try again later.")
-    $("#api-refresh").find('span').removeClass('glyphicon-spin');
+    $("#api-refresh").find('img').removeClass('glyphicon-spin');
   );
 
 $('#error-area').find('button').click () ->
diff --git a/static/quiz_item.js b/static/quiz_item.js
index 0927d28..cffd4d4 100644
--- a/static/quiz_item.js
+++ b/static/quiz_item.js
@@ -195,15 +195,15 @@
 
   $("#api-refresh").click(function(e) {
     e.preventDefault();
-    $("#api-refresh").find('span').addClass('glyphicon-spin');
+    $("#api-refresh").find('img').addClass('glyphicon-spin');
     return $.post("/refresh").success(function() {
       refreshQuestion();
-      $("#api-refresh").find('span').removeClass('glyphicon-spin');
+      $("#api-refresh").find('img').removeClass('glyphicon-spin');
       return $('#success-area').show();
     }).fail(function() {
       $('#error-area').show();
       $('#error-text').text("Cannot refresh API. Try again later.");
-      return $("#api-refresh").find('span').removeClass('glyphicon-spin');
+      return $("#api-refresh").find('img').removeClass('glyphicon-spin');
     });
   });
 
diff --git a/templates/quiz.html b/templates/quiz.html
index e25b17a..7d08f62 100644
--- a/templates/quiz.html
+++ b/templates/quiz.html
@@ -59,7 +59,7 @@
                     <li><span id="total-num"></span> Total</li>
                 </ul>
             </li>
-            <li id="api-refresh" class="navbar-text" data-html="true" data-toggle="tooltip" data-placement="bottom" title="Last API Refresh:<br>{{ current_user.last_updated|datetime_format }}<br>Click to refresh"><span><img alt="avatar" src="http://www.gravatar.com/avatar/{{ current_user.gravatar }}?s=24"></span> {{ current_user.username }}</li>
+            <li id="api-refresh" class="navbar-text" data-html="true" data-toggle="tooltip" data-placement="bottom" title="Last API Refresh:<br>{{ current_user.last_updated|datetime_format }}<br>Click to refresh"><img alt="avatar" src="http://www.gravatar.com/avatar/{{ current_user.gravatar }}?s=24"> {{ current_user.username }}</li>
             <li><a href="{{ url_for('logout') }}">Logout</a></li>
         </ul>
     </div>