diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js
index bbea9e0bd1abe9ca0c207c1673c24419ce865998..3615b90cc5414d72d8ba11be77a09cde830a0db8 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js
@@ -42,6 +42,7 @@ const StyledIconWrong = styled(Icon)`
   pointer-events: none;
   width: 24px;
 `;
+
 const YesNoSwitch = ({
   customProps,
   node: { node },
diff --git a/wax-questions-service/src/NumericalAnswerService/components/ExactAnswerComponent.js b/wax-questions-service/src/NumericalAnswerService/components/ExactAnswerComponent.js
index 6b03d59b9e74b940bc9d529ca6a35eb640960660..ce36de4d81751fdd94f18114ccfff46fe67aac1f 100644
--- a/wax-questions-service/src/NumericalAnswerService/components/ExactAnswerComponent.js
+++ b/wax-questions-service/src/NumericalAnswerService/components/ExactAnswerComponent.js
@@ -1,7 +1,7 @@
 /* eslint-disable react/prop-types */
 import React, { useRef, useState, useContext } from 'react';
 import styled from 'styled-components';
-import { DocumentHelpers, WaxContext } from 'wax-prosemirror-core';
+import { DocumentHelpers, WaxContext, Icon } from 'wax-prosemirror-core';
 
 const AnswerContainer = styled.div`
   display: flex;
@@ -37,6 +37,20 @@ const FinalResult = styled.span`
   font-weight: 999;
 `;
 
+const StyledIconCorrect = styled(Icon)`
+  fill: #008000;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
+const StyledIconWrong = styled(Icon)`
+  fill: red;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
 const ExactAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
   const context = useContext(WaxContext);
   const [exact, setExact] = useState(node.attrs.answersExact.exactAnswer || '');
@@ -176,7 +190,10 @@ const ExactAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
           </span>
           <span>
             Answer:{' '}
-            <FinalResult isCorrect={isCorrect}>{exactStudent}</FinalResult>
+            <FinalResult isCorrect={isCorrect}>
+              {exactStudent} {isCorrect && <StyledIconCorrect name="done" />}
+              {!isCorrect && <StyledIconWrong name="close" />}
+            </FinalResult>
           </span>
         </ResultContainer>
       )}
diff --git a/wax-questions-service/src/NumericalAnswerService/components/PreciseAnswerComponent.js b/wax-questions-service/src/NumericalAnswerService/components/PreciseAnswerComponent.js
index eca3b188a15ef2e6c45869807940d5ae167b50f5..84f67178732a943aad8f9478664b321450d0803e 100644
--- a/wax-questions-service/src/NumericalAnswerService/components/PreciseAnswerComponent.js
+++ b/wax-questions-service/src/NumericalAnswerService/components/PreciseAnswerComponent.js
@@ -1,7 +1,7 @@
 /* eslint-disable react/prop-types */
 import React, { useRef, useState, useContext } from 'react';
 import styled from 'styled-components';
-import { DocumentHelpers, WaxContext } from 'wax-prosemirror-core';
+import { DocumentHelpers, WaxContext, Icon } from 'wax-prosemirror-core';
 
 const AnswerContainer = styled.div`
   display: flex;
@@ -37,6 +37,20 @@ const FinalResult = styled.span`
   font-weight: 999;
 `;
 
+const StyledIconCorrect = styled(Icon)`
+  fill: #008000;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
+const StyledIconWrong = styled(Icon)`
+  fill: red;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
 const PreciseAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
   const context = useContext(WaxContext);
   const [precise, setPrecise] = useState(
@@ -147,7 +161,10 @@ const PreciseAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
           <span>{`(Accepted Answers : ${precise.replaceAll(';', ' -')})`}</span>
           <span>
             Answer:{' '}
-            <FinalResult isCorrect={isCorrect}>{preciseStudent}</FinalResult>
+            <FinalResult isCorrect={isCorrect}>
+              {preciseStudent} {isCorrect && <StyledIconCorrect name="done" />}
+              {!isCorrect && <StyledIconWrong name="close" />}
+            </FinalResult>
           </span>
         </ResultContainer>
       )}
diff --git a/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js b/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
index 612e0702d33a0adabb8c666dc189e313a2fbdc06..3896b668c76c56d4e52034d5b95999409c33edf2 100644
--- a/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
+++ b/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
@@ -1,7 +1,7 @@
 /* eslint-disable react/prop-types */
 import React, { useRef, useState, useContext } from 'react';
 import styled from 'styled-components';
-import { DocumentHelpers, WaxContext } from 'wax-prosemirror-core';
+import { DocumentHelpers, WaxContext, Icon } from 'wax-prosemirror-core';
 
 const AnswerContainer = styled.div`
   display: flex;
@@ -37,6 +37,20 @@ const FinalResult = styled.span`
   font-weight: 999;
 `;
 
+const StyledIconCorrect = styled(Icon)`
+  fill: #008000;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
+const StyledIconWrong = styled(Icon)`
+  fill: red;
+  height: 24px;
+  pointer-events: none;
+  width: 24px;
+`;
+
 const RangeAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
   const context = useContext(WaxContext);
   const [minValue, setMinValue] = useState(
@@ -116,7 +130,8 @@ const RangeAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
   // SUBMIT
 
   const isCorrect = !!(
-    rangeStudentValue <= maxValue && rangeStudentValue >= minValue
+    Number(rangeStudentValue) <= Number(maxValue) &&
+    Number(rangeStudentValue) >= Number(minValue)
   );
 
   return (
@@ -178,7 +193,11 @@ const RangeAnswerComponent = ({ node, readOnly, testMode, showFeedBack }) => {
           </span>
           <span>
             Answer:{' '}
-            <FinalResult isCorrect={isCorrect}>{rangeStudentValue}</FinalResult>
+            <FinalResult isCorrect={isCorrect}>
+              {rangeStudentValue}{' '}
+              {isCorrect && <StyledIconCorrect name="done" />}
+              {!isCorrect && <StyledIconWrong name="close" />}
+            </FinalResult>
           </span>
         </ResultContainer>
       )}