diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 0696cc6a..45579a4b 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -160,12 +160,14 @@ function finishButtonEnabled() {
         <button
           v-if="state.pageIndex > numTasks"
           :disabled="!finishButtonEnabled()"
-          class="btn-secondary z-10 flex items-center"
+          class="btn-secondary z-10"
           data-cy="next-step"
           @click="$emit('close')"
         >
-          Bewertung abschliessen
-          <it-icon-check class="ml-2 h-6 w-6"></it-icon-check>
+          <span class="flex items-center">
+            Bewertung abschliessen
+            <it-icon-check class="ml-2 h-6 w-6"></it-icon-check>
+          </span>
         </button>
       </div>
     </nav>
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 70f5326f..17923ca7 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -94,8 +94,14 @@ const assignmentDetail = computed(() =>
                     submissionStatusForUser(csu.user_id)?.userStatus ?? ''
                   )
                 "
+                class="flex items-center"
               >
-                Bewertung freigegeben
+                <div
+                  class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500 bg-green-500"
+                >
+                  <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
+                </div>
+                <div class="ml-2">Bewertung freigegeben</div>
               </div>
               <div
                 v-else-if="
@@ -103,8 +109,14 @@ const assignmentDetail = computed(() =>
                     submissionStatusForUser(csu.user_id)?.userStatus ?? ''
                   )
                 "
+                class="flex items-center"
               >
-                Ergebnisse abgegeben
+                <div
+                  class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500"
+                >
+                  <it-icon-check class="h-6 w-6"></it-icon-check>
+                </div>
+                <div class="ml-2">Ergebnisse abgegeben</div>
               </div>
               <div v-else></div>
 
@@ -114,16 +126,13 @@ const assignmentDetail = computed(() =>
             </section>
           </template>
           <template #link>
-            <div
+            <router-link
               v-if="submissionStatusForUser(csu.user_id)?.progressStatus === 'success'"
+              :to="`/course/${props.courseSession.course.slug}/cockpit/assignment/${assignment.assignmentId}/${csu.user_id}`"
+              class="w-full text-right underline"
             >
-              <router-link
-                :to="`/course/${props.courseSession.course.slug}/cockpit/assignment/${assignment.assignmentId}/${csu.user_id}`"
-                class="w-full text-right underline"
-              >
-                Ergebnisse anzeigen
-              </router-link>
-            </div>
+              Ergebnisse anzeigen
+            </router-link>
           </template>
         </ItPersonRow>
       </ul>
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index 09f165d3..415d14d3 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -132,7 +132,7 @@ const assignmentUser = computed(() => {
 </script>
 
 <template>
-  <div v-if="state.assignment && assignmentCompletion">
+  <div v-if="state.assignment">
     <div class="flex">
       <LearningContentMultiLayout
         :current-step="state.pageIndex"