diff --git a/src/app/components/creator/_dialogs/bonus-delete/bonus-delete.component.html b/src/app/components/creator/_dialogs/bonus-delete/bonus-delete.component.html
index 3cf979abb1c3105dfe3a0eaeaa55057519440b6c..ab20226fa6b3dd84cb0f5e4ab705d3bc549159f9 100644
--- a/src/app/components/creator/_dialogs/bonus-delete/bonus-delete.component.html
+++ b/src/app/components/creator/_dialogs/bonus-delete/bonus-delete.component.html
@@ -1,5 +1,4 @@
 <h2 class="oldtypo-h2">{{ 'room-page.sure' | translate }}</h2>
-<mat-divider></mat-divider>
 <p class="oldtypo-p">{{reallyDeleteText}}</p>
 <app-dialog-action-buttons
   buttonsLabelSection="content"
diff --git a/src/app/components/creator/_dialogs/delete-answer/delete-answer.component.html b/src/app/components/creator/_dialogs/delete-answer/delete-answer.component.html
index efb99a94313dedc72250ce710100b6f2b77be485..773d4e2925a8ebea612012c4a79777ba48dcd7c4 100644
--- a/src/app/components/creator/_dialogs/delete-answer/delete-answer.component.html
+++ b/src/app/components/creator/_dialogs/delete-answer/delete-answer.component.html
@@ -1,5 +1,4 @@
 <h3>{{ 'room-page.sure' | translate }}</h3>
-<mat-divider></mat-divider>
 <p>{{ 'comment-page.really-delete-answer' | translate }}</p>
 <app-dialog-action-buttons
   buttonsLabelSection="content"
diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
index 481c7295862f174425fbec53d461ce923e73ca32..69e831011b567ee47e3cc08fddbec9e83a0a41fc 100644
--- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
+++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
@@ -1,5 +1,4 @@
 <h3>{{ 'room-page.sure' | translate }}</h3>
-<mat-divider></mat-divider>
 <p>{{ 'comment-list.really-delete' | translate }}</p>
 <app-dialog-action-buttons
   buttonsLabelSection="content"
diff --git a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html
index cbf60a00c514122132b96e2ea078277102dfc0a3..daeb3ea25f9f02f5ea9cf231c055d7b9804b0b10 100644
--- a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html
+++ b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html
@@ -1,6 +1,5 @@
 <h2 *ngIf="!bonusQuestions">{{ 'room-page.sure' | translate }}</h2>
 <h2 *ngIf="bonusQuestions">{{ 'room-page.delete-comments-alt-header' | translate }}</h2>
-<mat-divider></mat-divider>
 <p *ngIf="!bonusQuestions">{{ 'room-page.really-delete-comments' | translate }}</p>
 <p *ngIf="bonusQuestions">{{ 'room-page.really-delete-comments-hint' | translate }}</p>
 <app-dialog-action-buttons *ngIf="!bonusQuestions"
diff --git a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html
index 12c21a192a5691a5fed435e583ff8b9856bbc920..9032a9fffb4b842f0b058cfd8041fe46102d45d9 100644
--- a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html
+++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html
@@ -1,6 +1,5 @@
 <!--Are you sure-->
 <h2 class="oldtypo-h2">{{ 'room-page.sure' | translate }}</h2>
-<mat-divider></mat-divider>
 <!--remove moderator-->
 <p class="oldtypo-p">{{ 'room-page.really-remove-moderator' | translate }}</p>
 <!--list of moderators-->
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
index 9c7adb3fed8055d678cd632fc530e01f79c6a801..4b8ec3bda1ecaf864fd69363ac3a9c1d5fe905ce 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
@@ -1,5 +1,4 @@
 <h2>{{ 'room-page.sure' | translate }}</h2>
-<mat-divider></mat-divider>
 <p>{{ 'room-page.reallySession' | translate}}<strong>&raquo;{{room.name}}&laquo;</strong>{{ 'room-page.really2' | translate}}</p>
 <app-dialog-action-buttons
   buttonsLabelSection="room-page"
