diff --git a/lms/static/images/answer-icon.png b/lms/static/images/answer-icon.png
new file mode 100644
index 0000000000..4779a6f42f
Binary files /dev/null and b/lms/static/images/answer-icon.png differ
diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss
index d05e9b9674..1821797b1b 100644
--- a/lms/static/sass/discussion/_discussion.scss
+++ b/lms/static/sass/discussion/_discussion.scss
@@ -656,6 +656,10 @@ body.discussion {
       background: url(../images/endorse-icon.png) no-repeat;
     }
 
+    &.mark-answer .check-icon {
+      background: url(../images/answer-icon.png) no-repeat;
+    }
+
     &.is-endorsed {
       border: 1px solid #4697c1;
       @include linear-gradient(top, #6dccf1, #38a8e5);
@@ -664,6 +668,11 @@ body.discussion {
       .check-icon {
         background-position: 0 -12px;
       }
+
+      &.mark-answer {
+        @include linear-gradient(top, tint(#1d9348, 60%), tint(#1d9348, 20%));
+        border: 1px solid #1d9348;
+      }
     }
   }
 
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index a3aa6ab622..c801a6180b 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -153,7 +153,20 @@
 <script aria-hidden="true" type="text/template" id="thread-response-show-template">
     <header>
         <a href="#" class="vote-btn" role="button" aria-pressed="false"><!-- DiscussionContentView.renderVote() populates this --></a>
-        <a href="javascript:void(0)" class="endorse-btn action-endorse" style="cursor: default; display: none;" data-tooltip="${_('endorse') | h}"><span class="check-icon" style="pointer-events: none; "></span></a>
+        <%
+            tooltip_expr = u"<%- thread.get('thread_type') == 'question' ? '{mark_answer}' : '{endorse}' %>".format(
+                endorse=_("endorse"),
+                mark_answer=_("mark as answer")
+            )
+        %>
+        <a
+            href="javascript:void(0)"
+            class="endorse-btn action-endorse ${"<%= thread.get('thread_type') == 'question' ? 'mark-answer' : '' %>"}"
+            style="cursor: default; display: none;"
+            data-tooltip="${tooltip_expr}"
+        >
+            <span class="check-icon" style="pointer-events: none; "></span>
+        </a>
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="posted-by">${'<%- username %>'}</a>
         ${"<% } else { %>"}