diff --git a/frontend_tests/node_tests/templates.js b/frontend_tests/node_tests/templates.js
index 7b6526fb31..98595af44c 100644
--- a/frontend_tests/node_tests/templates.js
+++ b/frontend_tests/node_tests/templates.js
@@ -1317,7 +1317,7 @@ run_test('topic_edit_form', () => {
     var html = render('topic_edit_form');
 
     var button = $(html).find("button:first");
-    assert.equal(button.find("i").attr("class"), 'icon-vector-ok');
+    assert.equal(button.find("i").attr("class"), 'fa fa-check');
 });
 
 run_test('topic_list_item', () => {
diff --git a/static/templates/topic_edit_form.handlebars b/static/templates/topic_edit_form.handlebars
index 48458e861a..a82336df14 100644
--- a/static/templates/topic_edit_form.handlebars
+++ b/static/templates/topic_edit_form.handlebars
@@ -3,8 +3,8 @@
 <form id="topic_edit_form" class="form-horizontal">
     <input type="text" value="" class="inline_topic_edit header-v" id="inline_topic_edit"
       autocomplete="off" />
-    <button type="button" class="topic_edit_save primary"><i class="icon-vector-ok"></i></button>
-    <button type="button" class="topic_edit_cancel primary"><i class="icon-vector-remove"></i></button>
+    <button type="button" class="topic_edit_save primary"><i class="fa fa-check" aria-hidden="true"></i></button>
+    <button type="button" class="topic_edit_cancel primary"><i class="fa fa-remove" aria-hidden="true"></i></button>
     <div class="topic_edit_spinner"></div>
     <div class="alert alert-error edit_error hide"></div>
 </form>