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/bonus-token/bonus-token.component.html b/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
index abb6917622714d095a65af1c55de249256176860..6749a9d0b870240189bd757523f7959bcd1fdc8c 100644
--- a/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
+++ b/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
@@ -2,7 +2,7 @@
   <h2 class="oldtypo-h2">{{'room-page.bonus-token-header' | translate }}</h2>
   <h3 class="oldtypo-h3">&raquo;{{room.name}}&laquo;</h3>
   <h3 class="oldtypo-h3">{{ 'room-page.session-id' | translate}}: {{ room.shortId }}</h3>
-  <mat-divider></mat-divider>
+
   <div *ngIf="bonusTokens.length >= 1">
     <div fxLayout="row" *ngFor="let bonusToken of bonusTokens; index as i" class="tokens">
       <p tabindex="0">
diff --git a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.html b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.html
index cb89cddfb99b0527c3bf5a504059e3f7741f28c4..99c63c3be78f38c401a29e86516980ccaf4980b1 100644
--- a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.html
+++ b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.html
@@ -1,7 +1,7 @@
 <div mat-dialog-content>
   <!--questions-->
   <h2 class="oldtypo-h2">{{'room-page.comments' | translate }}</h2>
-  <mat-divider></mat-divider>
+
 
   <div fxLayout="column">
 
@@ -50,7 +50,7 @@
     </div>
   </div>
 
-  <mat-divider></mat-divider>
+
 
   <div fxLayoutAlign="center center">
     <button mat-raised-button
diff --git a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.scss b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.scss
index d30fd4a86e04c31f955e35b91189f755bc732961..f20f3195572509cdc4d64de9253b879f69f9315a 100644
--- a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.scss
+++ b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.scss
@@ -24,12 +24,6 @@ mat-icon {
   margin-right: 10px;
 }
 
