diff --git a/cms/templates/index.html b/cms/templates/index.html
index 947aa86512..418fc81c59 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -25,7 +25,7 @@
           <a href="#" class="button new-button new-course-button"><i class="icon fa fa-plus icon-inline"></i>
               ${_("New Course")}</a>
             % if libraries_enabled:
-              <a href="#" class="button new-button new-library-button"><i class="icon-plus icon-inline"></i>
+              <a href="#" class="button new-button new-library-button"><i class="icon fa fa-plus icon-inline"></i>
               ${_("New Library")}</a>
             % endif
           % elif course_creator_status=='disallowed_for_this_site' and settings.FEATURES.get('STUDIO_REQUEST_EMAIL',''):
diff --git a/cms/templates/js/mock/mock-container-page.underscore b/cms/templates/js/mock/mock-container-page.underscore
index 585f39fdff..ae97ed5bff 100644
--- a/cms/templates/js/mock/mock-container-page.underscore
+++ b/cms/templates/js/mock/mock-container-page.underscore
@@ -35,7 +35,7 @@
                 % endif
                     <li class="nav-item">
                         <a href="#" class="button new-button new-component-button">
-                            <i class="icon-plus icon-inline"></i>
+                            <i class="icon fa fa-plus icon-inline"></i>
                             <span class="action-button-text">${_("Add Component")}</span>
                         </a>
                    </li>
diff --git a/cms/templates/js/mock/mock-container-paged-xblock.underscore b/cms/templates/js/mock/mock-container-paged-xblock.underscore
index 2314bb8925..3602729abd 100644
--- a/cms/templates/js/mock/mock-container-paged-xblock.underscore
+++ b/cms/templates/js/mock/mock-container-paged-xblock.underscore
@@ -20,8 +20,8 @@
 		    </div>
 		    <nav class="pagination pagination-compact top">
 		        <ol>
-		            <li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><i class="icon-angle-left"></i> <span class="nav-label"><%= gettext("Previous") %></span></a></li>
-		            <li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%= gettext("Next") %></span> <i class="icon-angle-right"></i></a></li>
+		            <li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><i class="icon fa fa-angle-left"></i> <span class="nav-label"><%= gettext("Previous") %></span></a></li>
+		            <li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%= gettext("Next") %></span> <i class="icon fa fa-angle-right"></i></a></li>
 		        </ol>
 		    </nav>
 		</div>
@@ -30,7 +30,7 @@
 		<script type="text/template" id="paging-footer-tpl">
 		    <nav class="pagination pagination-full bottom">
                 <ol>
-                    <li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><i class="icon-angle-left"></i> <span class="nav-label"><%= gettext("Previous") %></span></a></li>
+                    <li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><i class="icon fa fa-angle-left"></i> <span class="nav-label"><%= gettext("Previous") %></span></a></li>
                     <li class="nav-item page">
                         <div class="pagination-form">
                             <label class="page-number-label" for="page-number"><%= gettext("Page number") %></label>
@@ -41,7 +41,7 @@
                         <span class="page-divider">/</span>
                         <span class="total-pages"><%= total_pages %></span>
                     </li>
-                    <li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%= gettext("Next") %></span> <i class="icon-angle-right"></i></a></li>
+                    <li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%= gettext("Next") %></span> <i class="icon fa fa-angle-right"></i></a></li>
                 </ol>
 		    </nav>
 		</script>
@@ -54,7 +54,7 @@
                     <div class="xblock-header-primary">
                         <div class="header-details">
                             <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
-                                <i class="icon-caret-down ui-toggle-expansion"></i>
+                                <i class="icon fa fa-caret-down ui-toggle-expansion"></i>
                                 <span class="sr">Expand or Collapse</span>
                             </a>
                             <span class="xblock-display-name">Group A</span>
@@ -156,7 +156,7 @@
                     <div class="xblock-header-primary">
                         <div class="header-details">
                             <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
-                                <i class="icon-caret-down ui-toggle-expansion"></i>
+                                <i class="icon fa fa-caret-down ui-toggle-expansion"></i>
                                 <span class="sr">Expand or Collapse</span>
                             </a>
                             <span class="xblock-display-name">Group B</span>
diff --git a/cms/templates/js/mock/mock-index-page.underscore b/cms/templates/js/mock/mock-index-page.underscore
index 0dffc7d244..737234ff8d 100644
--- a/cms/templates/js/mock/mock-index-page.underscore
+++ b/cms/templates/js/mock/mock-index-page.underscore
@@ -9,7 +9,7 @@
               New Course</a>
         </li>
         <li class="nav-item">
-          <a href="#" class="button new-button new-library-button"><i class="icon-plus icon-inline"></i>
+          <a href="#" class="button new-button new-library-button"><i class="icon fa fa-plus icon-inline"></i>
               New Library</a>
         </li>
       </ul>
diff --git a/cms/templates/js/mock/mock-manage-users-lib.underscore b/cms/templates/js/mock/mock-manage-users-lib.underscore
index d5b9ebf97b..fb0ea5e67d 100644
--- a/cms/templates/js/mock/mock-manage-users-lib.underscore
+++ b/cms/templates/js/mock/mock-manage-users-lib.underscore
@@ -9,7 +9,7 @@
       <h3 class="sr">Page Actions</h3>
       <ul>
         <li class="nav-item">
