diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 1aa45a5afdbb09f68b23809ee26cde908e5ab2f6..7718edf8700674b3f31b92f46e88a28370220ad2 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -21,11 +21,11 @@
       <span class="fill-remaining-space"></span>
 
       <button mat-icon-button *ngIf="(isCreator || isModerator || comment.answer) && !inAnswerView"
-              (click)="answerComment()" tabindex="0">
+              (click)="answerComment()" tabindex="0" attr.aria-labelledby="comment_answer{{ comment.id }}">
         <mat-icon class="not-marked" [ngClass]="{'answered-icon' : comment.answer}"
-                  matTooltip="{{comment.answer ? ('comment-page.has-answer' | translate) :
-                  ('comment-page.answer' | translate) }}">
-          comment
+                  [matTooltip]="comment.answer ? ('comment-page.has-answer' | translate) :
+                  ('comment-page.answer' | translate)">
+        comment
         </mat-icon>
       </button>
 
@@ -127,6 +127,9 @@
 
 <!--Hidden Div's for a11y-Descriptions-->
 <div class="visually-hidden">
+  <div id="comment_answer{{ comment.id }}">{{comment.answer ? ( 'comment-page.a11y-comment-answer' | translate ) :
+    ( 'comment-page.a11y-comment-answer-not' | translate )}}
+  </div>
   <div id="comment_correct{{ comment.id }}">{{comment.correct != 1 ? ('comment-page.a11y-comment_not_marked_correct' | translate)
                                                               : ('comment-page.a11y-comment_marked_correct' | translate) }}
   </div>
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 79adbe89d57c60c116147b52035637de8156cfe9..65250cc0cc2c253ec27119357f191f147dd4bad0 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -60,6 +60,8 @@
     "a11y-comment_not_marked_wrong": "Verneint diese Frage",
     "a11y-comment_vote_down": "Diese Frage abwerten",
     "a11y-comment_vote_up": "Diese Frage aufwerten",
+    "a11y-comment-answer-not": "Diese Frage beantworten",
+    "a11y-comment-answer": "Antwort dieser Frage ansehen",
     "a11y-text_correct": "Diese Frage wurde bejaht.",
     "a11y-text_grade": "Diese Frage wurde als Bonus Frage markiert.",
     "a11y-text_read": "Diese Frage wurde in der Vollansicht am Beamer besprochen.",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 9c41d4318900b8a62b4202efdeb7db91d409dba8..9ae72170d6ce74055a0d11d4d63e74ef01c7d0a1 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -61,6 +61,8 @@
     "a11y-comment_not_marked_wrong": "Marks this question as not correct",
     "a11y-comment_vote_down": "Votes down this question",
     "a11y-comment_vote_up": "Votes up this question",
+    "a11y-comment-answer-not": "Create Answer",
+    "a11y-comment-answer": "View Answer",
     "a11y-text_correct": "This question was marked as correct.",
     "a11y-text_grade": "This question was marked as a bonus question.",
     "a11y-text_read": "This question was discussed in full view on the beamer",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 37bb92aa9eb4793c004dd26b57df65b2d7bceb34..9c04e8975f5d752a4f81000c091a6a977a62ca7c 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -63,6 +63,8 @@
     "a11y-comment_input": "Gib deine Frage ein",
     "a11y-comment_vote_down": "Diese Frage abwerten",
     "a11y-comment_vote_up": "Diese Frage aufwerten",
+    "a11y-comment-answer-not": "Diese Frage beantworten",
+    "a11y-comment-answer": "Antwort dieser Frage ansehen",
     "a11y-text_correct": "Diese Frage wurde bejaht.",
     "a11y-text_grade": "Diese Frage wurde als Bonus Frage markiert.",
     "a11y-text_read": "Diese Frage wurde in der Vollansicht am Beamer besprochen.",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 39f95fdeb4e955928d97ac14f2bb4418ae90c67d..ae588427612ae98c64fa6278c0fb331469d77166 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -63,6 +63,8 @@
     "a11y-comment_input": "Enter your question",
     "a11y-comment_vote_down": "Votes down this question",
     "a11y-comment_vote_up": "Votes up this question",
+    "a11y-comment-answer-not": "Create Answer",
+    "a11y-comment-answer": "View Answer",
     "a11y-text_correct": "This question was marked as correct.",
     "a11y-text_grade": "This question was marked as a bonus question.",
     "a11y-text_read": "This question was discussed in full view on the beamer",