-
-mat-divider {
-  margin-bottom: 10px;
-  color: var(--on-surface) !important;
-}
-
 .abort {
   background-color: var(--cancel);
   color: var(--on-cancel);
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/moderators/moderators.component.html b/src/app/components/creator/_dialogs/moderators/moderators.component.html
index be10d42c4669d5797c4c8e2706c8ea6a0758f3a6..6340dfb4f540a1fa431cc6e45b4e57f65f73c1db 100644
--- a/src/app/components/creator/_dialogs/moderators/moderators.component.html
+++ b/src/app/components/creator/_dialogs/moderators/moderators.component.html
@@ -1,6 +1,6 @@
 <div mat-dialog-content>
   <h2 class="oldtypo-h2">{{'room-page.moderators' | translate }}</h2>
-  <mat-divider></mat-divider>
+
   <div fxLayout="row">
     <mat-form-field class="input-block">
       <input (focus)="eventService.makeFocusOnInputTrue()"
diff --git a/src/app/components/creator/_dialogs/moderators/moderators.component.scss b/src/app/components/creator/_dialogs/moderators/moderators.component.scss
index 07d6c29e8f5e0accb83a5fb1e2cf513656d722b8..a2bc1bcc451a78903da5ac77a98044de49f1f768 100644
--- a/src/app/components/creator/_dialogs/moderators/moderators.component.scss
+++ b/src/app/components/creator/_dialogs/moderators/moderators.component.scss
@@ -6,10 +6,6 @@ p {
   font-size: medium;
 }
 
-mat-divider {
-  margin-bottom: 10px;
-}
-
 mat-form-field {
   width: 90%;
   color: var(--on-surface);
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/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
index 2c3177360701be41666a1b0daf9ae946dfe9c7a9..9c14d1e86e2614090971036c598aaeeddc03afd7 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
@@ -2,7 +2,7 @@
      *ngIf="editRoom">
   <!--Sitzung-->
   <h2 class="oldtypo-h2">{{ 'room-page.general' | translate }}</h2>
-  <mat-divider></mat-divider>
+
   <div fxLayout="column">
     <mat-form-field class="input-block">
       <input (focus)="eventService.makeFocusOnInputTrue()"
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
index e892ab2a99e1c2270b59a4c029ea574abfb4d000..35318234e616b7b8a0feebba5fcf7a78c58ddb43 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
@@ -24,11 +24,6 @@ mat-icon {
   margin-right: 10px;
 }
 
-mat-divider {
-  margin-bottom: 10px;
-  color: var(--on-surface) !important;
-}
-
 .abort {
   background-color: var(--cancel);
   color: var(--on-cancel);
diff --git a/src/app/components/creator/_dialogs/tags/tags.component.html b/src/app/components/creator/_dialogs/tags/tags.component.html
index 9cdac0911227374b3a00328f107decbe13a988d7..e29b5abd02d1c852d966feeb2c20369822180b31 100644
--- a/src/app/components/creator/_dialogs/tags/tags.component.html
+++ b/src/app/components/creator/_dialogs/tags/tags.component.html
@@ -1,7 +1,7 @@
 <div mat-dialog-content>
   <!--Tags-->
   <h2 class="oldtypo-h2">{{'room-page.tags' | translate }}</h2>
-  <mat-divider></mat-divider>
+
   <div fxLayout="column">
     <div fxLayout="row">
       <mat-form-field class="input-block">
diff --git a/src/app/components/creator/_dialogs/tags/tags.component.scss b/src/app/components/creator/_dialogs/tags/tags.component.scss
index 7b5cf7d48136c128c2968dacf2b421e3616a8cbd..e8c0a94b694be5fbfb7575409f21c1288b847e43 100644
--- a/src/app/components/creator/_dialogs/tags/tags.component.scss
+++ b/src/app/components/creator/_dialogs/tags/tags.component.scss
@@ -1,8 +1,3 @@
-mat-divider {
-  margin-bottom: 10px;
-  color: var(--on-surface) !important;
-}
-
 h2 {
   margin-bottom: 10px;
 }
diff --git a/src/app/components/home/_dialogs/cookies/cookies.component.html b/src/app/components/home/_dialogs/cookies/cookies.component.html
index 828f262d86f172376d47bf85d8e3d0c4c540b6b8..b8315dac4de90a127bbdf933fbb1266e4e470e3e 100644
--- a/src/app/components/home/_dialogs/cookies/cookies.component.html
+++ b/src/app/components/home/_dialogs/cookies/cookies.component.html
@@ -13,7 +13,7 @@
     </button>
   </div>
 
-  <mat-divider></mat-divider>
+
 
   <mat-dialog-content tabindex="-1">
 
diff --git a/src/app/components/home/_dialogs/data-protection/data-protection.component.html b/src/app/components/home/_dialogs/data-protection/data-protection.component.html
index 747b8f3613d878e59104fad551a25e9f3535aa33..022ce18707dca781988bf2cd92fb676aacd231bc 100644
--- a/src/app/components/home/_dialogs/data-protection/data-protection.component.html
+++ b/src/app/components/home/_dialogs/data-protection/data-protection.component.html
@@ -4,7 +4,7 @@
       mat-dialog-title
       class="modal oldtypo-h2">{{ 'data-protection.title' | translate }}</h2>
 
-  <mat-divider></mat-divider>
+
 
   <mat-dialog-content tabindex="0">
     <app-data-protection-en *ngIf="currentLang=='en'"></app-data-protection-en>
diff --git a/src/app/components/home/_dialogs/demo-video/demo-video.component.html b/src/app/components/home/_dialogs/demo-video/demo-video.component.html
index 1ff33d7e72d5c87c66b10027ce367dbf1d0bcd15..ed8c9a2d89d51b9709494287d5063cae5e8d9ed4 100644
--- a/src/app/components/home/_dialogs/demo-video/demo-video.component.html
+++ b/src/app/components/home/_dialogs/demo-video/demo-video.component.html
@@ -10,7 +10,7 @@
 </div>
 <!--frag.jetzt-->
 <h1 tabindex="0" class="modal oldtypo-h2" mat-dialog-title>{{ 'introduction.title' | translate }}</h1>
-<mat-divider></mat-divider>
+
 <mat-dialog-content>
   <div id="setFocus" class="intro-text" tabindex="-1">
     <app-demo-en *ngIf="currentLang=='en'"></app-demo-en>
diff --git a/src/app/components/home/_dialogs/imprint/imprint.component.html b/src/app/components/home/_dialogs/imprint/imprint.component.html
index 2094257b41af9dd7bebca1653969fa68246f5379..238866fee112d15404449513cfbdd9b51c1fb3ce 100644
--- a/src/app/components/home/_dialogs/imprint/imprint.component.html
+++ b/src/app/components/home/_dialogs/imprint/imprint.component.html
@@ -2,7 +2,7 @@
 <h1 tabindex="0"
     mat-dialog-title>{{ 'imprint.title' | translate }} </h1>
 
-<mat-divider></mat-divider>
+
 
 <mat-dialog-content tabindex="0">
   <app-imprint-en *ngIf="currentLang=='en'"></app-imprint-en>
diff --git a/src/app/components/home/_dialogs/password-reset/password-reset.component.html b/src/app/components/home/_dialogs/password-reset/password-reset.component.html
index 5e07cdfb5f9cd449c75a566e7455329288df4b6b..55ead6df79f27f1e9c3a8ad07af099bc5af9ea56 100644
--- a/src/app/components/home/_dialogs/password-reset/password-reset.component.html
+++ b/src/app/components/home/_dialogs/password-reset/password-reset.component.html
@@ -21,7 +21,7 @@
   </button>
 </form>
 
-<mat-divider></mat-divider>
+
 
 <div fxLayout="column" class="textfields">
   <!--set new password-->
diff --git a/src/app/components/home/home-page/home-page.component.scss b/src/app/components/home/home-page/home-page.component.scss
index 39f40f5d8a3fcc48ab2b60c021454d76d378dd95..eb98c4c34cf60304d9a1d3a028ae02a58580f587 100644
--- a/src/app/components/home/home-page/home-page.component.scss
+++ b/src/app/components/home/home-page/home-page.component.scss
@@ -17,7 +17,7 @@
 
 .main-heading-secondary {
   display: block;
-  margin-top: 5vh;
+  margin-top: 4vh;
   font-weight: bold;
   font-size: 80%;
   text-align: center;
diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
index 7b6749d2f7399fc8ee4d8d2b9a7a6da4cabe4c6d..46f1e6eee87182ff5de9e83a9e0184291184f040 100644
--- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
+++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
@@ -32,7 +32,7 @@
         </mat-card-header>
         <span class="fill-remaining-space"></span>
       </div>
-      <mat-divider></mat-divider>
+
       <mat-card-content *ngIf="room.description"
                         fxLayoutAlign="center">
         <markdown class="images"
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..69fb893e51e3eb0a9065a1704f87baef0c31ac62 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"
@@ -11,7 +10,7 @@
           tabindex="1">{{bonusToken.token}}</h2>
       <h2 class="roomName">&raquo;{{bonusToken.roomName}}&laquo;</h2>
     </div>
-    <mat-divider></mat-divider>
+
     <div fxLayout="column">
       <form class="example-form">
         <mat-form-field class="example-full-width">
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.html b/src/app/components/participant/room-participant-page/room-participant-page.component.html
index b7d127ee8643824e54ea2d6cb07e4d443894c93a..67ffe857d86fed3c7fd90d05cdc5c0014126a9f1 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.html
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.html
@@ -19,7 +19,7 @@
         </mat-card-header>
         <span class="fill-remaining-space"></span>
       </div>
-      <mat-divider></mat-divider>
+
       <mat-card-content *ngIf="room.description" fxLayoutAlign="center">
         <markdown class="images" katex emoji lineNumbers lineHighlight
           [data]="room.description.trim()"></markdown>
diff --git a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
index eeabe3b58d040739a3fbd9b9683ca7bf85b90122..dee0da2ab023386a52edb487e5c2ceea71b70fe1 100644
--- a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
+++ b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
@@ -44,12 +44,6 @@ mat-icon {
   margin-right: 10px;
 }
 
-
-mat-divider {
-  margin-bottom: 10px;
-  color: var(--on-surface) !important;
-}
-
 .abort {
   background-color: var(--cancel);
   color: var(--on-cancel);
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
index 2843f20cc1ecb6e0fbd6e7c0821530ff3e0e56f3..9665db287649fe9286b180d4e26347d4de569709 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
@@ -52,7 +52,7 @@
       <mat-tab label="{{ 'comment-page.write-comment' | translate }}">
         <ars-row [height]="12"></ars-row>
         <ars-row>
-          <mat-divider></mat-divider>
+
         </ars-row>
         <ars-row [height]="12"></ars-row>
         <ars-row [overflow]="'visible'"
@@ -98,7 +98,7 @@
                [disabled]="!commentBody.innerText">
         <ars-row [height]="12"></ars-row>
         <ars-row>
-          <mat-divider></mat-divider>
+
         </ars-row>
         <ars-row [height]="12"></ars-row>
         <ars-row>
@@ -112,7 +112,7 @@
     </mat-tab-group>
   </ars-row>
   <ars-row style="margin-top:8px">
-    <mat-divider></mat-divider>
+
   </ars-row>
   <ars-row ars-flex-box
            class="spellcheck">
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/motd-dialog/motd-dialog.component.html b/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.html
index 55b77aa3cb8ad45f3c56a1a5d1616014f41f2790..425b92d722bf1d0e908819a27ce532d3b04202f8 100644
--- a/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.html
+++ b/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.html
@@ -3,7 +3,7 @@
   <h2 tabindex="0" style="padding:0;margin:0 0 20px 0;">
     {{ 'footer.motd-title-main' | translate }}
   </h2>
-  <mat-divider></mat-divider>
+
 </ars-row>
 <mat-dialog-content class="container" ars-flex-box>
   <ars-row ars-flex-box>
@@ -12,7 +12,7 @@
     </ars-col>
     <ars-fill></ars-fill>
     <ars-col class="align-center-y">
-      <button mat-stroked-button (click)="markAllAsRead()">
+      <button mat-flat-button (click)="markAllAsRead()">
         <mat-icon style="margin-right:8px;">checkmark</mat-icon>
         <span>{{ 'footer.motd-mark-all-read' | translate }}</span>
       </button>
diff --git a/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.scss b/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.scss
index 381cbfbaf598f38c6bcb5581925af11cd4aefb99..1e1e2e547d6798357cf07d224eedbe8c1c507597 100644
--- a/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.scss
+++ b/src/app/components/shared/_dialogs/motd-dialog/motd-dialog.component.scss
@@ -34,3 +34,8 @@
     padding: 0 !important;
   }
 }
+
+.mat-flat-button {
+  color: var(--on-dialog);
+  background-color: var(--dialog);
+}
diff --git a/src/app/components/shared/_dialogs/motd-dialog/motd-message/motd-message.component.scss b/src/app/components/shared/_dialogs/motd-dialog/motd-message/motd-message.component.scss
index 1b45fcc6611a96e9ba63ec3b5925629f4b10edcd..39fe401b06d089a0185ee96df6eeb1028bc10c04 100644
--- a/src/app/components/shared/_dialogs/motd-dialog/motd-message/motd-message.component.scss
+++ b/src/app/components/shared/_dialogs/motd-dialog/motd-message/motd-message.component.scss
@@ -6,11 +6,10 @@
   }
 
   .container {
-    border-radius: 4px;
+    border-radius: 20px;
     background-color: var(--surface);
-    box-shadow: inset 0px 0px 0px 1px rgba(0, 0, 0, 0.2);
     box-sizing: border-box;
-    padding: 5px 10px;
+    padding: 5px 20px;
   }
 
   .timestamp {
diff --git a/src/app/components/shared/_dialogs/motd-temp-dialog/motd-temp-dialog.component.html b/src/app/components/shared/_dialogs/motd-temp-dialog/motd-temp-dialog.component.html
index fa5fdaa2349aaab8f2c9fdd448b9154c16d47cd2..158ee47c32f3c08bd5a2e30229d91e8014427999 100644
--- a/src/app/components/shared/_dialogs/motd-temp-dialog/motd-temp-dialog.component.html
+++ b/src/app/components/shared/_dialogs/motd-temp-dialog/motd-temp-dialog.component.html
@@ -3,7 +3,7 @@
   <h2 tabindex="0" style="padding:0;margin:0 0 20px 0;">
     Message of the Day
   </h2>
-  <mat-divider></mat-divider>
+
 </ars-row>
 <mat-dialog-content class="container" ars-flex-box>
   <ars-row ars-flex-box>
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-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index 2ad171fff28182bd8ce870a87d132380a551b123..058ba59373cc75263dc5dddefa9c5a8844c1080a 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -391,7 +391,7 @@
                 </mat-panel-description>
               </mat-expansion-panel-header>
               <div *ngFor="let question of keyword.comments">
-                <mat-divider></mat-divider>
+
                 <app-topic-dialog-comment [question]="question.body" [keyword]="keyword.keyword"
                                           [maxShowedCharachters]="140"
                                           [profanityFilter]="profanityFilter"
@@ -403,7 +403,7 @@
               <div *ngIf="isCreatorOrMod">
                 <!-- Only visible when not editing -->
                 <div *ngIf="!edit" align="end">
-                  <mat-divider></mat-divider>
+
                   <button class="margin-right" mat-icon-button style="align-self:flex-end;" (click)="editKeyword(i)">
                     <mat-icon class="primary" matTooltip="{{'topic-cloud-dialog.edit' | translate}}">edit</mat-icon>
                   </button>
@@ -415,7 +415,7 @@
 
                 <!-- Only visible when editing -->
                 <div *ngIf="edit">
-                  <mat-divider></mat-divider>
+
                   <mat-form-field>
                     <mat-label>{{'topic-cloud-dialog.edit-keyword-tip' | translate}}</mat-label>
                     <input matInput id="{{'edit-input'+i}}" [(ngModel)]="newKeyword">
@@ -463,7 +463,7 @@
                 </mat-panel-description>
               </mat-expansion-panel-header>
               <div *ngFor="let question of keyword.comments">
-                <mat-divider></mat-divider>
+
                 <app-topic-dialog-comment [question]="question.body" [keyword]="keyword.keyword" [maxShowedCharachters]="140"
                                           [profanityFilter]="profanityFilter" [languageSpecific]="censorLanguageSpecificCheck"
                                           [partialWords]="censorPartialWordsCheck"
@@ -472,7 +472,7 @@
               <div>
                 <!-- Only visible when not editing -->
                 <div *ngIf="!edit" align="end">
-                  <mat-divider></mat-divider>
+
                   <button class="margin-right" mat-icon-button style="align-self:flex-end;" (click)="editKeyword(i)">
                     <mat-icon class="primary" matTooltip="{{'topic-cloud-dialog.edit' | translate}}">edit</mat-icon>
                   </button>
@@ -484,7 +484,7 @@
 
                 <!-- Only visible when editing -->
                 <div *ngIf="edit">
-                  <mat-divider></mat-divider>
+
                   <mat-form-field>
                     <mat-label>{{'topic-cloud-dialog.edit-keyword-tip' | translate}}</mat-label>
                     <input matInput id="{{'edit-input'+i}}" [(ngModel)]="newKeyword">
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/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss
index f6328d663fa8321b965b0c79b94406cf131210c4..35e221f156f660e8d1ddc7cf4d6ef276e7bc4746 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss
+++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss
@@ -7,10 +7,6 @@ mat-radio-group {
   flex-direction: column;
 }
 
-mat-divider {
-  margin: 0.75em 0;
-}
-
 ::ng-deep .mat-radio-label-content {
   width: 100%;
 }
diff --git a/src/app/components/shared/comment-answer/comment-answer.component.html b/src/app/components/shared/comment-answer/comment-answer.component.html
index 3bd13050ea0a82d1a0d290f1d5f6f025c1f90768..635e3eee0ef78021f792b66ab45b3df7bebd4f0e 100644
--- a/src/app/components/shared/comment-answer/comment-answer.component.html
+++ b/src/app/components/shared/comment-answer/comment-answer.component.html
@@ -49,7 +49,7 @@
       <div *ngIf="!isStudent && (edit || !answer)">
         <mat-tab-group [dynamicHeight]="false" (selectedTabChange)="tempEditView = commentBody.innerText">
           <mat-tab label="{{'comment-page.your-answer' | translate}}">
-            <mat-divider></mat-divider>
+
             <mat-form-field class="input-block">
               <input [disabled]="true" matInput>
               <div
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 512b53fe385cf7d2fcddcf5cd58c85d7c2e2960b..3f20f61d7156e93063d5e860d87d05f7b805a8e1 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -355,7 +355,7 @@ button:focus {
       margin-top: -3px;
       margin-right: 70px;
       color: var(--on-surface);
-      opacity: 0.2;
+      opacity: 0.1;
       float: right;
       position: relative;
       z-index: 0;
diff --git a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
index 8dab567c3e7da153906678740f074605b9cb93a4..fc72dc98d2fbbe8dda14c6316402bfed4dd100e7 100644
--- a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
+++ b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
@@ -2,9 +2,10 @@
   'dialog-action-buttons': true,
   'no-spacing': (spacing === false)
 }">
-  <mat-divider *ngIf="showDivider"></mat-divider>
   <div fxLayoutAlign="end">
-    <div fxLayout="row-reverse" fxLayoutGap="10px" class="buttons">
+    <div fxLayout="row-reverse"
+         fxLayoutGap="10px"
+         class="buttons">
       <button
         [disabled]="confirmButtonDisabled"
         *ngIf="confirmButtonClickAction !== undefined"
@@ -13,7 +14,10 @@
         class="mat-flat-button {{ confirmButtonType }}-confirm-button"
         attr.aria-labelledby="{{ ariaPrefix + 'confirm' | translate }}"
         (click)="performConfirmButtonClickAction()"
-      ><mat-icon *ngIf="buttonIcon" style="margin-right: 5px;">{{buttonIcon}}</mat-icon>{{ buttonsLabelSection + '.' + confirmButtonLabel | translate}}
+      >
+        <mat-icon *ngIf="buttonIcon"
+                  style="margin-right: 5px;">{{buttonIcon}}</mat-icon>
+        {{ buttonsLabelSection + '.' + confirmButtonLabel | translate}}
         <mat-icon *ngIf="showLoadingCycle">
           <mat-spinner diameter="20"></mat-spinner>
         </mat-icon>
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 912da28b8d36d28319dd347ce0084be44a9b1374..fac23d0c986b9505e2bcb6fed29e2ebc679e5012 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -12,7 +12,8 @@
     </button>
 
     <ng-container *ngIf="toggleUserActivity">
-      <div class="userActivityIcon"></div>
+      <div class="userActivityIcon"
+           matTooltip="{{'header.users-online' | translate}}"></div>
       <p class="userActivityTxt">{{userActivity}}</p>
     </ng-container>
 
@@ -85,7 +86,7 @@
     <h2 class="header-slogan-mobile"
         *ngIf="router.url.includes('home') && deviceType === 'mobile'"
         fxLayoutAlign="center center">
-      {{ 'header.home-header' | translate }}
+      {{ 'header.home-header-mobile' | translate }}
     </h2>
 
     <h2 class="header-slogan-desktop"
@@ -381,7 +382,6 @@
         <span>{{'header.user-bonus-token' | translate}}</span>
       </button>
 
-      <mat-divider></mat-divider>
 
       <ng-container *ngIf="router.url.endsWith('/comments') || router.url.endsWith('/tagcloud')">
 
@@ -436,8 +436,6 @@
               svgIcon="meeting_room">{{'header.visited-sessions' | translate}}</span>
       </button>
 
-      <mat-divider *ngIf="!router.url.endsWith('user')"></mat-divider>
-
       <button mat-menu-item
               aria-hidden="true"
               *ngIf="isSafari === 'false'  && !router.url.includes('home')  && !router.url.endsWith('/quiz')"
@@ -457,7 +455,6 @@
         <span>{{'header.motd' | translate}}</span>
       </button>
 
-      <mat-divider></mat-divider>
 
       <button mat-menu-item
               *ngIf="user && !user.isGuest && user.loginId && router.url.endsWith('/user')"
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index ef184bfe06f99524debf9395049defa9127721bb..5dcd0476fe51e7936cf143fe1940ac38400a3b86 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -5,7 +5,8 @@
 }
 
 mat-toolbar {
-  background-color: var(--surface);
+  background-color: transparent;
+  box-shadow: none;
   position: relative;
 }
 
@@ -72,14 +73,13 @@ h2 {
 
 .header-slogan-desktop {
   margin-right: 10px;
-  margin-left: 120px;
+  margin-left: 130px;
   font-size: medium !important;
   color: var(--on-background);
 }
 
 .header-slogan-mobile {
-  margin-right: 10px;
-  margin-left: 60px;
+  margin-left: 30px;
   font-size: medium !important;
   color: var(--on-background);
 }
@@ -144,12 +144,12 @@ svg {
   }
 
   *:hover {
-    color: var(--dialog) !important;
-    background-color: var(--on-dialog) !important;
+    color: var(--on-secondary) !important;
+    background-color: var(--secondary) !important;
 
     mat-icon {
-      color: var(--dialog) !important;
-      background-color: var(--on-dialog) !important;
+      color: var(--on-secondary) !important;
+      background-color: var(--secondary) !important;
     }
   }
 
@@ -166,16 +166,16 @@ h1 {
 }
 
 ::ng-deep #cdk-overlay-0 .mat-menu-content > button:hover mat-icon {
-  color: var(--dialog) !important;
-  background-color: var(--on-dialog) !important;
+  color: white !important;
+  background-color: gray !important;
 }
 
-.userActivityIcon{
-  width:25px;
-  height:25px;
-  margin-left:25px;
-  margin-bottom:5px;
-  background-color:var(--on-background);
+.userActivityIcon {
+  width: 25px;
+  height: 25px;
+  margin-left: 25px;
+  margin-bottom: 5px;
+  background-color: var(--primary);
   -webkit-mask-image: url("../../../../assets/icons/activity.svg");
   mask-image: url("../../../../assets/icons/activity.svg");
   mask-repeat: no-repeat;
@@ -183,7 +183,8 @@ h1 {
   mask-size: 100% 100%;
 }
 
-.userActivityTxt{
-  color:var(--on-background);
-  margin-left:15px;
+.userActivityTxt {
+  color: var(--primary);
+  margin-left: 5px;
+  font-size: 14px;
 }
diff --git a/src/app/components/shared/login/login.component.html b/src/app/components/shared/login/login.component.html
index 6084f3e5764271dc946f45be2052848991ef95b3..1f38df86f084878400297c7b0495a531509a43cb 100644
--- a/src/app/components/shared/login/login.component.html
+++ b/src/app/components/shared/login/login.component.html
@@ -74,7 +74,7 @@
     </a>
   </div>
 </form>
-<mat-divider></mat-divider>
+
 <div fxLayout="row"
      class="register">
   <p>{{ 'login.not-registered' | translate }}</p>
diff --git a/src/app/components/shared/overlay/active-user/active-user.component.html b/src/app/components/shared/overlay/active-user/active-user.component.html
index ad96aa7f0faa66511c50f5112bf7d34b567172db..8898d2cb0529710c1cc3e6c0df223a8d7379a880 100644
--- a/src/app/components/shared/overlay/active-user/active-user.component.html
+++ b/src/app/components/shared/overlay/active-user/active-user.component.html
@@ -1,9 +1,13 @@
-<div class="activityIcon" *ngIf="deviceType&&deviceType==='desktop'" #divElement>
-  <div class="activityIconBackground" [ngStyle]="{
-    'background-color':iconColor
-    }"></div>
-  <div class="activityIconForeground" aria-hidden="true">
-    <p class="activityIconForegroundText" [ngStyle]="{
+<div class="activityIcon"
+     *ngIf="deviceType&&deviceType==='desktop'"
+     #divElement>
+  <div class="activityIconBackground"
+       [ngStyle]="{'background-color':iconColor}">
+  </div>
+  <div class="activityIconForeground"
+       aria-hidden="true">
+    <p class="activityIconForegroundText"
+       [ngStyle]="{
       'background-color':backgroundColor,
       'color':foregroundColor
       }">
diff --git a/src/app/components/shared/overlay/active-user/active-user.component.scss b/src/app/components/shared/overlay/active-user/active-user.component.scss
index 670fae60980b82fbd27519af0b627cbbb6f3f113..e1924c64510798d8a065d9b0ca9a9d4b3142fd9d 100644
--- a/src/app/components/shared/overlay/active-user/active-user.component.scss
+++ b/src/app/components/shared/overlay/active-user/active-user.component.scss
@@ -19,7 +19,7 @@
       box-shadow: none !important;
       right: -75px;
       background-color: transparent !important;
-      color: var(--green) !important;
+      color: var(--primary) !important;
       animation:popin-shadow 0.4s cubic-bezier(0.680, -0.550, 0.265, 1.550) both;
     }
   }
@@ -27,7 +27,7 @@
     width: 100%;
     height: 100%;
     position: absolute;
-    background-color:var(--green) !important;
+    background-color:var(--primary) !important;
     -webkit-mask-image: url("../../../../../assets/icons/activity.svg");
     mask-image: url("../../../../../assets/icons/activity.svg");
     mask-repeat: no-repeat;
diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index 572c59cb9cd85a25c87597b9f275cef39c4ef748..6e897e4853fd98768a3905a6811f9fd80ce47ca3 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -5,7 +5,7 @@
 </div>
 
 <div *ngIf="roomsWithRole">
-  <mat-divider></mat-divider>
+
   <div *ngIf="tableDataSource.data.length === 0" aria-labelledby="emptySessionHistoryLabel">
     <h3 class="noRoomHistory">{{ 'room-list.no-room-history' | translate }}</h3>
   </div>
diff --git a/src/app/utils/cloud-parameters.ts b/src/app/utils/cloud-parameters.ts
index f9dcd2e9aeb26a0b2a0fdb97acc21bdac1a35a89..54c2450001eb183f1b0cf934feb3ca05dcba053a 100644
--- a/src/app/utils/cloud-parameters.ts
+++ b/src/app/utils/cloud-parameters.ts
@@ -123,7 +123,7 @@ export class CloudParameters {
     this.question = '';
     this.textTransform = CloudTextStyle.capitalized;
     this.cloudWeightSettings = [
-      { maxVisibleElements: elements, color: '#c1c1c1', rotation: 0, allowManualTagNumber: true },
+      { maxVisibleElements: elements, color: '#C0C0C0', rotation: 0, allowManualTagNumber: true },
       { maxVisibleElements: elements, color: '#d98e49', rotation: 0, allowManualTagNumber: true },
       { maxVisibleElements: elements, color: '#ccca3c', rotation: 0, allowManualTagNumber: true },
       { maxVisibleElements: elements, color: '#83e761', rotation: 0, allowManualTagNumber: true },
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index f72a36b049f0528aa42eab34e24c67cb570e2466..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",
@@ -372,7 +372,7 @@
     "question-count-singular": "Frage",
     "question-count-plural": "Fragen",
     "edit-keyword-tip": "Neues Thema",
-    "no-keywords-note": "Es gibt keine Themen",
+    "no-keywords-note": "Es gibt keine Themen.",
     "consider-votes": "Bewertungen der Fragen berücksichtigen",
     "profanity": "Vulgäre Wörter mit »***« überschreiben",
     "hide-blacklist-words": "Themen aus der Blacklist verbergen",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 8f719d162f6d7e68cbfaf30baed301e68cb128e3..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",
@@ -380,7 +380,7 @@
     "question-count-singular": "Question",
     "question-count-plural": "Questions",
     "edit-keyword-tip": "New topic",
-    "no-keywords-note": "There are no topics!",
+    "no-keywords-note": "There are no topics.",
     "consider-votes": "Consider Votes",
     "profanity": "Censor profanity",
     "hide-blacklist-words": "Hide blacklist keywords",
diff --git a/src/assets/i18n/demo/demo-de.html b/src/assets/i18n/demo/demo-de.html
index 281e2a454f711a40809db17a78f5c8cf55d3ecdf..f16bff44f9b8b183024893a8f88dc913f62503dc 100644
--- a/src/assets/i18n/demo/demo-de.html
+++ b/src/assets/i18n/demo/demo-de.html
@@ -1,4 +1,4 @@
-<h2 tabindex="0">»Haben Sie Fragen?«</h2>
+<h2 tabindex="0">»Noch Fragen?«</h2>
 
 <img tabindex="-1"
      src="/assets/background/auditorium.webp"
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 6fd89c07b796e074008098e52e69a44048032e0c..50ea78433eb342680ea0784162d17413fa1e941c 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -75,7 +75,8 @@
     "cancel": "Abbrechen",
     "delete": "Löschen",
     "delete-account": "Konto löschen",
-    "home-header": "Fragen sammeln und bewerten",
+    "home-header": "",
+    "home-header-mobile": "",
     "id": "Code",
     "logged-out": "Du bist jetzt abgemeldet.",
     "login": "Anmelden",
@@ -91,6 +92,7 @@
     "sure": "Bist du sicher?",
     "user-bonus-token": "Bonus-Sterne",
     "user-got-tokens": "Du hast noch Sterne für Bonuspunkte, die verloren gehen!",
+    "users-online": "Aktuell eingeloggte User",
     "visited-sessions": "Sitzungen",
     "question-wall": "Fragen präsentieren",
     "room-qr": "Raum-Code",
@@ -193,7 +195,7 @@
     "restart-account-activation-button": "Falls ungültig, neuen Schlüssel anfordern.",
     "restart-account-activation-correct": "Der Aktivierungs-Schlüssel wurde erneut gesendet.",
     "restart-account-activation-tooltip": "Sendet den Aktivierungs-Schlüssel erneut an die angegebene Adresse.",
-    "welcome": "»Haben Sie Fragen?«",
+    "welcome": "»Noch Fragen?«",
     "welcome-feedback": "➜ Feedback an das »frag.jetzt«-Team",
     "feedback-aria": "Baggs, Features, Lob und Tadel kannst du über diesen Link in unserer Feedback-Säschen äussern."
   },
@@ -352,7 +354,7 @@
     "inline-header": "Laufende Stichwort-Aktualisierungen"
   },
   "topic-cloud-filter": {
-    "info-no-keywords": "Es sind keine Stichwörter vorhanden. Die Wortwolke wird leer sein. Eine grammatikalische Fragen-Analyse kann Stichwörter automatisch erstellen. Fragen-Analyse starten?",
+    "info-no-keywords": "Es gibt keine Stichwörter. Die Wortwolke wird leer sein. Eine KI-basierte Fragen-Analyse kann Stichwörter nachträglich erstellen. Fragen-Analyse starten?",
     "label-refresh-keywords-start": "Starten"
   }
 }
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 482ca7cc8f2d8ad708781d3ab9a022fafc2d8786..3563c272c727dc59b02d01258d7be2fb6b8961b7 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -58,7 +58,8 @@
     "block": "Block new questions",
     "unlock": "Release for new questions",
     "delete-account": "Delete account",
