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 3cbf7031081975d09c4294523aa77c7aa9d6610c..5a61a4db0ffb704fcf2b7319ce7d387825928d9a 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
@@ -1,6 +1,6 @@
 <mat-dialog-content>
   <mat-card>
-    <mat-slide-toggle [(ngModel)]="considerVotes">{{'topic-cloud-dialog.considerVotes' | translate}}</mat-slide-toggle>
+    <mat-slide-toggle [(ngModel)]="considerVotes">{{'topic-cloud-dialog.consider-Votes' | translate}}</mat-slide-toggle>
     <mat-slide-toggle [(ngModel)]="tagsLowerCase">{{'topic-cloud-dialog.tags-lowercase' | translate}}</mat-slide-toggle>
   </mat-card>
 
@@ -40,7 +40,7 @@
     <mat-expansion-panel hideToggle *ngIf="searchMode && filteredKeywords.length === 0">
         <mat-expansion-panel-header>
             <mat-panel-title fxLayoutAlign="center">
-              {{'topic-cloud-dialog.noKeywords' | translate}}
+              {{'topic-cloud-dialog.no-Keywords-note' | translate}}
             </mat-panel-title>
         </mat-expansion-panel-header>
       </mat-expansion-panel>
@@ -67,7 +67,7 @@
       </div>
 
       <!-- Only visible when not editing -->
-      <div *ngIf="!edit && isCreatorOrMod" align="end">
+      <div *ngIf="!edit" align="end">
         <mat-divider></mat-divider>
 
         <button class="margin-right" mat-icon-button style="align-self:flex-end;" (click)="editKeyword(i)">
@@ -84,7 +84,7 @@
         <mat-divider></mat-divider>
 
         <mat-form-field>
-          <mat-label>{{'topic-cloud-dialog.editkeyword-tipp' | translate}}</mat-label>
+          <mat-label>{{'topic-cloud-dialog.edit-keyword-tipp' | translate}}</mat-label>
           <input matInput id="{{'edit-input'+i}}" [(ngModel)]="newKeyword">
         </mat-form-field>
         <!-- TODO: textinput and buttons in one row -->
@@ -93,7 +93,6 @@
           <button mat-raised-button class="primaryBackground" (click)="confirmEdit(keyword.keywordID)">{{'topic-cloud-dialog.save' | translate}}</button>
         </div>
       </div>
-
     </mat-expansion-panel>
   </mat-accordion>
-</mat-dialog-content>
+</mat-dialog-content>
\ No newline at end of file
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 867cde48d834dcf2268d4cff10388c7b462c31c2..bfbab314006fa64e8ac79f1782d30dd4ec06d463 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -297,23 +297,5 @@
   },
   "qr-dialog": {
     "session": "Raum"
-  },
-  "topic-cloud-dialog":{
-    "edit": "bearbeiten",
-    "delete": "löschen",
-    "question-count-singular": "Frage",
-    "question-count-plural": "Fragen",
-    "editkeyword-tipp": "Neues Thema",
-    "nokeyword-note": "Es gibt keine Themen",
-    "considerVotes": "Votes berücksichtigen",
-    "sort-Alpha": "alphabetisch",
-    "sort-Count": "Fragenanzahl",
-    "keyword-search": "Keyword suchen",
-    "noKeywords": "Es gibt keine Keywords"
-  },
-  "topic-cloud-confirm-dialog":{
-    "cancel": "abbrechen",
-    "delete": "löschen",
-    "confirm": "Möchten Sie wirklich das Thema löschen"
   }
 }
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index aa0bf64d612e7d8cfe9fec3b78e6051dd101d00d..c06841d49ed87d62bfad519ea9119d316e3327ea 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -300,23 +300,5 @@
   },
   "qr-dialog": {
     "session": "Key code"
-  },
-  "topic-cloud-dialog":{
-    "edit": "edit",
-    "delete": "delete",
-    "question-count-singular": "question",
-    "question-count-plural": "questions",
-    "editkeyword-tipp": "new topic",
-    "nokeyword-note": "there are no topics!",
-    "considerVotes": "Consider Votes",
-    "sort-Alpha": "Alphabetically",
-    "sort-Count": "questions count",
-    "keyword-search": "search keyword",
-    "noKeywords": "there are no keywords"
-  },
-  "topic-cloud-confirm-dialog":{
-    "cancel": "cancel",
-    "delete": "delete",
-    "confirm": "Do you really want to delete the topic"
   }
 }
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 785e3635e53b158c570e224c51c1a66cb0093e17..6310aabd419dd21ee9a1a9ee1bc5e50945ace57d 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -217,25 +217,22 @@
     "administration": "Wolkenthemen editieren"
   },
   "topic-cloud-dialog":{
-    "edit": "Bearbeiten",
-    "delete": "Löschen",
-    "cancel": "Abbrechen",
-    "save": "Speichern",
+    "edit": "bearbeiten",
+    "delete": "löschen",
     "question-count-singular": "Frage",
     "question-count-plural": "Fragen",
-    "editkeyword-tipp": "Neues Thema",
-    "nokeyword-note": "Es gibt keine Themen",
-    "considerVotes": "Votes berücksichtigen",
+    "edit-keyword-tipp": "Neues Thema",
+    "no-keyword-note": "Es gibt keine Themen",
+    "consider-Votes": "Votes berücksichtigen",
     "tags-lowercase": "Themen klein schreiben",
-    "sort-Alpha": "Alphabetisch",
+    "sort-Alpha": "alphabetisch",
     "sort-Count": "Fragenanzahl",
-    "keyword-search": "keyword suchen",
-    "noKeywords": "es gibt keine keywords"
+    "keyword-search": "Stichwort suchen"
   },
   "topic-cloud-confirm-dialog":{
-    "cancel": "Abbrechen",
-    "delete": "Löschen",
-    "confirm": "Möchten Sie wirklich das Thema löschen"
+    "cancel": "abbrechen",
+    "delete": "löschen",
+    "confirm": "Sind Sie sicher?"
   },
   "dialog-comment":{
     "read-more": "Mehr lesen",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index bab25552834ac310220ec3535ca4691c7919384d..8c6084c675ca2642cc67265f8507257d160ede10 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -230,18 +230,17 @@
     "question-count-singular": "question",
     "question-count-plural": "questions",
     "editkeyword-tipp": "New topic",
-    "nokeyword-note": "there are no topics!",
+    "no-keyword-note": "there are no topics!",
     "considerVotes": "Consider Votes",
     "tags-lowercase": "Topics in lowercase",
     "sort-Alpha": "Alphabetically",
     "sort-Count": "Questions count",
-    "keyword-search": "search keyword",
-    "noKeywords": "there are no keywords"
+    "keyword-search": "search keyword"
   },
   "topic-cloud-confirm-dialog":{
     "cancel": "Cancel",
     "delete": "Delete",
-    "confirm": "Do you really want to delete the topic"
+    "confirm": "Are you sure?"
   },
   "dialog-comment":{
     "read-more": "Read more",