diff --git a/src/app/components/participant/_dialogs/remind-of-tokens/remind-of-tokens.component.html b/src/app/components/participant/_dialogs/remind-of-tokens/remind-of-tokens.component.html
index 258f3cb44635ee018ccf92fa9905e1b025813ec2..d460d8fe51f3416b1558cfb9d15355cdd67ad5e9 100644
--- a/src/app/components/participant/_dialogs/remind-of-tokens/remind-of-tokens.component.html
+++ b/src/app/components/participant/_dialogs/remind-of-tokens/remind-of-tokens.component.html
@@ -1,7 +1,6 @@
 <div mat-dialog-content>
   <div>
     <h2 tabindex="0">{{ 'header.sure' | translate }}</h2>
-    <mat-divider></mat-divider>
     <p tabindex="0">{{ 'header.user-got-tokens' | translate }}</p>
   </div>
 </div>
diff --git a/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.html b/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.html
index d6c9c72f6067cfe05a7f6109db6a0473bc2d9d9e..5d61a30a490c1b5bebbbcfecf5989cc7854b0c42 100644
--- a/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.html
+++ b/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.html
@@ -1,7 +1,6 @@
 <div mat-dialog-content>
   <h2 class="oldtypo-h2"
       tabindex="0">{{'user-bonus-token.header' | translate }}</h2>
-  <mat-divider></mat-divider>
   <div *ngIf="bonusTokensMixin.length >= 1">
     <div fxLayout="column"
          class="tokens"
diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
index 30280d5cd3c8e286f12027bf568c0fc0be50cc1d..b9392eba794324974dde2b00d09673114ae85a68 100644
--- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
+++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
@@ -2,7 +2,6 @@
   <div>
     <h2 class="oldtypo-h2"
         tabindex="0">{{ 'header.sure' | translate }}</h2>
-    <mat-divider></mat-divider>
     <p class="oldtypo-p"
        tabindex="0">{{ 'header.really-delete-account' | translate }}</p>
     <ul *ngFor="let room of rooms"
diff --git a/src/app/components/shared/_dialogs/remove-from-history/remove-from-history.component.html b/src/app/components/shared/_dialogs/remove-from-history/remove-from-history.component.html
index 1a40aa482ea52815ef54cce1a72afa506e0ba9f8..dea1a2f44dd7b9f8060f5f3905d25053880c1b77 100644
--- a/src/app/components/shared/_dialogs/remove-from-history/remove-from-history.component.html
+++ b/src/app/components/shared/_dialogs/remove-from-history/remove-from-history.component.html
@@ -1,6 +1,5 @@
 <div mat-dialog-content>
   <h2 class="oldtypo-h2" tabindex="0">{{ 'header.sure' | translate }}</h2>
-  <mat-divider></mat-divider>
   <p class="oldtypo-p" tabindex="0">{{ (role < 3 ? 'room-list.really-remove' : 'room-list.really-delete') | translate }}
     <strong>{{roomName}}</strong>{{ (role < 3 ? 'room-list.really-remove-2' : 'room-list.really-delete-2') | translate }}</p>
   <app-dialog-action-buttons
diff --git a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html
index d7a9aa208eb87920f9920b61adff9e965be8c33b..8fd6099f08a587b10642a236a87a3a6275f4a9f9 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html
@@ -1,5 +1,4 @@
 <h2 mat-dialog-title>{{'topic-cloud-confirm-dialog.confirm' | translate}}</h2>
-<mat-divider></mat-divider>
 <p>{{ data.message | translate}} '{{data.topic}}'.</p>
 
 <app-dialog-action-buttons
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 77d7c211afa347a56fd9bf510ce7e9090823d1ae..9387db05074e5d953f5c0444363a35a6e60f3559 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -95,7 +95,7 @@
     "editing-done-hint": "Editieren beenden",
     "force-language-selection": "Die Sprache der Eingabe konnte nicht automatisch erkannt werden.",
     "add-manually": "Gib ein Stichwort zu deiner Frage ein. Trenne mehrere Stichwörter mit einem Komma.",
