diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index f29cfacadfdd4b06f893ed7760da008231b5d5a4..e143fde220b879959437498fb56431957b3ec851 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -11,14 +11,16 @@
           {{comment.timestamp | date: 'h:mm a'}}
         </ng-template>
       </div>
-      <button mat-icon-button [disabled]="isStudent" (click)="setCorrect(comment)">
+      <button mat-icon-button [disabled]="isStudent" (click)="setCorrect(comment)"
+              matTooltip="{{ 'comment-page.correct' | translate }}">
         <mat-icon [ngClass]="{true : 'correct-icon', false: 'not-marked'}[comment.correct]">check_circle</mat-icon>
       </button>
-      <button mat-icon-button [disabled]="isStudent"
-              (click)="setFavorite(comment)">
+      <button mat-icon-button [disabled]="isStudent" (click)="setFavorite(comment)"
+              matTooltip="{{ 'comment-page.favorite' | translate }}">
         <mat-icon [ngClass]="{true: 'favorite-icon', false: 'not-marked'}[comment.favorite]">favorite</mat-icon>
       </button>
-      <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)">
+      <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)"
+              matTooltip="{{ 'comment-page.read' | translate }}">
         <mat-icon class="icon" [ngClass]="{'read-icon': comment.read, 'not-marked' : !comment.read}">visibility
         </mat-icon>
       </button>
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index eb32ec070a1d6a4226c9806404c341228f2ee0a0..fe41d474b90e0109335879be782080e6be67ef85 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -92,7 +92,10 @@
     "semicolon": "Standard CSV",
     "export": "Exportieren",
     "really": "Wollen sie wirklich alle Kommentare dieser Session löschen?",
-    "no-comments": "Es wurden noch keine Kommentare erstellt ..."
+    "no-comments": "Es wurden noch keine Kommentare erstellt ...",
+    "correct": "Als richtig markieren",
+    "favorite": "Als Favoriten markieren",
+    "read": "Als gelesen markieren"
   },
   "comment-list": {
     "search": "Suchen",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index c6fb0b52cf7853c3d6b1d10ccc48b437a475ef36..1dd0dfc7f6a2f8e157d8031c12f4dd17b28a3669 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -92,7 +92,10 @@
     "semicolon": "Standard CSV",
     "export": "Export",
     "really": "Do you really want to delete all comments of this session?",
-    "no-comments": "No comments have been created yet ..."
+    "no-comments": "No comments have been created yet ...",
+    "correct": "Mark as correct",
+    "favorite": "Mark as favorite",
+    "read": "Mark as read"
   },
   "comment-list": {
     "search": "Search",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 83c4bcc6e3ee7d165408c3e6fd90bcb806d86b89..b186753396f8e928f1113167ff1f2b2c4004da83 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -22,7 +22,10 @@
     "error-comment": "Bitte geben Sie einen Kommentartext ein.",
     "error-title": "Bitte geben Sie einen Titel ein.",
     "error-both-fields": "Bitte füllen Sie alle Felder aus.",
-    "no-comments": "Es wurden noch keine Kommentare erstellt ..."
+    "no-comments": "Es wurden noch keine Kommentare erstellt ...",
+    "correct": "Richtig",
+    "favorite": "Favorit",
+    "read": "Gelesen"
   },
   "comment-list": {
     "search": "Suchen",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 64552a26aed6509cce9d23097b3902c8a4067de9..90a76504327c56c8e262096667bb5aab5c169fc2 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -22,7 +22,10 @@
     "error-title": "Please enter a title.",
     "error-comment": "Please enter a comment-text.",
     "error-both-fields": "Please fill in all fields.",
-    "no-comments": "No comments have been created yet ..."
+    "no-comments": "No comments have been created yet ...",
+    "correct": "Correct",
+    "favorite": "Favorite",
+    "read": "Read"
   },
   "comment-list": {
     "search": "Search",