diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 1132962959735a32023401b456f86f5b437ce725..8d80e429e826c93fc9266295cc278588b4d37fed 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -7,20 +7,16 @@
             (click)="goBack()">
       <mat-icon class="header-icons">arrow_back</mat-icon>
     </button>
-    <button mat-icon-button
-            aria-hidden="true"
-            *ngIf="isSafari === 'false'  && !router.url.includes('home')"
-            (click)="getRescale().toggleState();">
-      <mat-icon class="header-icons"
-                (click)="getRescale().toggleState();">fullscreen
-      </mat-icon>
-    </button>
+
     <span class="fill-remaining-space"></span>
+
     <h2 class="oldtypo-h2"
         *ngIf="router.url.includes('comments')  && deviceType === 'desktop'"
         fxLayoutAlign="center center">
       {{cTime}}
     </h2>
+
+    <!--
     <span *ngIf="router.url.includes('comments')  && !router.url.includes('moderator/comments') && deviceType === 'desktop'"
           class="fill-remaining-space"></span>
     <span class="fill-remaining-space"
@@ -33,7 +29,7 @@
       gavel
     </mat-icon>
   </span>
-    <!--
+
     <h2 class="oldtypo-h2"
         id="shortId-header"
         *ngIf="router.url.includes('comments')"
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 3c5bdb27c961b6a5e23080afebc8ca1b6430f74e..40342737d63ebd8af3f6b78fb7874d555b8c1274 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -11,7 +11,7 @@
     "a11y-filter_list": "Option Fragen zu filtern",
     "a11y-grade": "Filtert alle Bonus Fragen",
     "a11y-moderator": "Filtert alle Fragen von Moderatoren",
-    "a11y-lecturer": "Filtert alle Fragen von Dozenten", 
+    "a11y-lecturer": "Filtert alle Fragen von Dozenten",
     "a11y-bookmark": "Filtert alle Fragen mit Lesezeichen",
     "a11y-keyboard_arrow_down": "Sortiert die Fragen nach absteigenden Bewertungen",
     "a11y-keyboard_arrow_up": "Sortiert die Fragen nach aufsteigenden Bewertungen",
@@ -39,10 +39,10 @@
     "filter-answered": "Beantwortete Fragen",
     "filter-comments": "Fragen filtern",
     "filter-correct": "Bejahte Fragen",
-    "filter-favorite": "Ausgezeichnete Fragen",
+    "filter-favorite": "Vorgemerkt für Bonus",
     "filter-bookmark": "Markierte Fragen",
-    "filter-moderator": "Fragen von Moderatoren",
-    "filter-lecturer": "Fragen vom Dozenten",
+    "filter-moderator": "Hinweise des Moderators",
+    "filter-lecturer": "Ankündigungen",
     "filter-owner": "Meine Fragen",
     "filter-read": "Besprochene Fragen",
     "filter-reset": "Zurücksetzen",
@@ -78,7 +78,7 @@
     "token": "Bonus-Token",
     "token-time": "Token-Zeitstempel",
     "no-comments": "Es sind noch keine Fragen vorhanden.",
