Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java	(revision c7ebbc690077e9bf87bfbe9428c6ba7152410072)
@@ -24,4 +24,5 @@
 import java.util.Calendar;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -55,5 +56,4 @@
 import dblearnstar.model.entities.StudentSubmitSolution;
 import dblearnstar.model.entities.TaskInTestInstance;
-import dblearnstar.model.entities.TaskIsOfType;
 import dblearnstar.model.entities.TestInstance;
 import dblearnstar.model.entities.TestInstanceParameters;
@@ -517,3 +517,31 @@
 	}
 
+	@CommitAfter
+	void onAssessAsCorrectSubmission(StudentSubmitSolution submission) {
+		SolutionAssessment sa = new SolutionAssessment();
+		sa.setStudentSubmitSolution(submission);
+		sa.setFeedback(messages.get("assessmentComment-correct"));
+		sa.setEvaluatedOn(new Date());
+		sa.setGrade(submission.getTaskInTestInstance().getPoints());
+		sa.setPassed(true);
+		genericService.save(sa);
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zSubmissions);
+		}
+	}
+
+	@CommitAfter
+	void onAssessAsIncorrectSubmission(StudentSubmitSolution submission) {
+		SolutionAssessment sa = new SolutionAssessment();
+		sa.setStudentSubmitSolution(submission);
+		sa.setFeedback(messages.get("assessmentComment-incorrect"));
+		sa.setEvaluatedOn(new Date());
+		sa.setGrade(0.0F);
+		sa.setPassed(false);
+		genericService.save(sa);
+		if (request.isXHR()) {
+			ajaxResponseRenderer.addRender(zSubmissions);
+		}
+	}
+
 }
Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css	(revision c7ebbc690077e9bf87bfbe9428c6ba7152410072)
@@ -175,2 +175,12 @@
 	line-height:1em;
 }
+
+.correct svg {
+	stroke: black !important; 
+	stroke-width: 2px !important;
+}
+
+.incorrect svg {
+	stroke: black !important; 
+	stroke-width: 2px !important;
+}
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/SubmissionEvaluations.tml	(revision c7ebbc690077e9bf87bfbe9428c6ba7152410072)
@@ -52,5 +52,5 @@
 								t:context="editedAssessment.studentSubmitSolution"
 								t:zone="zModal" class="btn btn-sm btn-warning">${message:reevaluate-label}
-								<t:SVGIcon t:path="check-square" />
+								<t:SVGIcon t:path="repeat" />
 							</a> <a href="" class="btn btn-sm btn-info" t:type="actionlink"
 								t:id="viewEvaluationResults" t:zone="zSQLEval"
@@ -262,5 +262,5 @@
 					<a href="" t:type="actionlink" t:id="ShowUserActivities"
 						t:context="submission" t:zone="zSelectStudents" role="button"
-						class="btn btn-xs btn-secondary">In Focus</a>
+						class="btn btn-sm btn-secondary">In Focus</a>
 				</p:submittedByCell>
 				<p:notForEvaluationCell>
@@ -288,7 +288,8 @@
 						<a href="" t:type="actionlink" t:id="reevaluateSubmission"
 							t:context="submission" t:zone="zSubmissions"
-							class="btn btn-xs btn-warning">${message:reevaluate-label}</a>
-					</div>
-					<div t:type="if" t:test="UPLOAD"></div>
+							class="btn btn-sm btn-warning"><img t:type="svgicon"
+							t:path="repeat" />${message:reevaluate-label}</a>
+					</div>
+					<div t:type="if" t:test="UPLOAD">Upload is not supported.</div>
 					<div t:type="if" t:test="submission.evaluations">
 						${message:grade-label}: <span class="badge badge-dark">${submissionsFirstEvaluation.grade}</span>
@@ -301,9 +302,19 @@
 						<a href="" t:type="actionlink" t:id="editAssessment"
 							t:async="true" t:context="submissionsFirstEvaluation"
-							class="btn btn-xs btn-primary">${message:editAssessment-label}</a>
+							class="btn btn-sm btn-primary"><img t:type="svgicon"
+							t:path="edit" />${message:editAssessment-label}</a>
 						<p:else>
 							<a href="" t:type="actionlink" t:id="addAssessment"
 								t:async="true" t:context="submission"
-								class="btn btn-xs btn-primary">${message:addAssessment-label}</a>
+								class="btn btn-sm btn-primary"><img t:type="svgicon"
+								t:path="edit" />${message:addAssessment-label}</a>
+							<a href="" t:type="eventlink" t:id="assessAsCorrectSubmission"
+								t:async="true" t:context="submission"
+								class="btn btn-sm btn-success correct"><img t:type="svgicon"
+								t:path="check" />${message:assessmentComment-correct}</a>
+							<a href="" t:type="eventlink" t:id="assessAsIncorrectSubmission"
+								t:async="true" t:context="submission"
+								class="btn btn-sm btn-warning incorrect"><img
+								t:type="svgicon" t:path="x" />${message:assessmentComment-incorrect}</a>
 						</p:else>
 					</div>
Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties
===================================================================
--- dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
+++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties	(revision c7ebbc690077e9bf87bfbe9428c6ba7152410072)
@@ -43,4 +43,6 @@
 correctEvaluatedSolutionsFromOthers-label=Solutions by other persons that were evaluated as correct
 correctEvaluatedSolutions-label=Your solutions that were evaluated as correct
+assessmentComment-correct=Correct
+assessmentComment-incorrect=Incorrect
 count-label=Count
 edit-label=Edit
Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties
===================================================================
--- dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
+++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties	(revision c7ebbc690077e9bf87bfbe9428c6ba7152410072)
@@ -43,4 +43,6 @@
 correctEvaluatedSolutionsFromOthers-label=Решенија од други студенти кои се исто така проценети за точни
 correctEvaluatedSolutions-label=Ваши решенија кои се проценети за точни
+assessmentComment-correct=Во ред
+assessmentComment-incorrect=Не е во ред
 count-label=Број
 delete-label=Отстрани