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 1c326d81856560dc3c48b36e52d979bad92337f9..4cfd140a2ea21e0d2bc60fba2778bff74976ef8c 100644
--- a/src/app/components/shared/write-comment/write-comment.component.html
+++ b/src/app/components/shared/write-comment/write-comment.component.html
@@ -1,44 +1,44 @@
 <ars-row>
   <ng-container [ngTemplateOutlet]="additionalTemplate"></ng-container>
   <div class="lang-selection" *ngIf="enabled">
-    <button class="lang-btn"
-            mat-button
-            (click)="select.open()"
-            matTooltip="{{ 'spacy-dialog.lang-button-hint' | translate }}"
-            matTooltipShowDelay="750">
-      <mat-icon id="langSymbol">language</mat-icon>
-      <span *ngIf="selectedLang !== 'auto'">
+
+  </div>
+  <button class="lang-btn"
+          mat-button
+          *ngIf="enabled"
+          (click)="select.open()"
+          matTooltip="{{ 'spacy-dialog.lang-button-hint' | translate }}"
+          matTooltipShowDelay="750">
+    <mat-icon class="btn-icon">language</mat-icon>
+    <span *ngIf="selectedLang !== 'auto'">
         {{'spacy-dialog.' + (languagetoolService.mapLanguageToSpacyModel(selectedLang)) | translate}}
       </span>
-      <span *ngIf="selectedLang === 'auto'" #langSelect>
+    <span *ngIf="selectedLang === 'auto'" #langSelect>
         {{'spacy-dialog.language' | translate}}
       </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>
-        </mat-option>
-      </mat-select>
-    </button>
-  </div>
-  <mat-form-field *ngIf="tags"
-                  class="tag-form-field">
-    <mat-label>
-      <mat-icon class="icon-svg"
-                svgIcon="comment_tag"></mat-icon>
-      {{'comment-page.tag' | translate}}
-    </mat-label>
-    <label for="tagSelect">{{selectedTag}}</label>
-    <mat-select [(ngModel)]="selectedTag"
-                class="tag-select"
-                id="tagSelect">
-      <mat-option>{{'comment-page.tag-reset' | translate}}</mat-option>
-      <mat-option *ngFor="let tag of tags"
-                  value="{{tag}}">{{tag}}</mat-option>
+    <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>
+      </mat-option>
+    </mat-select>
+  </button>
+  <button class="tag-btn"
+          mat-button
+          *ngIf="enabled && tags && tags.length"
+          (click)="tagSelect.open()"
+          matTooltip="{{ 'spacy-dialog.lang-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>
+    <label for="tagSelect" *ngIf="selectedTag">{{selectedTag}}</label>
+    <mat-select class="select-list" id="tagSelect" #tagSelect [(ngModel)]="selectedTag">
+      <mat-option [value]="null"><em>{{'comment-page.tag-reset' | translate}}</em></mat-option>
+      <mat-option *ngFor="let tag of tags" [value]="tag">{{tag}}</mat-option>
     </mat-select>
-  </mat-form-field>
+  </button>
 </ars-row>
 <ars-row [height]="12"></ars-row>
 <app-view-comment-data *ngIf="enabled"
diff --git a/src/app/components/shared/write-comment/write-comment.component.scss b/src/app/components/shared/write-comment/write-comment.component.scss
index 60f26f6a7e2cb24bc148f0dbd94cfbb1738f8e2e..b6430bf801b9729e0666b76d1426990d7d6e1919 100644
--- a/src/app/components/shared/write-comment/write-comment.component.scss
+++ b/src/app/components/shared/write-comment/write-comment.component.scss
@@ -109,6 +109,10 @@ mat-hint {
   margin-top: 8px;
 }
 
+.btn-icon {
+  margin-right: 5px;
+}
+
 /*
 Styling for tag selection
  */
@@ -117,15 +121,8 @@ Styling for tag selection
   display: inline;
 }
 
-.tag-form-field {
-  z-index: 10000;
+.tag-btn {
   float: right;
-
-  @media screen and (max-width: 480px) {
-    float: unset;
-    width: max-content;
-    margin: 5px 16px;
-  }
 }
 
 .anchor-wrp {
@@ -141,25 +138,13 @@ Styling for tag selection
 Styling for language select
  */
 
-#langSymbol {
-  margin-right: 5px;
-}
-
 .select-list {
   width: 18px;
   margin-left: 12px;
 }
 
-.lang-selection {
-  vertical-align: middle;
-  margin-right: 0;
-  width: 200px;
-  display: inline-block;
-
-  > button {
-    padding: 0;
-    margin-left: 12px;
-  }
+.lang-btn {
+  margin-left: 12px;
 }
 
 /*