-    "home-header": "Collect and rate questions",
+    "home-header": "",
+    "home-header-mobile": "",
     "id": "Key",
     "logged-out": "You are logged out now.",
     "login": "Log in",
@@ -72,6 +73,7 @@
     "sure": "Are you sure?",
     "user-bonus-token": "Bonus stars",
     "user-got-tokens": "You haven't received a star for a good question yet.",
+    "users-online": "Currently logged-in users",
     "visited-sessions": "Sessions",
     "question-wall": "Present questions",
     "room-qr": "Key code",
@@ -354,7 +356,7 @@
     "inline-header": "Ongoing keyword updates"
   },
   "topic-cloud-filter": {
-    "info-no-keywords": "TThere are no keywords. The word cloud will be empty. A grammatical question analysis can create keywords automatically. Start question analysis?",
+    "info-no-keywords": "There are no keywords. The word cloud will be empty. An AI-based question analysis can create keywords afterwards. Start question analysis?",
     "label-refresh-keywords-start": "Start"
   }
 }
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index bc605748a95cf89c3abb642a57e41819c82f03ba..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",
@@ -262,7 +262,7 @@
     "question-count-singular": "Frage",
     "question-count-plural": "Fragen",
     "edit-keyword-tip": "Neues Thema",
-    "no-keywords-note": "Es gibt keine Themen",
+    "no-keywords-note": "Es gibt keine Themen.",
     "consider-votes": "Bewertungen der Fragen berücksichtigen",
     "profanity": "Vulgäre Wörter mit »***« überschreiben",
     "hide-blacklist-words": "Themen aus der Blacklist verbergen",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index f655d620bd3fd7b5280b71c3e888e09016478fd3..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",
