diff --git a/src/app/components/shared/write-comment/write-comment.component.html b/src/app/components/shared/write-comment/write-comment.component.html
index dd761f44a76c6840efcfe82ed71f478904b37d57..bbe4b0dad9118c9a04bd8181a102a993ffcc2e2a 100644
--- a/src/app/components/shared/write-comment/write-comment.component.html
+++ b/src/app/components/shared/write-comment/write-comment.component.html
@@ -11,14 +11,14 @@
         {{'spacy-dialog.' + (languagetoolService.mapLanguageToSpacyModel(selectedLang)) | translate}}
       </span>
     <span *ngIf="selectedLang === 'auto'" #langSelect>
-        {{'spacy-dialog.language' | translate}}
+      <em>{{'spacy-dialog.language' | translate}}</em>
       </span>
     <mat-select class="select-list" #select [(ngModel)]="selectedLang">
       <mat-option *ngFor="let lang of languages" [value]="lang">
         <span *ngIf="lang == 'de-DE'">{{ 'spacy-dialog.de' | translate }}</span>
         <span *ngIf="lang == 'en-US'">{{ 'spacy-dialog.en' | translate }}</span>
         <span *ngIf="lang == 'fr'">{{ 'spacy-dialog.fr' | translate }}</span>
-        <span *ngIf="lang == 'auto'">{{ 'spacy-dialog.auto' | translate }}</span>
+        <span *ngIf="lang == 'auto'"><em>{{ 'spacy-dialog.auto' | translate }}</em></span>
       </mat-option>
     </mat-select>
   </button>
@@ -26,7 +26,7 @@
           mat-button
           *ngIf="enabled && tags && tags.length"
           (click)="tagSelect.open()"
-          matTooltip="{{ 'spacy-dialog.lang-button-hint' | translate }}"
+          matTooltip="{{ 'spacy-dialog.tag-button-hint' | translate }}"
           matTooltipShowDelay="750">
     <mat-icon class="btn-icon" svgIcon="comment_tag"></mat-icon>
     <label for="tagSelect" *ngIf="!selectedTag"><em>{{'comment-page.tag' | translate}}</em></label>
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 885e376032ae94af87c7c248c30ec178cff32b42..5a84e799294cabe58e65dc7be273e252f4b63ae5 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -89,7 +89,8 @@
     "en": "Englisch",
     "fr": "Französisch",
     "select-all": "Alles auswählen",
-    "lang-button-hint": "Sprache für die Rechtschreibprüfung",
+    "lang-button-hint": "Wähle die Sprache für die Rechtschreibprüfung.",
+    "tag-button-hint": "Wähle die treffende Kategorie für deine Frage.",
     "select-all-hint": "Alle Nomen als Stichwörter auswählen",
     "select-keyword-hint": "Dieses Wort als Stichwort auswählen",
     "edit-keyword-hint": "Wort editieren",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 75a2779454fcf8fb0a5e450684470e825c7a6880..3cc21b004ac7a3b16f313336b95c65945ccfaba2 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -90,7 +90,8 @@
     "en": "English",
     "fr": "French",
     "select-all": "Select all",
-    "lang-button-hint": "Language for the spell checker",
+    "lang-button-hint": "Choose the language for the spell checker.",
+    "tag-button-hint": "Choose the appropriate category for your question.",
     "select-all-hint": "Select all keywords",
     "select-keyword-hint": "Select this keyword",
     "edit-keyword-hint": "Edit keyword",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index ef882a019aa3befcf6618c77a3ae0f007fd77a14..7453cddfd966f73afac46c77a4fa80df5f52e6f9 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -95,7 +95,8 @@
     "en": "Englisch",
     "fr": "Französisch",
     "select-all": "Alles auswählen",
-    "lang-button-hint": "Sprache für die Rechtschreibprüfung",
+    "lang-button-hint": "Wähle die Sprache für die Rechtschreibprüfung.",
+    "tag-button-hint": "Wähle die treffende Kategorie für deine Frage.",
     "select-all-hint": "Alle Nomen als Stichwörter auswählen",
     "select-keyword-hint": "Dieses Wort als Stichwort auswählen",
     "edit-keyword-hint": "Wort editieren",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 2b1cc53e0fb0881266771d73d5d71031c2f57e3e..bbc416a7b36f713774340fef80c604a89df92a5b 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -105,7 +105,8 @@
     "en": "English",
     "fr": "French",
     "select-all": "Select all",
-    "lang-button-hint": "Language for the spell checker",
+    "lang-button-hint": "Choose the language for the spell checker.",
+    "tag-button-hint": "Choose the appropriate category for your question.",
     "select-all-hint": "Select all keywords",
     "select-keyword-hint": "Select this keyword",
     "edit-keyword-hint": "Edit keyword",