diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index e7e70455a43..9c3c8e12c4d 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -62,9 +62,9 @@ export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
 
   submitText: function(){
     if (this.get('selected.is_custom_flag')) {
-      return I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action");
+      return "<i class="fa fa-envelope"></i>" + I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action");
     } else {
-      return I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action");
+      return "<i class="fa fa-flag"></i>" + I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action");
     }
   }.property('selected.is_custom_flag'),