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 bd0310f03952fe4d145eb8f9f99ba5892f7f58b6..ccc300faef6ed830bb6fbe3c7e9d61d4b9fc84da 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
@@ -4,7 +4,7 @@
 		</goofy-client-icon-button-with-spinner>
 		<a routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
 			<img src="/assets/img/logo.svg" alt="Goofy Logo" />
-			<h1 data-test-id='title'>Goofy</h1>
+			<div data-test-id='title'>Goofy</div>
 		</a>
 	</div>
 
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 9c15942f20cc1e30d19b062b60d81f81a201f4e2..4b43447520d4d6dbdcf1e33ffd955bdef5064a3f 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
@@ -4,7 +4,7 @@
 
 		<mat-expansion-panel-header>
 			<mat-panel-title data-test-class="panel-title">
-				<button mat-icon-button tabindex="-1">
+				<button mat-icon-button tabindex="-1" [attr.aria-label]="'button to show' + (expanded? 'more': 'less') + ' info'">
 					<mat-icon>chevron_right</mat-icon>
 				</button>
 				<h3>{{ headline }}</h3>
diff --git a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
index d58ac568cd70a2aa3f2aa0b8dc4115aeda38caa6..f62ed59ecca832eb2ce8a71289d9d0b499881f26 100644
--- a/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/file-upload/file-upload.component.html
@@ -1,7 +1,6 @@
-<label [attr.for]="myId" matRipple>
+<input data-test-id="file-upload-input"
+	[id]="myId" type="file" [accept]="accept"
+	(change)="onFileChanged($event)">
+<label [attr.for]="myId" matRipple aria-label="attachment icon">
 	<mat-icon>attach_file</mat-icon>
 </label>
-
-<input #fileInput data-test-id="file-upload-input"
-	[id]="myId" type="file" [accept]="accept" 
-	(change)="onFileChanged($event)">
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
index 7adb7404147429d71531e004d600f4522217a711..fb7638cae3bd66d7ef17c401e1438a9bca3abc15 100644
--- a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.html
@@ -1,5 +1,5 @@
 <button mat-icon-button
-		[attr.aria-label]="'icon button with a ' + icon + ' icon'"
+		[attr.aria-label]="'icon button with a ' + (icon ? icon : svgIcon) + ' icon'"
 		[disabled]="isDisabled"
 		(click)="clickEmitter.emit($event)"
 		[matTooltip]="toolTip"
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-button-container/user-profile-button-container.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-button-container/user-profile-button-container.component.html
index b5999712df289f979e458672ed67c84cf8eeb2a4..8e53abf61007f17a6b81566a9269213d9c7f7f08 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-button-container/user-profile-button-container.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-button-container/user-profile-button-container.component.html
@@ -1,6 +1,7 @@
 <button #menuTrigger="matMenuTrigger"
 		[matMenuTriggerFor]="menu"
 		(menuOpened)="showUserProfileSearch()" (menuClosed)="hideUserProfileSearch()"
+		aria-label="icon button with a account icon"
 		class="user-profile-button">
 
 	<goofy-client-user-icon data-test-id="user-profile-icon"
@@ -13,4 +14,4 @@
 	<goofy-client-user-profile-search-container *ngIf="showUserProfileSearch$ | async" data-test-id="user-profile-search-container"
 		(click)="$event.stopPropagation()" (assigned)="menuTrigger.closeMenu()">
 	</goofy-client-user-profile-search-container>
-</mat-menu>
\ No newline at end of file
+</mat-menu>
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
index 029b626d0a5676a7f85e46848624384b7009fad8..04a5d2b97a29f5e5c44300796f1be38c94a81362 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
@@ -6,10 +6,10 @@
 <div class="line">
 	<div class="identifier">
 		<h1 goofy-client-aktenzeichen [vorgang]="vorgangWithEingang"></h1>
-		<h3 data-test-id="name">{{ vorgangWithEingang.name }}</h3>
+		<h2 data-test-id="name">{{ vorgangWithEingang.name }}</h2>
 	</div>
 	<goofy-client-user-profile-in-vorgang-container *ngIf="vorgangWithEingang | hasLink: linkRel.ASSIGN" data-test-id="vorgang-header-user-icon"
-		[vorgang]="vorgangWithEingang" 
+		[vorgang]="vorgangWithEingang"
 		class="user">
 	</goofy-client-user-profile-in-vorgang-container>
 </div>
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
index 2576599e2f10751cb5084901586b66630b8e0690..259fa5a4dc50d6a77638c454e9bbfe8546e521f0 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
@@ -25,7 +25,9 @@ h1 {
 	font-weight: 400;
 }
 
