diff --git a/marking_scripts/multipleresponse.jme b/marking_scripts/multipleresponse.jme
index 429d7654b..082c1dc3d 100644
--- a/marking_scripts/multipleresponse.jme
+++ b/marking_scripts/multipleresponse.jme
@@ -34,7 +34,7 @@ only_ticked_score_ticks (The score for each choice/answer pair):
               add_credit(credit,distractor)
             )
           ,
-            if(isnonemptyhtml(distractor),feedback(distractor),if(marks<>0,feedback(translate('part.mcq.incorrect choice')),false))
+            if(isnonemptyhtml(distractor),negative_feedback(distractor),if(marks<>0,negative_feedback(translate('part.mcq.incorrect choice')),false))
         );credit
       )
     ,
@@ -57,7 +57,7 @@ binary_score_ticks (Scores and feedback for each choice/answer pair, in the "bin
                 if(studentAnswer[x][y]=should_tick,
                     per_tick
                 ,
-                    assert(not isnonemptyhtml(distractor),feedback(distractor));
+                    assert(not isnonemptyhtml(distractor),negative_feedback(distractor));
                     0
                 )
             ),
diff --git a/runtime/scripts/part.js b/runtime/scripts/part.js
index d832a40ea..2b3ae2a55 100644
--- a/runtime/scripts/part.js
+++ b/runtime/scripts/part.js
@@ -1988,6 +1988,9 @@ if(res) { \
      */
     markingComment: function(message, reason, format)
     {
+        if(!this.settings.showFeedbackIcon && reason == 'incorrect' || reason=='correct') {
+            return;
+        }
         this.markingFeedback.push({
             op: 'feedback',
             message: message,