diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
index ac82f2c90bd277444dcb8bca6adada7dd5d2d4c4..fd800b47fd620f96e27880e6f165680d1939e277 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html
@@ -1,9 +1,11 @@
 <mat-icon *ngIf="icon" data-test-class="icon"
+		[class.with-text]="text"
 		[style.visibility]="isDisabled ? 'hidden' : 'visible'">
 	{{ icon }}
 </mat-icon>
 
 <mat-icon *ngIf="svgIcon" data-test-class="icon"
+		[class.with-text]="text"
 		[svgIcon]="svgIcon"
 		[style.visibility]="isDisabled ? 'hidden' : 'visible'">
 </mat-icon>
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
index d1670e97df622f3926526951495809d872106d06..99053feec562dcbc112ae4b253a6dd3b318c3021 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss
@@ -6,7 +6,7 @@ $rightMargin: 8px;
 	justify-content: center;
 }
 
-mat-icon {
+mat-icon.with-text {
 	margin-right: $rightMargin;
 }
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss
index ca436cc9bc6222e98f33293c5de15b8c3611f37b..0fe9a65ebba82c31fca50c1b2a247dbf4fc896d7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss
@@ -28,3 +28,9 @@
 	font-size: 16px;
 	font-weight: 400;
 }
+
+// Workaround Material's fixed 48px height
+:host ::ng-deep ozgcloud-icon-button-primary button {
+	position: absolute;
+	top: -24px;
+}
\ No newline at end of file
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html
index fc537d604edb2a82f141001e23cc51f48ee4a9d6..76fbd0fcdad0369b636ee22e55d8cab06cbbff52 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html
@@ -23,8 +23,8 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<h1 *ngIf="vorgangStateResource.resource as vorgang">
+<span *ngIf="vorgangStateResource.resource as vorgang">
 	<a routerLink='/vorgang/{{ vorgang | toResourceUri }}' alfa-aktenzeichen [vorgang]="vorgang"></a>
 	<span>/</span>
 	<span>Nachrichten</span>
-</h1>
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss
index fc20de9113991e7e70654e30b5f19da9be8e3bdb..e464165e3caa071427d0d983d92f8eeff45c0bf1 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss
@@ -43,12 +43,4 @@
 			background-color: rgba(#777, 0.16);
 		}
 	}
-
-	h1 {
-		font-size: inherit;
-		font-weight: inherit;
-		display: inline-block;
-		margin: 0 4px;
-		padding: 0;
-	}
 }
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html
index e5c5cf7e66bd2e1dcd04bf93f546e2a565ad77ec..c9ba19672327f65810cbf341f1509d9d35efb768 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html
@@ -27,4 +27,4 @@
 <span>/</span>
 <span>Wiedervorlagen</span>
 <span>/</span>
-<h1>{{ betreff }}</h1>
+<span>{{ betreff }}</span>
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss
index 45b498dd7d0a306d64a8b956c39e928bcbf8142c..799ca154698da0a9bcc0d552f4364bb9d05f2442 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss
@@ -43,12 +43,4 @@
 			background-color: rgba(#777, 0.16);
 		}
 	}
-
-	h1 {
-		font-size: inherit;
-		font-weight: inherit;
-		display: inline-block;
-		margin: 0 4px;
-		padding: 0;
-	}
 }
\ No newline at end of file