-    "export-comments": "Fragen exportieren"
+    "export-comments": "Fragen speichern"
   },
   "comment-page": {
     "a11y-comment_delete": "Löscht diese Frage",
@@ -120,7 +120,7 @@
     "delete": "Frage löschen",
     "delimiter": "Dateiformat",
     "edit-menu": "Frage beantworten, markieren oder löschen",
-    "enter-comment": "Frage oder Mitteilung ans Publikum …",
+    "enter-comment": "Dein Beitrag wird an den Listenanfang gesetzt.",
     "enter-title": "Titel",
     "error-both-fields": "Bitte fülle alle Felder aus.",
     "error-comment": "Bitte gib eine Frage ein.",
@@ -255,7 +255,7 @@
     "deleted": " gelöscht.",
     "description": "Beschreibung",
     "email-error": "E-Mail-Adresse ist ungültig.",
-    "export-comments": "Fragen exportieren",
+    "export-comments": "Fragen speichern",
     "no-comments": "Es sind noch keine Fragen vorhanden.",
     "general": "Sitzung",
     "live-announcer": "Du befindest dich jetzt in der Sitzung. Um Informationen zu Tastenkombinationen zu erhalten drücke jetzt die Enter-Taste oder rufe die Ansage zu einem späteren Zeitpunkt mit der Escape-Taste auf.",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 6fe0e84ea0f3d23123c50469c24534a0c81681c7..0eaea0517aff2d67bff31c5b9332b1a26d6043b1 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -11,7 +11,7 @@
     "a11y-filter_list": "Option to filter questions",
     "a11y-grade": "Filters all bonus questions",
     "a11y-moderator": "Filters all moderator questions",
-    "a11y-lecturer": "Filters all lecturer questions", 
+    "a11y-lecturer": "Filters all lecturer questions",
     "a11y-bookmark": "Filters all bookmark questions",
     "a11y-keyboard_arrow_down": "Sorts questions by descending votes",
     "a11y-keyboard_arrow_up": "Sorts questions by ascending votes",
@@ -39,10 +39,10 @@
     "filter-answered": "Answered questions",
     "filter-comments": "Filter questions",
     "filter-correct": "Affirmed questions",
-    "filter-favorite": "Excellent questions",
+    "filter-favorite": "Earmarked for bonus",
     "filter-bookmark": "Bookmarked questions",
-    "filter-moderator": "Questions by the moderator",
-    "filter-lecturer": "Questions by the lecturer",
+    "filter-moderator": "Notes from the moderator",
+    "filter-lecturer": "Announcements",
     "filter-owner": "My questions",
     "filter-read": "Questions discussed",
     "filter-reset": "Reset",
@@ -79,7 +79,7 @@
     "token": "Bonus token",
     "token-time": "Token timestamp",
     "no-comments": "There are no questions yet.",
-    "export-comments": "Export questions"
+    "export-comments": "Save questions"
   },
   "comment-page": {
     "a11y-comment_delete": "Deletes this question",
@@ -121,7 +121,7 @@
     "delete": "Delete question",
     "delimiter": "Please choose a format!",
     "edit-menu": "Answer, mark or delete question",
-    "enter-comment": "Question or message to the audience",
+    "enter-comment": "Your entry will be placed at the top of the list.",
     "enter-title": "Title",
     "error-both-fields": "Please fill in all fields.",
     "error-comment": "Please ask a question.",
@@ -256,7 +256,7 @@
     "deleted": " deleted.",
     "description": "Description",
     "email-error": "E-Mail is invalid.",
-    "export-comments": "Export questions",
+    "export-comments": "Save questions",
     "no-comments": "There are no questions yet.",
     "general": "Session",
     "live-announcer": "You're in the session now. To get information about key combinations press the Enter key or call the announcement later with the Escape key.",
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 642c18a9f4f95c84ffaa4220a982f929a7417057..c4ead7d62231543d8d3e90cea172b89c26ae6fe9 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -64,7 +64,7 @@
     "QR": "QR-Code der Sitzung in Vollansicht",
     "my-account": "Optionen",
     "my-guest-account": "Gastkonto",
-    "my-sessions": "Zur Sitzungsliste",
+    "my-sessions": "Sitzungsliste",
     "really-delete-account": "Willst du dein Konto mit allen Sitzungen unwiderruflich löschen? Falls du Boni vergeben hast (Sterne), exportiere die Fragen, damit du eingereichte Bonus-Tokens überprüfen kannst.",
     "sure": "Bist du sicher?",
     "user-bonus-token": "Deine Sterne",
@@ -76,9 +76,9 @@
     "bonustoken": "Bonustoken",
     "edit-moderator": "Moderatoren",
     "edit-tags": "Tags",
-    "export-questions": "Fragen exportieren",
+    "export-questions": "Fragen speichern",
     "delete-questions": "Fragen löschen",
-    "back-to-questionboard": "Zum Fragenboard",
+    "back-to-questionboard": "Fragenboard",
     "create-question": "Frage stellen",
     "questionwall": "Fragenwand",
     "fullscreen": "Vollansicht",
@@ -232,7 +232,7 @@
     "join-message-template": "An der Sitzung {{session}} mit dem Code {{id}} und in der Rolle {{role}} teilnehmen.",
     "moderator-role": "Moderator",
     "no-room-history": "Deine Sitzungsliste ist leer.",
-    "panel-join-button": "Option",
+    "panel-join-button": "",
     "panel-remove-button": "Sitzung aus der Liste streichen",
     "delete-room": "Sitzung löschen",
     "panel-session-id": "Raum-Code",
@@ -258,7 +258,7 @@
     "token": "Bonus-Token",
     "token-time": "Token-Zeitstempel",
     "no-comments": "Es sind noch keine Fragen vorhanden.",
-    "export-comments": "Fragen exportieren"
+    "export-comments": "Fragen speichern"
   },
   "session": {
     "create-session": "Speichern",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 380decc806f6111ae1145b6294f4f313353b4473..b25b4e29f811a24e11cff1d145cc1feabe1ec267 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -65,7 +65,7 @@
     "QR": "QR code of the session in full view",
     "my-account": "Options",
     "my-guest-account": "Guest Account",
-    "my-sessions": "Go to session list",
+    "my-sessions": "Session list",
     "really-delete-account": "Do you want to irrevocably delete your account with all sessions? If you have given bonus stars, export the questions so that you can check submitted bonus tokens.",
     "sure": "Are you sure?",
     "user-bonus-token": "Your stars",
@@ -77,9 +77,9 @@
     "bonustoken": "Assigned Stars",
     "edit-moderator": "Moderators",
     "edit-tags": "Tags",
-    "export-questions": "Export questions",
+    "export-questions": "Save questions",
     "delete-questions": "Delete questions",
-    "back-to-questionboard": "Back to question board",
+    "back-to-questionboard": "Question board",
     "create-question": "Ask a question",
     "questionwall": "Question wall",
     "fullscreen": "Fullscreen",
@@ -234,7 +234,7 @@
     "join-message-template": "Join the session {{session}} with code {{id}} and in the role {{role}}",
     "moderator-role": "Moderator",
     "no-room-history": "Your session list is empty.",
-    "panel-join-button": "Option",
+    "panel-join-button": "",
     "panel-remove-button": "Remove session from list",
     "delete-room": "Delete session",
     "panel-session-id": "Key code",
@@ -260,7 +260,7 @@
     "token": "Bonus token",
     "token-time": "Token timestamp",
     "no-comments": "There are no questions yet.",
-    "export-comments": "Export questions"
+    "export-comments": "Save questions"
   },
   "session": {
     "create-session": "Save",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 1edb9bb0826d6a9d1d666e3026e8ad55065f378d..ba996609ca91fd04393a202679991df53658feb6 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -11,7 +11,7 @@
     "a11y-filter_list": "Option Fragen zu filtern",
     "a11y-grade": "Filtert alle Bonus Fragen",
     "a11y-moderator": "Filtert alle Fragen von Moderatoren",
-    "a11y-lecturer": "Filtert alle Fragen von Dozenten", 
+    "a11y-lecturer": "Filtert alle Fragen von Dozenten",
     "a11y-bookmark": "Filtert alle Fragen mit Lesezeichen",
     "a11y-keyboard_arrow_down": "Sortiert die Fragen nach absteigenden Bewertungen",
     "a11y-keyboard_arrow_up": "Sortiert die Fragen nach aufsteigenden Bewertungen",
@@ -40,10 +40,10 @@
     "filter-answered": "Beantwortete Fragen",
     "filter-comments": "Fragen filtern",
     "filter-correct": "Bejahte Fragen",
-    "filter-favorite": "Ausgezeichnete Fragen",
+    "filter-favorite": "Vorgemerkt für Bonus",
     "filter-bookmark": "Lesezeichen",
-    "filter-moderator": "Fragen des Moderators",
-    "filter-lecturer": "Fragen des Dozenten",
+    "filter-moderator": "Hinweise des Moderators",
+    "filter-lecturer": "Ankündigungen",
     "filter-owner": "Meine Fragen",
     "filter-read": "Besprochene Fragen",
     "filter-reset": "Zurücksetzen",
@@ -79,7 +79,7 @@
     "token": "Bonus-Token",
     "token-time": "Token-Zeitstempel",
     "no-comments": "Es sind noch keine Fragen vorhanden.",
-    "export-comments": "Fragen exportieren"
+    "export-comments": "Fragen speichern"
   },
   "content": {
     "cancel": "Abbrechen",
@@ -180,10 +180,10 @@
     "sort-new": "Neuste",
     "sort-old": "Älteste",
     "filter-user": "User",
-    "filter-favorite": "Favoriten",
+    "filter-favorite": "Vorgemerkt für Bonus",
     "filter-bookmark": "Lesezeichen",
-    "filter-moderator": "Fragen des Moderators",
-    "filter-lecturer": "Fragen des Dozenten",
+    "filter-moderator": "Hinweise des Moderators",
+    "filter-lecturer": "Ankündigungen",
     "filter-approved": "Bejaht",
     "filter-disapproved": "Verneint",
     "filter-remove": "Filter entfernen",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index b6ef72fac0d8479236c5ddc62427cc2aca748d8b..c13730f6cbcc03c3612fc325793d34249676018e 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -21,7 +21,7 @@
     "a11y-filter_list": "Option to filter questions",
     "a11y-grade": "Filters all bonus questions",
     "a11y-moderator": "Filters all moderator questions",
-    "a11y-lecturer": "Filters all lecturer questions", 
+    "a11y-lecturer": "Filters all lecturer questions",
     "a11y-bookmark": "Filters all bookmark questions",
     "a11y-keyboard_arrow_down": "Sorts questions by descending votes",
     "a11y-keyboard_arrow_up": "Sorts questions by ascending votes",
@@ -50,10 +50,10 @@
     "filter-answered": "Answered questions",
     "filter-comments": "Filter questions",
     "filter-correct": "Affirmed questions",
-    "filter-favorite": "Bonus questions",
+    "filter-favorite": "Earmarked for bonus",
     "filter-bookmark": "Bookmarked questions",
-    "filter-moderator": "Questions by the moderator",
-    "filter-lecturer": "Questions by the lecturer",
+    "filter-moderator": "Notes from the moderator",
+    "filter-lecturer": "Announcements",
     "filter-owner": "My questions",
     "filter-read": "Questions discussed",
     "filter-reset": "Reset",
@@ -89,7 +89,7 @@
     "token": "Bonus token",
     "token-time": "Token timestamp",
     "no-comments": "There are no questions yet.",
-    "export-comments": "Export questions"
+    "export-comments": "Save questions"
   },
   "content": {
     "cancel": "Cancel",
@@ -188,7 +188,7 @@
     "sort-new": "Newest",
     "sort-old": "Oldest",
     "filter-user": "User",
-    "filter-favorite": "Favorites",
+    "filter-favorite": "Earmarked for bonus",
     "filter-bookmark": "Bookmarked",
     "filter-approved": "Affirmed",
     "filter-disapproved": "Negated",