diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
index 562835dded18f5a1c44ee780ed05f8f5b01ab7d4..5fc6466bc6778ae57450209d51fdd1c3f9bd86fd 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
@@ -1,6 +1,6 @@
 <header>
 	<div class="left">
-		<goofy-client-icon-button-with-spinner icon="menu" (clickEmitter)="toggleMenuEvent.emit(!this.navigationCollapse)">
+		<goofy-client-icon-button-with-spinner icon="menu" toolTip="Hauptmenü umschalten" (clickEmitter)="toggleMenuEvent.emit(!this.navigationCollapse)">
 		</goofy-client-icon-button-with-spinner>
 		<a routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
 			<img src="/assets/img/logo.svg" alt="Goofy Logo" />
diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
index 1524dc46ed1cf454c3864f7326017472a900ff23..328924bb484a216e2585348bd05c347a55c1d031 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
@@ -1,5 +1,6 @@
 <goofy-client-icon-button-with-spinner
 		icon="settings"
+		toolTip="Einstellungen"
 		[matMenuTriggerFor]="settingsMenu"
 		(menuOpened)="toggle.focus()">
 </goofy-client-icon-button-with-spinner>
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
index 6e917399aa18e7ca9fddaca29c82b3f2e5e81e51..b99c8d0645b30d9ff669b81097d75ed937d0f98b 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.html
@@ -6,7 +6,11 @@
 </goofy-client-icon-button-with-spinner>
 
 <mat-menu #menu="matMenu" class="reply-option-menu">
-	<button mat-menu-item *ngFor="let item of itemList;" (click)="setSelectedEnumItem(item)" [attr.data-test-id]="(item.type | convertForDataTest) + '-enum-item'">
+	<button *ngFor="let item of itemList;"
+			mat-menu-item
+			(click)="setSelectedEnumItem(item)"
+			[attr.data-test-id]="(item.type | convertForDataTest) + '-enum-item'"
+			aria-label="Antworten erlauben/unterbinden">
 		<mat-icon *ngIf="item.svgIcon" [svgIcon]="item.svgIcon"></mat-icon>
 		<mat-icon *ngIf="!item.svgIcon">{{ item.icon }}</mat-icon>
 		<span> {{ item.text }}</span>
diff --git a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.html b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.html
index 8d661c889a75ba4895151121f1542686a1f05720..37263e151b18946cc6c57ad32f3ba4db3ec3d064 100644
--- a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.html
@@ -1,10 +1,10 @@
 <mat-accordion displayMode="flat" hideToggle>
 
-	<mat-expansion-panel [expanded]="expanded" data-test-class="expansion-panel">
+	<mat-expansion-panel [expanded]="expanded" data-test-class="expansion-panel" #expansionPanel>
 
 		<mat-expansion-panel-header>
 			<mat-panel-title data-test-class="panel-title">
-				<button mat-icon-button tabindex="-1" [attr.aria-label]="'Bereich ' + (expanded? 'ausklappen': 'einklappen')">
+				<button mat-icon-button tabindex="-1" [attr.aria-label]="'Bereich ' + (expansionPanel.expanded? 'reduzieren': 'erweitern')">
 					<mat-icon>chevron_right</mat-icon>
 				</button>
 				<h3>{{ headline }}</h3>
diff --git a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
index e18f2eca89e3eb721e40708b722040afcafcbcdb..45789f0e53203f47322bbd512121615508d406a8 100644
--- a/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.ts
@@ -9,4 +9,6 @@ export class ExpansionPanelComponent {
 
 	@Input() headline: string;
 	@Input() expanded: boolean = true;
+
+
 }
diff --git a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.html b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.html
index 912b2f21a2b3a8fde4a571cd96789829de5a1cf0..c594a3f0b63de9492ad8c62637b8433497f0c4c9 100644
--- a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.html
@@ -3,12 +3,14 @@
 	<div class="button-bar">
 		<button mat-icon-button data-test-id="min-max-button"
 				(click)="minimize()"
-				[ngClass]="{minimized: isMinimized}">
+				[ngClass]="{minimized: isMinimized}"
+				aria-label="Nachricht minimieren">
 			<mat-icon>minimize</mat-icon>
 		</button>
 
 		<button mat-icon-button data-test-id="close-button"
-				[mat-dialog-close]="true">
+				[mat-dialog-close]="true"
+				aria-label="Nachricht schließen">
 			<mat-icon>close</mat-icon>
 		</button>
 	</div>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.html
index 8715e358e93bec78be387f2102ce428dfe50fbae..ea2636b2fff7970ebe1ffa7175c3bbd517717556 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.html
@@ -17,7 +17,7 @@
 
 		<button *ngIf="wiedervorlageResource.beschreibung || wiedervorlageResource.attachments.length > 0" data-test-class="expand-button"
 				[ngClass]="{ 'is-open': expanded }"
-				[attr.aria-label]="'Bereich ' + (expanded? 'ausklappen': 'einklappen')"
+				[attr.aria-label]="'Bereich ' + (expanded? 'reduzieren': 'erweitern')"
 				[matTooltip]="tooltip" mat-icon-button
 				(click)="toggle()">
 			<mat-icon>chevron_right</mat-icon>