diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.scss b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.scss
index 8eb33b8819a86ddd7bf52442dec40f771684dd5d..3ec3a52b5d80d03dd7cdcf09cfad4c3306b12763 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.scss
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.scss
@@ -51,7 +51,7 @@ h3 {
 	font-weight: 500;
 }
 
-.nachrichten {
+.nachrichten-header {
 	border-top: 1px solid rgba(0, 0, 0, 0.08);
 	margin-top: 16px;
 }
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button-container.component.scss b/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button-container.component.scss
index 9a08a5aabce6cc4cdbb268c4190a8d67f82f19e5..c2475463f1b5a51d27b79640e283d8d7436f35c8 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button-container.component.scss
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-pdf-button-container/postfach-mail-pdf-button-container.component.scss
@@ -21,3 +21,8 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+
+ :host {
+	display: block;
+	margin: 16px 24px;
+ }
\ No newline at end of file
diff --git a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
index c20937a7108fbda72f6a469c72efc74fe34b8330..e66aa2794ec9056f700c5e1f5eefb527aa57faab 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
@@ -25,7 +25,7 @@
 -->
 <button mat-stroked-button data-test-class="icon-button" [attr.data-test-id]="dataTestId"
 		[color]="color" [type]="type" [disabled]="isDisabled" [matTooltip]="toolTip"
-		(click)="clickEmitter.emit($event)">
+		[class.with-text]="text" (click)="clickEmitter.emit($event)">
 
 	<mat-icon *ngIf="icon" data-test-class="icon"
 			[style.visibility]="isDisabled ? 'hidden' : 'visible'">
diff --git a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.scss b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.scss
index 5f936c661d4a68831642e101074e5adc1325772b..c4dea65393834200633b2be7c9f6830aa32446fa 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.scss
@@ -39,5 +39,10 @@ goofy-client-spinner {
 }
 
 button {
-	min-width: 54px;
+	min-width: 36px;
+	min-height: 36px;
+	padding: 0;
+	&.with-text {
+		padding: 0 15px;
+	}
 }
\ No newline at end of file