-          <a href="#" class="button new-button create-user-button"><i class="icon-plus"></i> Add Instructor</a>
+          <a href="#" class="button new-button create-user-button"><i class="icon fa fa-plus"></i> Add Instructor</a>
         </li>
       </ul>
     </nav>
@@ -72,7 +72,7 @@
                 <a href="#" class="make-user admin-role remove-admin-role">Remove Staff Access</span></a>
               </li>
             <li class="action action-delete ">
-                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon-trash"></i><span class="sr">Delete the user, honor</span></a>
+                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon fa fa-trash-o"></i><span class="sr">Delete the user, honor</span></a>
             </li>
           </ul>
 
@@ -103,7 +103,7 @@
                   <a href="#" class="make-staff admin-role remove-admin-role">Remove Admin Access</span></a>
                 </li>
             <li class="action action-delete ">
-                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon-trash"></i><span class="sr">Delete the user, audit</span></a>
+                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon fa fa-trash-o"></i><span class="sr">Delete the user, audit</span></a>
             </li>
           </ul>
 
@@ -134,7 +134,7 @@
                 <a href="#" class="make-staff admin-role add-admin-role">Add Staff Access</span></a>
               </li>
             <li class="action action-delete ">
-                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon-trash"></i><span class="sr">Delete the user, staff</span></a>
+                <a href="#" class="delete remove-user action-icon" data-tooltip="Remove this user"><i class="icon fa fa-trash-o"></i><span class="sr">Delete the user, staff</span></a>
             </li>
           </ul>
 
diff --git a/cms/templates/library.html b/cms/templates/library.html
index c66c7bfa44..9a7d8fda9a 100644
--- a/cms/templates/library.html
+++ b/cms/templates/library.html
@@ -51,7 +51,7 @@ from django.utils.translation import ugettext as _
             <ul>
                 <li class="nav-item">
                     <a href="#" class="button new-button new-component-button">
-                        <i class="icon-plus icon-inline"></i> <span class="action-button-text">${_("Add Component")}</span>
+                        <i class="icon fa fa-plus icon-inline"></i> <span class="action-button-text">${_("Add Component")}</span>
                     </a>
               </li>
             </ul>
@@ -68,7 +68,7 @@ from django.utils.translation import ugettext as _
                 <section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${context_library.location | h}" data-course-key="${context_library.location.library_key | h}">
                 </section>
                 <div class="ui-loading">
-                    <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>
             </article>
             <aside class="content-supplementary" role="complementary">
diff --git a/cms/templates/manage_users_lib.html b/cms/templates/manage_users_lib.html
index 0f3959ed93..a0deb0b307 100644
--- a/cms/templates/manage_users_lib.html
+++ b/cms/templates/manage_users_lib.html
@@ -20,7 +20,7 @@
       <ul>
         %if allow_actions:
         <li class="nav-item">
-          <a href="#" class="button new-button create-user-button"><i class="icon-plus"></i> ${_("New Team Member")}</a>
+          <a href="#" class="button new-button create-user-button"><i class="icon fa fa-plus"></i> ${_("New Team Member")}</a>
         </li>
         %endif
       </ul>
@@ -113,13 +113,13 @@
               </li>
             % endif
             <li class="action action-delete ${"is-disabled" if request.user.id == user.id and is_instructor and len(instructors) == 1 else ""}">
-                <a href="#" class="delete remove-user action-icon" data-tooltip="${_("Remove this user")}"><i class="icon-trash"></i><span class="sr">${_("Delete the user, {username}").format(username=user.username)}</span></a>
+                <a href="#" class="delete remove-user action-icon" data-tooltip="${_("Remove this user")}"><i class="icon fa fa-trash-o"></i><span class="sr">${_("Delete the user, {username}").format(username=user.username)}</span></a>
             </li>
           </ul>
           % elif request.user.id == user.id:
           <ul class="item-actions user-actions">
             <li class="action action-delete">
-                <a href="#" class="delete remove-user action-icon" data-tooltip="${_("Remove me")}"><i class="icon-trash"></i><span class="sr">${_("Remove me from this library")}</span></a>
+                <a href="#" class="delete remove-user action-icon" data-tooltip="${_("Remove me")}"><i class="icon fa fa-trash-o"></i><span class="sr">${_("Remove me from this library")}</span></a>
             </li>
           </ul>
           % endif
@@ -139,7 +139,7 @@
 
         <ul class="list-actions">
           <li class="action-item">
-            <a href="#" class="action action-primary button new-button create-user-button"><i class="icon-plus icon-inline"></i> ${_('Add a New User')}</a>
+            <a href="#" class="action action-primary button new-button create-user-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Add a New User')}</a>
           </li>
         </ul>
       </div>
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index ca4570ced8..97b005a8ae 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -150,7 +150,7 @@
         <ol>
 
           <li class="nav-item nav-library-settings">
-            <h3 class="title"><span class="label"><span class="label-prefix sr">${_("Library")} </span>${_("Settings")}</span> <i class="icon-caret-down ui-toggle-dd"></i></h3>
+            <h3 class="title"><span class="label"><span class="label-prefix sr">${_("Library")} </span>${_("Settings")}</span> <i class="icon fa fa-caret-down ui-toggle-dd"></i></h3>
 
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">