-h3 {
+h2 {
 	line-height: 1.4;
 	margin: 0;
+	font-size: 16px;
+	font-weight: 400;
 }
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
index 268a5baf2fae21d1c7647e2f575c6489d5cde2d1..30862878a96c5fab16ec5e58328b4c5bd266b66a 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="vorgangStateResource$ | async as vorgangStateResource">
 
 	<goofy-client-subnavigation>
-		<a routerLink="/" mat-icon-button data-test-id="back-button" class="back-button">
+		<a routerLink="/" mat-icon-button data-test-id="back-button" class="back-button" aria-label="back button with arrow icon">
 			<mat-icon>arrow_back</mat-icon>
 		</a>
 		<goofy-client-vorgang-detail-action-buttons [vorgangWithEingang]="vorgangStateResource"></goofy-client-vorgang-detail-action-buttons>
@@ -15,4 +15,4 @@
 
 </ng-container>
 
-<goofy-client-progress-bar data-test-id="progress-bar" [stateResource]="revokeCommandStateResource$ | async"></goofy-client-progress-bar>
\ No newline at end of file
+<goofy-client-progress-bar data-test-id="progress-bar" [stateResource]="revokeCommandStateResource$ | async"></goofy-client-progress-bar>
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 b1fd5accc66ce0ab16d996a8790bf2ec9f9ba99c..1050932fb0e80b7e9f80bb4dcdc2db7359b6c548 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
@@ -1,31 +1,34 @@
-<div [attr.data-test-id]="(wiedervorlageResource.betreff | convertForDataTest)" 
-	class="container">
+<div [attr.data-test-id]="(wiedervorlageResource.betreff | convertForDataTest)"
+		class="container">
 
 	<div class="row">
 		<goofy-client-wiedervorlage-status data-test-class="status"
-			[matTooltip]="wiedervorlageResource.frist | toTrafficLightTooltip"
-			[wiedervorlageResource]="wiedervorlageResource">
+				[matTooltip]="wiedervorlageResource.frist | toTrafficLightTooltip"
+				[wiedervorlageResource]="wiedervorlageResource">
 		</goofy-client-wiedervorlage-status>
 
 		<a routerLink="wiedervorlage/{{ wiedervorlageResource | toResourceUri }}" data-test-class="link"
-			[matTooltip]="tooltip"
-			class="link">
+				[matTooltip]="tooltip"
+				class="link">
 
 			<span class="date" data-test-class="frist">{{ wiedervorlageResource.frist | formatListDate }}</span>
 			<span class="name" data-test-class="betreff">{{ wiedervorlageResource.betreff }}</span>
 		</a>
 
 		<button *ngIf="wiedervorlageResource.beschreibung || wiedervorlageResource.attachments.length > 0" data-test-class="expand-button"
-			[ngClass]="{ 'is-open': expanded }" [matTooltip]="tooltip" mat-icon-button
-			(click)="toggle()">
+				[ngClass]="{ 'is-open': expanded }"
+				[attr.aria-label]="'button to show' + (expanded? 'more': 'less') + ' info'"
+				[matTooltip]="tooltip" mat-icon-button
+				(click)="toggle()">
 			<mat-icon>chevron_right</mat-icon>
 		</button>
 	</div>
 	<div *ngIf="expanded" data-test-class="expandable" class="expandable">
 		<p *ngIf="wiedervorlageResource.beschreibung" [matTooltip]="tooltip">{{ wiedervorlageResource.beschreibung }}</p>
 
-		<goofy-client-wiedervorlage-attachment-list-in-vorgang *ngIf="wiedervorlageResource | hasLink: linkRel.ATTACHMENTS" data-test-id="wiedervorlage-attachment-list-in-vorgang"
-			[wiedervorlage]="wiedervorlageResource" class="attachments">
+		<goofy-client-wiedervorlage-attachment-list-in-vorgang *ngIf="wiedervorlageResource | hasLink: linkRel.ATTACHMENTS"
+				data-test-id="wiedervorlage-attachment-list-in-vorgang"
+				[wiedervorlage]="wiedervorlageResource" class="attachments">
 		</goofy-client-wiedervorlage-attachment-list-in-vorgang>
 	</div>
 </div>
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
index 65e118d25cb94fe79dae1a9eb84b54299667f5aa..8476270ec50465a85dbff8b3de6baad564e8cd4b 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.html
@@ -1,6 +1,6 @@
-<a routerLink="../.." mat-icon-button data-test-id="back-button" class="back-button">
+<a routerLink="../.." mat-icon-button data-test-id="back-button" class="back-button" aria-label="back button with arrow icon">
 	<mat-icon>arrow_back</mat-icon>
 </a>
 <goofy-client-erledigen-button-container [wiedervorlage]="wiedervorlage"></goofy-client-erledigen-button-container>
 <goofy-client-wiedereroeffnen-button-container [wiedervorlage]="wiedervorlage"></goofy-client-wiedereroeffnen-button-container>
-<goofy-client-submit-wiedervorlage-button [showAsIconButton]="true"></goofy-client-submit-wiedervorlage-button>
\ No newline at end of file
+<goofy-client-submit-wiedervorlage-button [showAsIconButton]="true"></goofy-client-submit-wiedervorlage-button>