-    "select-keywords": "Die Textanalyse deiner Eingabe schlägt folgende Nomen als Stichwörter vor. Welche kennzeichnen deine Frage am besten?"
+    "select-keywords": "Die Textanalyse schlägt folgende Stichwörter vor. Welche kennzeichnen deine Frage am besten?"
   },
   "comment-page": {
     "a11y-comment_delete": "Löscht diese Frage",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 6d8e109700cada8b2fe060cfc848500489ee0180..063de2f738191b901a761f51be810b98e3185aed 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -89,14 +89,14 @@
     "en": "English",
     "fr": "French",
     "select-all": "Select all",
-    "lang-button-hint": "Selected language for spell check",
+    "lang-button-hint": "Language for the spell checker",
     "select-all-hint": "Select all keywords",
     "select-keyword-hint": "Select this keyword",
     "edit-keyword-hint": "Edit keyword",
     "editing-done-hint": "Finish editing",
     "force-language-selection": "The language of the text input could not be detected automatically.",
-    "add-manually": "You can manually enter the keywords separated with a comma",
-    "select-keywords": "Choose the keywords for your question"
+    "add-manually": "Enter a keyword for your question. Separate several keywords with a comma.",
+    "select-keywords": "The text analysis suggests the following keywords. Which best characterise your question?"
   },
   "comment-page": {
     "a11y-comment_delete": "Deletes this question",
@@ -199,8 +199,8 @@
     "actions": "Option",
     "add-answer": "Add answer",
     "answer": "Answer",
-    "answer-deleted": "Answer deleted.",
-    "answer-recovered": "Answer recovered.",
+    "answer-deleted": "Answer deleted",
+    "answer-recovered": "Answer recovered",
     "answers": "Answers",
     "at-least-one": "In multiple choice mode you have to select at least 1 true answer.",
     "body": "Body",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 5170c67c555a6d0e34b7ed9b84b4b684bb798686..3d087320091641168da7daf1731375d286dbd438 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -101,7 +101,7 @@
     "editing-done-hint": "Editieren beenden",
     "force-language-selection": "Die Sprache der Eingabe konnte nicht automatisch erkannt werden.",
     "add-manually": "Gib ein Stichwort zu deiner Frage ein. Trenne mehrere Stichwörter mit einem Komma.",
-    "select-keywords": "Die Textanalyse deiner Eingabe schlägt folgende Nomen als Stichwörter vor. Welche kennzeichnen deine Frage am besten?"
+    "select-keywords": "Die Textanalyse schlägt folgende Stichwörter vor. Welche kennzeichnen deine Frage am besten?"
   },
   "comment-page": {
     "a11y-comment_input": "Gib deine Frage ein",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 74dd94d41d0fd404f17534e32819c65163e652ad..77191ab0c9201b221e4289007ba1e31198507eb8 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -104,14 +104,14 @@
     "en": "English",
     "fr": "French",
     "select-all": "Select all",
-    "lang-button-hint": "Selected language for spell check",
+    "lang-button-hint": "Language for the spell checker",
     "select-all-hint": "Select all keywords",
     "select-keyword-hint": "Select this keyword",
     "edit-keyword-hint": "Edit keyword",
     "editing-done-hint": "Finish editing",
     "force-language-selection": "The language of the text input could not be detected automatically.",
-    "add-manually": "You can manually enter the keywords separated with a comma",
-    "select-keywords": "Choose the keywords for your question"
+    "add-manually": "Enter a keyword for your question. Separate several keywords with a comma.",
+    "select-keywords": "The text analysis suggests the following keywords. Which best characterise your question?"
   },
   "comment-page": {
     "a11y-comment_input": "Enter your question",