diff --git a/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js b/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
index 5a6b4a97c..b27e80b5b 100644
--- a/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
+++ b/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
@@ -2,121 +2,98 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import StatusIcon from '../../../widgets/StatusIcon';
-import Icon, { CodeIcon, EvaluationFailedIcon } from '../../../icons';
+import Icon, { EvaluationFailedIcon } from '../../../icons';
 
-export const getStatusDesc = (status, lastSubmission) => {
-  if (status === null) {
-    status = 'work-in-progress';
+const AssignmentStatusIcon = ({ id, submission = null, accepted = false, isBestSolution = false }) => {
+  if (!submission) {
+    return (
+      <StatusIcon
+        id={id}
+        icon={<Icon icon="exclamation-triangle" className="text-red" />}
+        message={
+          <FormattedMessage
+            id="app.assignemntStatusIcon.solutionMissingSubmission"
+            defaultMessage="The solution was not submitted for evaluation probably due to an error. You may need to resubmit it."
+          />
+        }
+      />
+    );
   }
-  return status === 'work-in-progress' && !lastSubmission ? 'missing-submission' : status;
-};
 
-const AssignmentStatusIcon = ({ id, status, accepted = false, isBestSolution = false }) => {
-  switch (status) {
-    case 'done':
-      return (
-        <StatusIcon
-          id={id}
-          accepted={accepted}
-          icon={<Icon icon={isBestSolution ? 'thumbs-up' : ['far', 'thumbs-up']} className="text-green" />}
-          message={
-            <>
-              <FormattedMessage
-                id="app.assignemntStatusIcon.ok"
-                defaultMessage="Assignment is successfully completed."
-              />
-              {isBestSolution && !accepted && (
-                <FormattedMessage
-                  id="app.assignemntStatusIcon.isBestSolution"
-                  defaultMessage="This is the best solution of the author submitted so far."
-                />
-              )}
-            </>
-          }
-        />
-      );
+  if (!submission.evaluation && !submission.failure) {
+    return (
+      <StatusIcon
+        id={id}
+        icon={<Icon icon="cogs" className="text-yellow" />}
+        message={
+          <FormattedMessage
+            id="app.assignemntStatusIcon.inProgress"
+            defaultMessage="Assignment solution is being evaluated."
+          />
+        }
+      />
+    );
+  }
 
-    case 'work-in-progress':
-      return (
-        <StatusIcon
-          id={id}
-          icon={<Icon icon="cogs" className="text-yellow" />}
-          message={
-            <FormattedMessage
-              id="app.assignemntStatusIcon.inProgress"
-              defaultMessage="Assignment solution is being evaluated."
-            />
-          }
-        />
-      );
+  if (submission.failure) {
+    return (
+      <StatusIcon
+        id={id}
+        icon={<EvaluationFailedIcon className="text-danger" />}
+        message={
+          <FormattedMessage id="app.assignemntStatusIcon.evaluationFailed" defaultMessage="Evaluation failed." />
+        }
+      />
+    );
+  }
 
-    case 'failed':
-      return (
-        <StatusIcon
-          id={id}
-          accepted={accepted}
-          icon={<Icon icon={isBestSolution ? 'thumbs-down' : ['far', 'thumbs-down']} className="text-red" />}
-          message={
-            <>
+  if (submission.evaluation.score >= 1.0) {
+    return (
+      <StatusIcon
+        id={id}
+        accepted={accepted}
+        icon={<Icon icon={isBestSolution ? 'thumbs-up' : ['far', 'thumbs-up']} className="text-green" />}
+        message={
+          <>
+            <FormattedMessage id="app.assignemntStatusIcon.ok" defaultMessage="Assignment is successfully completed." />
+            {isBestSolution && !accepted && (
               <FormattedMessage
-                id="app.assignemntStatusIcon.failed"
-                defaultMessage="No correct solution was submitted yet."
+                id="app.assignemntStatusIcon.isBestSolution"
+                defaultMessage="This is the best solution of the author submitted so far."
               />
-              {isBestSolution && !accepted && (
-                <FormattedMessage
-                  id="app.assignemntStatusIcon.isBestSolution"
-                  defaultMessage="This is the best solution of the author submitted so far."
-                />
-              )}
-            </>
-          }
-        />
-      );
-
-    case 'evaluation-failed':
-      return (
-        <StatusIcon
-          id={id}
-          icon={<EvaluationFailedIcon className="text-danger" />}
-          message={
-            <FormattedMessage id="app.assignemntStatusIcon.evaluationFailed" defaultMessage="Evaluation failed." />
-          }
-        />
-      );
-
-    case 'missing-submission':
-      return (
-        <StatusIcon
-          id={id}
-          icon={<Icon icon="exclamation-triangle" className="text-red" />}
-          message={
-            <FormattedMessage
-              id="app.assignemntStatusIcon.solutionMissingSubmission"
-              defaultMessage="The solution was not submitted for evaluation probably due to an error. You may need to resubmit it."
-            />
-          }
-        />
-      );
+            )}
+          </>
+        }
+      />
+    );
+  }
 
-    default:
-      return (
-        <StatusIcon
-          id={id}
-          icon={<CodeIcon className="text-gray" />}
-          message={
+  return (
+    <StatusIcon
+      id={id}
+      accepted={accepted}
+      icon={<Icon icon={isBestSolution ? 'thumbs-down' : ['far', 'thumbs-down']} className="text-red" />}
+      message={
+        <>
+          <FormattedMessage
+            id="app.assignemntStatusIcon.failed"
+            defaultMessage="No correct solution was submitted yet."
+          />
+          {isBestSolution && !accepted && (
             <FormattedMessage
-              id="app.assignemntStatusIcon.none"
-              defaultMessage="No solutions were submmitted so far."
+              id="app.assignemntStatusIcon.isBestSolution"
+              defaultMessage="This is the best solution of the author submitted so far."
             />
-          }
-        />
-      );
-  }
+          )}
+        </>
+      }
+    />
+  );
 };
 
 AssignmentStatusIcon.propTypes = {
   id: PropTypes.string.isRequired,
-  status: PropTypes.string,
+  submission: PropTypes.object,
   accepted: PropTypes.bool,
   isBestSolution: PropTypes.bool,
 };
diff --git a/src/components/Assignments/Assignment/AssignmentStatusIcon/index.js b/src/components/Assignments/Assignment/AssignmentStatusIcon/index.js
index bd63ee35e..11629b6d2 100644
--- a/src/components/Assignments/Assignment/AssignmentStatusIcon/index.js
+++ b/src/components/Assignments/Assignment/AssignmentStatusIcon/index.js
@@ -1 +1 @@
-export { default, getStatusDesc } from './AssignmentStatusIcon';
+export { default } from './AssignmentStatusIcon';
diff --git a/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js b/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js
index 1929c9bdd..bfb67ee47 100644
--- a/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js
+++ b/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 
 import SolutionReviewIcon from '../../Solutions/SolutionReviewIcon';
-import AssignmentStatusIcon, { getStatusDesc } from '../Assignment/AssignmentStatusIcon';
+import AssignmentStatusIcon from '../Assignment/AssignmentStatusIcon';
 import CommentsIcon from './CommentsIcon';
 import { PlagiarismIcon } from '../../icons';
 
@@ -17,7 +17,6 @@ const SolutionTableRowIcons = ({
   accepted,
   review = null,
   isBestSolution,
-  status,
   lastSubmission,
   commentsStats = null,
   isReviewer = false,
@@ -25,12 +24,7 @@ const SolutionTableRowIcons = ({
   links: { SOLUTION_PLAGIARISMS_URI_FACTORY },
 }) => (
   <>
-    <AssignmentStatusIcon
-      id={id}
-      status={getStatusDesc(status, lastSubmission)}
-      accepted={accepted}
-      isBestSolution={isBestSolution}
-    />
+    <AssignmentStatusIcon id={id} submission={lastSubmission} accepted={accepted} isBestSolution={isBestSolution} />
 
     {review && <SolutionReviewIcon id={`review-${id}`} review={review} isReviewer={isReviewer} gapLeft />}
 
@@ -66,7 +60,6 @@ SolutionTableRowIcons.propTypes = {
     issues: PropTypes.number,
   }),
   isBestSolution: PropTypes.bool.isRequired,
-  status: PropTypes.string,
   lastSubmission: PropTypes.shape({
     evaluation: PropTypes.shape({
       score: PropTypes.number.isRequired,
diff --git a/src/components/Assignments/SolutionsTable/SolutionsTable.js b/src/components/Assignments/SolutionsTable/SolutionsTable.js
index cd78890e6..d0cb2daa8 100644
--- a/src/components/Assignments/SolutionsTable/SolutionsTable.js
+++ b/src/components/Assignments/SolutionsTable/SolutionsTable.js
@@ -131,7 +131,6 @@ const SolutionsTable = ({
                 <SolutionsTableRow
                   key={id}
                   id={id}
-                  status={data.lastSubmission ? data.lastSubmission.evaluationStatus : null}
                   runtimeEnvironment={runtimeEnvironment}
                   assignmentId={assignmentId}
                   groupId={groupId}
diff --git a/src/components/Assignments/SolutionsTable/SolutionsTableRow.js b/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
index 3da62b16a..c1e7a44e4 100644
--- a/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
+++ b/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
@@ -19,14 +19,11 @@ import withLinks from '../../../helpers/withLinks';
 import SolutionTableRowIcons from './SolutionTableRowIcons';
 import styles from './SolutionsTable.less';
 
-const showScoreAndPoints = status => status === 'done' || status === 'failed';
-
 const SolutionsTableRow = ({
   id,
   attemptIndex,
   assignmentId,
   groupId,
-  status = null,
   note,
   lastSubmission,
   maxPoints,
@@ -90,7 +87,6 @@ const SolutionsTableRow = ({
             accepted={accepted}
             review={review}
             isBestSolution={isBestSolution}
-            status={status}
             lastSubmission={lastSubmission}
             commentsStats={commentsStats}
             isReviewer={permissionHints && permissionHints.review}
@@ -103,7 +99,7 @@ const SolutionsTableRow = ({
         </td>
 
         <td className="text-center text-nowrap valign-middle">
-          {showScoreAndPoints(status) ? (
+          {lastSubmission.evaluation ? (
             <strong className="text-success">
               <FormattedNumber style="percent" value={lastSubmission.evaluation.score} />
             </strong>
@@ -113,7 +109,7 @@ const SolutionsTableRow = ({
         </td>
 
         <td className="text-center text-nowrap valign-middle">
-          {showScoreAndPoints(status) ? (
+          {lastSubmission.evaluation ? (
             <strong className="text-success">
               <Points points={actualPoints} bonusPoints={bonusPoints} maxPoints={maxPoints} />
             </strong>
@@ -206,7 +202,6 @@ SolutionsTableRow.propTypes = {
   attemptIndex: PropTypes.number.isRequired,
   assignmentId: PropTypes.string.isRequired,
   groupId: PropTypes.string.isRequired,
-  status: PropTypes.string,
   note: PropTypes.any.isRequired,
   maxPoints: PropTypes.number.isRequired,
   bonusPoints: PropTypes.number.isRequired,
diff --git a/src/components/Exercises/ReferenceSolutionsTable/ReferenceSolutionsTableRow.js b/src/components/Exercises/ReferenceSolutionsTable/ReferenceSolutionsTableRow.js
index 248f54a04..6af7c291d 100644
--- a/src/components/Exercises/ReferenceSolutionsTable/ReferenceSolutionsTableRow.js
+++ b/src/components/Exercises/ReferenceSolutionsTable/ReferenceSolutionsTableRow.js
@@ -71,7 +71,7 @@ const ReferenceSolutionsTableRow = ({
               <EvaluationFailedIcon className="text-danger" />
             </OverlayTrigger>
           ) : (
-            <strong className={lastSubmission.isCorrect ? 'text-success' : 'text-danger'}>
+            <strong className={lastSubmission.evaluation.score >= 1.0 ? 'text-success' : 'text-danger'}>
               <FormattedNumber style="percent" value={lastSubmission.evaluation.score} />
             </strong>
           )}
diff --git a/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js b/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js
index bf692ff5b..9ae86c20b 100644
--- a/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js
+++ b/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js
@@ -27,7 +27,7 @@ const EvaluationTable = ({ evaluations, renderButtons, selectedRowId = '' }) =>
       {evaluations
         .sort((a, b) => {
           if (!a.submittedAt || !b.submittedAt) {
-            return a.evaluationStatus.localeCompare(b.evaluationStatus);
+            return a.id.localeCompare(b.id); // just to make it deterministic
           }
           return (
             ((b.evaluation && b.evaluation.evaluatedAt) || b.submittedAt) -
@@ -38,7 +38,7 @@ const EvaluationTable = ({ evaluations, renderButtons, selectedRowId = '' }) =>
           <tr key={e.id} className={selectedRowId === e.id ? 'activeRow' : ''}>
             <td>
               <span className="d-none d-xl-inline">
-                <AssignmentStatusIcon id={e.id} status={e.evaluationStatus} accepted={false} />
+                <AssignmentStatusIcon id={e.id} submission={e} accepted={false} />
               </span>
               {e.isDebug && (
                 <OverlayTrigger
@@ -63,8 +63,8 @@ const EvaluationTable = ({ evaluations, renderButtons, selectedRowId = '' }) =>
             {e.evaluation && (
               <td
                 className={classnames({
-                  'text-danger': !e.isCorrect,
-                  'text-success': e.isCorrect,
+                  'text-danger': e.evaluation.score < 1.0,
+                  'text-success': e.evaluation.score >= 1.0,
                 })}>
                 <b>
                   <FormattedNumber style="percent" value={e.evaluation.score} />
diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
index f5e096228..3d6fece8b 100644
--- a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
+++ b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
@@ -80,12 +80,7 @@ class ReferenceSolutionDetail extends Component {
 
     if (activeSubmissionId && evaluationsJS[activeSubmissionId] && evaluationsJS[activeSubmissionId].data) {
       /* eslint-disable no-var */
-      var { submittedBy, evaluation, failure, isCorrect, evaluationStatus, isDebug, ...restSub } =
-        evaluationsJS[activeSubmissionId].data;
-    } else evaluationStatus = 'missing-submission';
-
-    if (evaluationStatus === 'evaluation-failed' && !failure) {
-      failure = true;
+      var { submittedBy, evaluation, failure, isDebug, ...restSub } = evaluationsJS[activeSubmissionId].data;
     }
 
     return (
@@ -214,8 +209,6 @@ class ReferenceSolutionDetail extends Component {
               {evaluation && (
                 <EvaluationDetail
                   evaluation={evaluation}
-                  submittedAt={createdAt}
-                  isCorrect={isCorrect}
                   isDebug={isDebug}
                   viewResumbissions
                   showScoreDetail={this.openScoreDialog}
diff --git a/src/components/Solutions/EvaluationDetail/EvaluationDetail.js b/src/components/Solutions/EvaluationDetail/EvaluationDetail.js
index 21fe1392d..b127dd6c2 100644
--- a/src/components/Solutions/EvaluationDetail/EvaluationDetail.js
+++ b/src/components/Solutions/EvaluationDetail/EvaluationDetail.js
@@ -4,7 +4,6 @@ import classnames from 'classnames';
 import { FormattedMessage, FormattedNumber } from 'react-intl';
 import { Table } from 'react-bootstrap';
 
-import AssignmentStatusIcon from '../../Assignments/Assignment/AssignmentStatusIcon';
 import Box from '../../widgets/Box';
 import DateTime from '../../widgets/DateTime';
 import Explanation from '../../widgets/Explanation';
@@ -12,11 +11,7 @@ import Icon, { SuccessOrFailureIcon, BugIcon } from '../../icons';
 
 const EvaluationDetail = ({
   evaluation,
-  isCorrect,
-  submittedAt,
   maxPoints = null,
-  accepted,
-  evaluationStatus = null,
   isDebug,
   viewResumbissions = false,
   showScoreDetail = null,
@@ -80,8 +75,8 @@ const EvaluationDetail = ({
           </th>
           <td
             className={classnames({
-              'text-danger': !isCorrect,
-              'text-success': isCorrect,
+              'text-danger': evaluation.score < 1.0,
+              'text-success': evaluation.score >= 1.0,
             })}>
             <b>
               <FormattedNumber style="percent" maximumFractionDigits={3} value={evaluation.score} />
@@ -113,8 +108,8 @@ const EvaluationDetail = ({
             </th>
             <td
               className={classnames({
-                'text-danger': !isCorrect || evaluation.points <= 0,
-                'text-success': isCorrect && evaluation.points > 0,
+                'text-danger': evaluation.score < 1.0 || evaluation.points <= 0,
+                'text-success': evaluation.score >= 1.0 && evaluation.points > 0,
               })}>
               <b>
                 {evaluation.points} / {maxPoints}
@@ -123,53 +118,6 @@ const EvaluationDetail = ({
           </tr>
         )}
 
-        {!referenceSolution && (
-          <tr>
-            <td className="text-center text-muted shrink-col px-2">
-              <b>
-                <AssignmentStatusIcon id={String(submittedAt)} status={evaluationStatus} accepted={accepted} />
-              </b>
-            </td>
-            <th className="text-nowrap">
-              <FormattedMessage id="app.submission.evaluationStatus" defaultMessage="Evaluation status" />:
-            </th>
-            <td>
-              <em>
-                {evaluationStatus === 'done' && (
-                  <FormattedMessage
-                    id="app.submission.evaluation.status.isCorrect"
-                    defaultMessage="The solution is correct and meets all criteria."
-                  />
-                )}
-                {evaluationStatus === 'work-in-progress' && (
-                  <FormattedMessage
-                    id="app.submission.evaluation.status.workInProgress"
-                    defaultMessage="The solution has not been evaluated yet."
-                  />
-                )}
-                {evaluationStatus === 'failed' && (
-                  <FormattedMessage
-                    id="app.submission.evaluation.status.failed"
-                    defaultMessage="The solution does not meet the defined criteria."
-                  />
-                )}
-                {evaluationStatus === 'evaluation-failed' && (
-                  <FormattedMessage
-                    id="app.submission.evaluation.status.systemFailiure"
-                    defaultMessage="Evaluation process failed and your submission could not have been evaluated. Please submit the solution once more. If you keep receiving errors please contact the administrator of this project."
-                  />
-                )}
-                {evaluationStatus === 'missing-submission' && (
-                  <FormattedMessage
-                    id="app.submission.evaluation.status.solutionMissingSubmission"
-                    defaultMessage="The solution was not submitted for evaluation. This was probably caused by an error in the assignment configuration."
-                  />
-                )}
-              </em>
-            </td>
-          </tr>
-        )}
-
         {viewResumbissions && (
           <tr>
             <td className="text-center text-muted shrink-col px-2">
@@ -195,12 +143,8 @@ const EvaluationDetail = ({
 );
 
 EvaluationDetail.propTypes = {
-  isCorrect: PropTypes.bool.isRequired,
-  submittedAt: PropTypes.number.isRequired,
   evaluation: PropTypes.object,
   maxPoints: PropTypes.number,
-  accepted: PropTypes.bool,
-  evaluationStatus: PropTypes.string,
   isDebug: PropTypes.bool.isRequired,
   viewResumbissions: PropTypes.bool,
   showScoreDetail: PropTypes.func,
diff --git a/src/components/Solutions/SolutionDetail/SolutionDetail.js b/src/components/Solutions/SolutionDetail/SolutionDetail.js
index 2f34aeea6..02e2ebea8 100644
--- a/src/components/Solutions/SolutionDetail/SolutionDetail.js
+++ b/src/components/Solutions/SolutionDetail/SolutionDetail.js
@@ -92,14 +92,7 @@ class SolutionDetail extends Component {
     const evaluationsJS = evaluations.toJS();
     if (activeSubmissionId && evaluationsJS[activeSubmissionId] && evaluationsJS[activeSubmissionId].data) {
       /* eslint-disable no-var */
-      var { submittedBy, evaluation, failure, isCorrect, evaluationStatus, isDebug, ...restSub } =
-        evaluationsJS[activeSubmissionId].data;
-    } else {
-      evaluationStatus = 'missing-submission';
-    }
-
-    if (evaluationStatus === 'evaluation-failed' && !failure) {
-      failure = true;
+      var { submittedBy, evaluation, failure, isDebug, ...restSub } = evaluationsJS[activeSubmissionId].data;
     }
 
     return (
@@ -110,7 +103,7 @@ class SolutionDetail extends Component {
               id={id}
               attemptIndex={attemptIndex}
               evaluation={evaluation}
-              evaluationStatus={safeGet(lastSubmission, ['evaluationStatus'], 'missing-submission')}
+              lastSubmission={lastSubmission}
               submittedAt={createdAt}
               userId={authorId}
               submittedBy={submittedBy}
@@ -222,11 +215,7 @@ class SolutionDetail extends Component {
             {evaluation && (
               <EvaluationDetail
                 evaluation={evaluation}
-                submittedAt={createdAt}
                 maxPoints={maxPoints}
-                isCorrect={isCorrect}
-                accepted={accepted}
-                evaluationStatus={evaluationStatus}
                 isDebug={isDebug}
                 viewResumbissions={permissionHints.viewResubmissions}
                 showScoreDetail={this.openScoreDialog}
diff --git a/src/components/Solutions/SolutionStatus/SolutionStatus.js b/src/components/Solutions/SolutionStatus/SolutionStatus.js
index a43436a52..e36d65c2a 100644
--- a/src/components/Solutions/SolutionStatus/SolutionStatus.js
+++ b/src/components/Solutions/SolutionStatus/SolutionStatus.js
@@ -85,7 +85,7 @@ class SolutionStatus extends Component {
         pointsPercentualThreshold,
       },
       evaluation,
-      evaluationStatus,
+      lastSubmission,
       submittedAt,
       userId,
       submittedBy,
@@ -270,7 +270,7 @@ class SolutionStatus extends Component {
 
               <tr>
                 <td className="text-center text-muted shrink-col px-2">
-                  <AssignmentStatusIcon id={String(submittedAt)} status={evaluationStatus} accepted={accepted} />
+                  <AssignmentStatusIcon id={String(submittedAt)} submission={lastSubmission} accepted={accepted} />
                 </td>
                 <th className="text-nowrap">
                   <FormattedMessage id="app.solution.scoredPoints" defaultMessage="Final score" />:
@@ -613,7 +613,7 @@ SolutionStatus.propTypes = {
     pointsPercentualThreshold: PropTypes.number,
   }).isRequired,
   evaluation: PropTypes.object,
-  evaluationStatus: PropTypes.string.isRequired,
+  lastSubmission: PropTypes.object,
   submittedAt: PropTypes.number.isRequired,
   userId: PropTypes.string.isRequired,
   submittedBy: PropTypes.string,
diff --git a/src/pages/AssignmentSolutions/AssignmentSolutions.js b/src/pages/AssignmentSolutions/AssignmentSolutions.js
index c54963e17..8172884fd 100644
--- a/src/pages/AssignmentSolutions/AssignmentSolutions.js
+++ b/src/pages/AssignmentSolutions/AssignmentSolutions.js
@@ -131,7 +131,6 @@ const prepareTableColumnDescriptors = defaultMemoize((loggedUserId, assignmentId
           review={info.review}
           isReviewer={info.permissionHints && info.permissionHints.review}
           isBestSolution={info.isBestSolution}
-          status={info.lastSubmission ? info.lastSubmission.evaluationStatus : null}
           lastSubmission={info.lastSubmission}
           commentsStats={info.commentsStats}
           plagiarism={Boolean(info.plagiarism)}
@@ -314,9 +313,7 @@ const prepareTableData = defaultMemoize(
           permissionHints,
           plagiarism = null,
         }) => {
-          const statusEvaluated =
-            lastSubmission &&
-            (lastSubmission.evaluationStatus === 'done' || lastSubmission.evaluationStatus === 'failed');
+          const statusEvaluated = lastSubmission && (lastSubmission.evaluation || lastSubmission.failure);
           return {
             icon: { id, commentsStats, lastSubmission, accepted, review, permissionHints, isBestSolution, plagiarism },
             user: usersIndex[authorId],
diff --git a/src/pages/ExerciseReferenceSolutions/ExerciseReferenceSolutions.js b/src/pages/ExerciseReferenceSolutions/ExerciseReferenceSolutions.js
index 896b92aad..102eb0896 100644
--- a/src/pages/ExerciseReferenceSolutions/ExerciseReferenceSolutions.js
+++ b/src/pages/ExerciseReferenceSolutions/ExerciseReferenceSolutions.js
@@ -136,12 +136,11 @@ const prepareTableColumnDescriptors = defaultMemoize((loggedUserId, locale, link
           safeGet(c2, ['evaluation', 'score'], -1) - safeGet(c1, ['evaluation', 'score'], -1) || d2 - d1,
         cellRenderer: lastSubmission => {
           const score = safeGet(lastSubmission, ['evaluation', 'score'], null);
-          const isCorrect = safeGet(lastSubmission, ['isCorrect'], false);
           return score !== null ? (
             <strong
               className={classnames({
-                'text-danger': !isCorrect,
-                'text-success': isCorrect,
+                'text-danger': score < 1.0,
+                'text-success': score >= 1.0,
               })}>
               <FormattedNumber style="percent" maximumFractionDigits={3} value={score} />
             </strong>
diff --git a/src/pages/GroupUserSolutions/GroupUserSolutions.js b/src/pages/GroupUserSolutions/GroupUserSolutions.js
index c0f2f7df0..29bad2ec5 100644
--- a/src/pages/GroupUserSolutions/GroupUserSolutions.js
+++ b/src/pages/GroupUserSolutions/GroupUserSolutions.js
@@ -96,7 +96,6 @@ const prepareTableColumnDescriptors = defaultMemoize((assignments, groupId, loca
           review={info.review}
           isReviewer={info.permissionHints && info.permissionHints.review}
           isBestSolution={info.isBestSolution}
-          status={info.lastSubmission ? info.lastSubmission.evaluationStatus : null}
           lastSubmission={info.lastSubmission}
           commentsStats={info.commentsStats}
           plagiarism={Boolean(info.plagiarism)}
@@ -255,9 +254,7 @@ const prepareTableData = defaultMemoize(
             permissionHints,
             plagiarism = null,
           }) => {
-            const statusEvaluated =
-              lastSubmission &&
-              (lastSubmission.evaluationStatus === 'done' || lastSubmission.evaluationStatus === 'failed');
+            const statusEvaluated = lastSubmission && (lastSubmission.evalutaion || lastSubmission.failure);
             const rte = getRuntime(runtimeEnvironmentId);
 
             res.push({
diff --git a/src/redux/modules/solutions.js b/src/redux/modules/solutions.js
index 2390a0688..d02a48fe9 100644
--- a/src/redux/modules/solutions.js
+++ b/src/redux/modules/solutions.js
@@ -19,7 +19,7 @@ import { objectFilter } from '../../helpers/common';
 
 const resourceName = 'solutions';
 const needsRefetching = item =>
-  defaultNeedsRefetching(item) || item.getIn(['data', 'evaluationStatus']) === 'work-in-progress';
+  defaultNeedsRefetching(item) || (!item.getIn(['data', 'evaluation']) && !item.getIn(['data', 'failure']));
 
 const apiEndpointFactory = id => `/assignment-solutions/${id}`;
 const { actions, actionTypes, reduceActions } = factory({