@@ -268,7 +268,7 @@
     "question-count-singular": "Question",
     "question-count-plural": "Questions",
     "edit-keyword-tip": "New topic",
-    "no-keywords-note": "There are no topics!",
+    "no-keywords-note": "There are no topics.",
     "consider-votes": "Consider Votes",
     "profanity": "Censor profanity",
     "hide-blacklist-words": "Hide blacklist keywords",
diff --git a/src/styles.scss b/src/styles.scss
index ef349f4d89bebbf79b1985ab4d23cbf17ed1c6b1..2b12218e45a24fab0ca08eb0be27febdcc5e1e18 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -240,11 +240,10 @@ a {
   height: 3px !important;
 }
 
-.mat-divider {
-  height: 1px !important;
-  border-top-color: rgba(0, 0, 0, 0.12) !important;
-}
-
 .mat-error {
   color: var(--red);
 }
+
+.mat-spinner circle {
+  stroke: var(--on-background);
+}
diff --git a/src/theme/dark-theme/_dark-theme.scss b/src/theme/dark-theme/_dark-theme.scss
index d0f05b4290e26c33f9c31c99fc325f80f13e4cd7..04513bca7b90a69c36c99c9479c96b3c28d93bad 100644
--- a/src/theme/dark-theme/_dark-theme.scss
+++ b/src/theme/dark-theme/_dark-theme.scss
@@ -30,8 +30,8 @@ a {
 }
 
 .mat-menu-panel .mat-menu-item:hover {
-  background-color: var(--on-dialog) !important;
-  color: var(--dialog) !important;
+  background-color: gray !important;
+  color: white !important;
 }
 
 .mat-radio-outer-circle {