diff --git a/client/src/components/selfEvaluationFeedback/FeedbackProvided.vue b/client/src/components/selfEvaluationFeedback/FeedbackProvided.vue
index 2d458cb4..f8346fed 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackProvided.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackProvided.vue
@@ -26,7 +26,7 @@ const feedbackRequesterName = computed(() => {
     :key="criteria.course_completion_id"
     class="pb-10"
   >
-    <span>{{ criteria.title }}</span>
+    <span class="text-gray-900">{{ criteria.title }}</span>
     <div class="mt-3 grid grid-cols-2 border-2 border-gray-200">
       <!-- Feedback requester assessment -->
       <div class="flex h-12 items-center pl-4">
diff --git a/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue b/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
index ee9f454d..6374b4a0 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
@@ -31,7 +31,7 @@ const onFailed = () => {
 
 <template>
   <div class="mt-16 space-y-4 bg-gray-200 p-7">
-    <span>{{ $t("a.Beurteilungskriterium") }}:</span>
+    <span>{{ $t("a.Leistungsziel") }}:</span>
     <div class="text-bold text-xl">{{ description }}</div>
   </div>
   <div class="mt-16 flex flex-row items-center pb-4">
diff --git a/client/src/components/selfEvaluationFeedback/FeedbackReceived.vue b/client/src/components/selfEvaluationFeedback/FeedbackReceived.vue
index c7503a45..2169df2c 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackReceived.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackReceived.vue
@@ -25,7 +25,7 @@ const feedbackProviderName = computed(() => {
     :key="criteria.course_completion_id"
     class="mb-10"
   >
-    <span>{{ criteria.title }}</span>
+    <span class="text-gray-900">{{ criteria.title }}</span>
     <div class="mt-3 grid grid-cols-2 border-2 border-gray-200">
       <!-- Feedback requester assessment -->
       <div class="flex h-12 items-center pl-4">
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue
index d40a5a84..eff58bc1 100644
--- a/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue
+++ b/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue
@@ -86,7 +86,7 @@ const getParticipantById = (id: string): Participant | null => {
                   <it-icon-check class="h-5 w-5"></it-icon-check>
                 </span>
               </div>
-              <span>{{ $t("a.Ergebnisse abgegeben") }}</span>
+              <span>{{ $t("a.Selbsteinschätzung geteilt") }}</span>
             </template>
             <template v-if="item.status == 'EVALUATED'">
               <div
@@ -96,7 +96,7 @@ const getParticipantById = (id: string): Participant | null => {
                   <it-icon-check class="h-5 w-5"></it-icon-check>
                 </span>
               </div>
-              <span>{{ $t("a.Bewertung freigeben") }}</span>
+              <span>{{ $t("a.Fremdeinschätzung freigeben") }}</span>
             </template>
           </div>
           <!-- Right -->
@@ -123,7 +123,7 @@ const getParticipantById = (id: string): Participant | null => {
                 },
               }"
             >
-              {{ $t("a.Fremdeinschätzung anzeigen") }}
+              {{ $t("a.Selbsteinschätzung anzeigen") }}
             </router-link>
           </div>
         </div>
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
index 0f8de6c8..e9c59ea3 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
@@ -103,6 +103,7 @@ onUnmounted(() => {
         :show-start-button="false"
         :show-previous-button="showPreviousButton"
         :base-url="props.learningUnit.evaluate_url"
+        :close-button-variant="learningUnitHasFeedbackPage ? 'close' : 'mark_as_done'"
         :end-badge-text="
           learningUnitHasFeedbackPage ? $t('general.submission') : undefined
         "
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue
index a340bb2f..1a72f31b 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue
@@ -110,6 +110,7 @@ const onRequestFeedback = async () => {
             <select
               v-model="currentSessionRequestedMentor"
               data-cy="select-learning-mentor"
+              class="mt-6"
             >
               <option
                 v-for="learningMentor in mentors"