diff --git a/lms/static/js/edxnotes/views/tabs/course_structure.js b/lms/static/js/edxnotes/views/tabs/course_structure.js
index 8aa997c15303..3ed0e4a758ae 100644
--- a/lms/static/js/edxnotes/views/tabs/course_structure.js
+++ b/lms/static/js/edxnotes/views/tabs/course_structure.js
@@ -45,7 +45,7 @@ define([
         tabInfo: {
             name: gettext('Location in Course'),
             identifier: 'view-course-structure',
-            icon: 'icon-list-ul'
+            icon: 'fa fa-list-ul'
         }
     });
 
diff --git a/lms/static/js/edxnotes/views/tabs/recent_activity.js b/lms/static/js/edxnotes/views/tabs/recent_activity.js
index 49a98c0e967e..58a54c3403d1 100644
--- a/lms/static/js/edxnotes/views/tabs/recent_activity.js
+++ b/lms/static/js/edxnotes/views/tabs/recent_activity.js
@@ -22,7 +22,7 @@ define([
         tabInfo: {
             identifier: 'view-recent-activity',
             name: gettext('Recent Activity'),
-            icon: 'icon-time'
+            icon: 'fa fa-clock-o'
         }
     });
 
diff --git a/lms/static/js/edxnotes/views/tabs/search_results.js b/lms/static/js/edxnotes/views/tabs/search_results.js
index d3bc6877cab4..726517a8090a 100644
--- a/lms/static/js/edxnotes/views/tabs/search_results.js
+++ b/lms/static/js/edxnotes/views/tabs/search_results.js
@@ -54,7 +54,7 @@ define([
         tabInfo: {
             identifier: 'view-search-results',
             name: gettext('Search Results'),
-            icon: 'icon-search',
+            icon: 'fa fa-search',
             is_closable: true
         },
 
diff --git a/lms/static/js/fixtures/edxnotes/edxnotes.html b/lms/static/js/fixtures/edxnotes/edxnotes.html
index 3a47f0eee892..dd8f497b5a56 100644
--- a/lms/static/js/fixtures/edxnotes/edxnotes.html
+++ b/lms/static/js/fixtures/edxnotes/edxnotes.html
@@ -10,7 +10,7 @@ <h1 class="page-title">
             <form role="search" action="/search_endpoint" method="GET" id="search-notes-form" class="is-hidden">
                 <label for="search-notes-input" class="sr">Search notes for:</label>
                 <input type="search" class="search-notes-input" id="search-notes-input" name="note" placeholder="Search notes for...">
-                <button type="submit" class="search-notes-submit"><i class="icon-search"></i> Search</button>
+                <button type="submit" class="search-notes-submit"><i class="icon fa fa-search"></i> Search</button>
             </form>
         </div>
     </div>
@@ -21,7 +21,7 @@ <h2 id="tab-view" class="tabs-label">View notes by:</h2>
         </div>
         <div class="inline-error is-hidden" tabindex="-1"></div>
         <div class="ui-loading" tabindex="-1">
-            <p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">Loading</span></p>
+            <p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p>
         </div>
 
     </section>
diff --git a/lms/templates/edxnotes/edxnotes.html b/lms/templates/edxnotes/edxnotes.html
index ac19e6fd3882..7d34a9f1d6df 100644
--- a/lms/templates/edxnotes/edxnotes.html
+++ b/lms/templates/edxnotes/edxnotes.html
@@ -21,7 +21,7 @@ <h1 class="page-title">${_('Notes')} <small class="page-subtitle">${_("Highlight
                     <form role="search" action="${search_endpoint}" method="GET" id="search-notes-form" class="is-hidden">
                         <label for="search-notes-input" class="sr">${_('Search notes for:')}</label>
                         <input type="search" class="search-notes-input" id="search-notes-input" name="note" placeholder="${_('Search notes for...')}">
-                        <button type="submit" class="search-notes-submit"><i class="icon-search"></i> ${_('Search')}</button>
+                        <button type="submit" class="search-notes-submit"><i class="icon fa fa-search"></i> ${_('Search')}</button>
                     </form>
                 </div>
             % endif
@@ -34,7 +34,7 @@ <h2 id="tab-view" class="tabs-label">${_('View notes by:')}</h2>
                 <div class="inline-error is-hidden" tabindex="-1"></div>
             % if notes:
                 <div class="ui-loading" tabindex="-1">
-                    <p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
+                    <p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
                 </div>
             % else:
                 <section class="is-empty">
diff --git a/lms/templates/edxnotes/toggle_notes.html b/lms/templates/edxnotes/toggle_notes.html
index 9a836e7d967c..f8d6c157cc02 100644
--- a/lms/templates/edxnotes/toggle_notes.html
+++ b/lms/templates/edxnotes/toggle_notes.html
@@ -9,7 +9,7 @@
 %>
 <div class="wrapper-utility edx-notes-visibility">
   <button class="utility-control utility-control-button action-toggle-notes is-disabled ${"is-active" if edxnotes_visibility else ""}" aria-pressed="">
-    <i class="icon-pencil"></i>
+    <i class="icon fa fa-pencil"></i>
     % if edxnotes_visibility:
      <span class="utility-control-label sr">${_("Hide notes")}</span>
     % else: