diff --git a/src/app/components/creator/_dialogs/moderators/moderators.component.html b/src/app/components/creator/_dialogs/moderators/moderators.component.html
index ca482c2392d6fa47316da573156f58ca6dcda863..602eb82f859fc5afef596ebc4384563cf2deef7f 100644
--- a/src/app/components/creator/_dialogs/moderators/moderators.component.html
+++ b/src/app/components/creator/_dialogs/moderators/moderators.component.html
@@ -3,30 +3,42 @@
   <mat-divider></mat-divider>
   <div fxLayout="row">
     <mat-form-field class="input-block">
-      <input (focus)="eventService.makeFocusOnInputTrue()" (blur)="eventService.makeFocusOnInputFalse()"
-             matInput type="email" #loginId aria-labelledby="moderator-email"
-             [formControl]="usernameFormControl" name="username"/>
+      <input (focus)="eventService.makeFocusOnInputTrue()"
+             (blur)="eventService.makeFocusOnInputFalse()"
+             matInput
+             type="email"
+             #loginId
+             aria-labelledby="moderator-email"
+             [formControl]="usernameFormControl"
+             name="username"/>
       <mat-placeholder class="placeholder">{{ 'room-page.moderator-email' | translate }}</mat-placeholder>
       <mat-error *ngIf="usernameFormControl.hasError('email')">
         {{ 'room-page.email-error' | translate }}
       </mat-error>
     </mat-form-field>
     <span class="fill-remaining-space"></span>
-    <button mat-icon-button class="add" (click)="addModerator(loginId.value); loginId.value = ''"
+    <button mat-icon-button
+            class="add"
+            (click)="addModerator(loginId.value); loginId.value = ''"
             aria-labelledby="add-moderator">
       <mat-icon class="add-icon">add_circle</mat-icon>
     </button>
     <span class="fill-remaining-space"></span>
   </div>
-  <p class="oldtypo-p" *ngIf="moderators.length === 0">{{ 'room-page.no-moderators' | translate }}</p>
+  <p class="oldtypo-p"
+     *ngIf="moderators.length === 0">{{ 'room-page.no-moderators' | translate }}</p>
   <div *ngIf="moderators.length > 0">
-    <div fxLayout="row" *ngFor="let moderator of moderators; index as i" class="moderators">
+    <div fxLayout="row"
+         *ngFor="let moderator of moderators; index as i"
+         class="moderators">
       <!--List of moderators-->
       <p class="oldtypo-p">
         {{i + 1}}. {{moderator.loginId}}
       </p>
       <span class="fill-remaining-space"></span>
-      <button mat-icon-button class="close" (click)="openDeleteRoomDialog(moderator)"
+      <button mat-icon-button
+              class="close"
+              (click)="openDeleteRoomDialog(moderator)"
               aria-labelledby="delete-moderator">
         <mat-icon class="close-icon">close</mat-icon>
       </button>
diff --git a/src/app/components/creator/_dialogs/tags/tags.component.html b/src/app/components/creator/_dialogs/tags/tags.component.html
index 5973cb1aa0949093a1a428498917be1433c2b08c..3d27317086b30c01f1812974acf44b8bcbed2050 100644
--- a/src/app/components/creator/_dialogs/tags/tags.component.html
+++ b/src/app/components/creator/_dialogs/tags/tags.component.html
@@ -10,28 +10,42 @@
     </div> -->
     <div fxLayout="row">
       <mat-form-field class="input-block">
-        <input (focus)="eventService.makeFocusOnInputTrue()" (blur)="eventService.makeFocusOnInputFalse()"
-               matInput type="text" #tag aria-labelledby="tag-new"
-               [formControl]="tagFormControl" name="taginput"/>
+        <input (focus)="eventService.makeFocusOnInputTrue()"
+               (blur)="eventService.makeFocusOnInputFalse()"
+               matInput
+               type="text"
+               #tag
+               aria-labelledby="tag-new"
+               [formControl]="tagFormControl"
+               name="taginput"/>
         <mat-placeholder class="placeholder">{{ 'room-page.tag-new' | translate }}</mat-placeholder>
         <mat-error *ngIf="!tagFormControl.valid">
           {{ 'room-page.tag-error' | translate }}
         </mat-error>
       </mat-form-field>
       <span class="fill-remaining-space"></span>
-      <button mat-icon-button class="add" (click)="addTag(tag.value);" aria-labelledby="add-tag">
+      <button mat-icon-button
+              class="add"
+              (click)="addTag(tag.value);"
+              aria-labelledby="add-tag">
         <mat-icon class="add-icon">add_circle</mat-icon>
       </button>
       <span class="fill-remaining-space"></span>
     </div>
     <div *ngIf="tagsEnabled === true && tags !== undefined && tags.length > 0">
-      <div class="ta" fxLayout="row" *ngFor="let tag of tags">
-        <!--taglist-->
+      <div
+        fxLayout="row"
+        *ngFor="let tag of tags"
+        class="tags">
+        <!--tag list-->
         <p class="oldtypo-p">
           {{tag}}
         </p>
         <span class="fill-remaining-space"></span>
-        <button mat-icon-button class="close" (click)="deleteTag(tag)" aria-labelledby="delete-tag">
+        <button mat-icon-button
+                class="close"
+                (click)="deleteTag(tag)"
+                aria-labelledby="delete-tag">
           <mat-icon class="close-icon">close</mat-icon>
         </button>
       </div>
diff --git a/src/app/components/creator/_dialogs/tags/tags.component.scss b/src/app/components/creator/_dialogs/tags/tags.component.scss
index 47febef1df4191a72e6fa3f08b8e8e00826f0d42..89e00423ee00cef3df7229523b61e34073b2ecee 100644
--- a/src/app/components/creator/_dialogs/tags/tags.component.scss
+++ b/src/app/components/creator/_dialogs/tags/tags.component.scss
@@ -38,3 +38,10 @@ mat-form-field {
 .close-icon {
   color: var(--red);
 }
+
+.tags {
+  padding-left: 3%;
+  &:nth-child(even) {
+    background-color: var(--alt-dialog);
+  }
+}
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 782e6632c891d51e139f554d787027e3221992ec..e40640e582149ddca125ba89a406a1033ba6d792 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
@@ -3,7 +3,7 @@
     <div class="anchor-wrp">
       <div class="anchor-right">
         <mat-form-field *ngIf="tags" class="tag-form-field">
-          <mat-label>{{'comment-page.tag' | translate}}</mat-label>
+          <mat-label><mat-icon>local_offer</mat-icon>{{'comment-page.tag' | translate}}</mat-label>
           <mat-select [(ngModel)]="selectedTag" class="tag-select">
             <mat-option *ngFor="let tag of tags" value="{{tag}}">
               {{tag}}
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 252b51d7f84969f3919a159dfb51f605c7268554..416a28f378f418420c97dc80f917a938866abfa1 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -253,7 +253,7 @@
   },
   "user-bonus-token": {
     "header": "Tokens für Bonuspunkte",
-    "no-bonus": "Du hast noch keinen Bonuspunkt (Stern) erhalten.",
+    "no-bonus": "Du hast noch keinen Token (Stern) für eine gute Frage erhalten.",
     "redeem-tokens": "Tokens einlösen",
     "mail-subject": "Bitte%20um%20Einl%C3%B6sung%20meiner%20Tokens%20aus%20der%20%C2%BBfrag.jetzt%C2%AB-Sitzung%20%C2%BB",
     "mail-body-1": "Hallo%2C%0D%0A%0D%0Aich%20habe%20heute%20in%20der%20%C2%BBfrag.jetzt%C2%AB-Sitzung%20%C2%BB",