diff --git a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html
index dd81987c5..a25f8a7e9 100644
--- a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html
+++ b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html
@@ -1,7 +1,9 @@
 <div class="template-container" *ngIf="descriptionTemplate && formGroup">
-	<div mat-dialog-title class="row d-flex m-0 header">
-		<span class="template-title align-self-center" matTooltip="{{descriptionTemplate.label}}">{{'DESCRIPTION-TEMPLATE-PREVIEW.TEMPLATE' | translate}} - {{descriptionTemplate.label}}</span>
-		<span class="ml-auto align-self-center" (click)="closeDialog()"><mat-icon class="close-icon">close</mat-icon></span>
+	<div mat-dialog-title class="row align-items-center header">
+		<div class="col"><span class="template-title align-self-center" matTooltip="{{descriptionTemplate.label}}">{{'DESCRIPTION-TEMPLATE-PREVIEW.TEMPLATE' | translate}} - {{descriptionTemplate.label}}</span></div>
+		<div class="col-auto">
+			<button mat-icon-button tabindex="-1" (click)="closeDialog()"><mat-icon>close</mat-icon></button>
+		</div>
 	</div>
 	<div *ngIf="progressIndication" class="progress-bar">
 		<mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
diff --git a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.scss b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.scss
index ce95fb746..08f8d7013 100644
--- a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.scss
+++ b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.scss
@@ -16,21 +16,10 @@
 		text-overflow: ellipsis;
 	}
 
-	.close-icon {
-		cursor: pointer;
-		margin-right: 20px;
-	}
-
-	.close-icon:hover {
-		background-color: #fefefe6e !important;
-		border-radius: 50%;
-	}
-
 	.definition-content {
 		display: block;
 		margin: 0px;
 		padding: 0 24px;
 	}
-
 }
 
diff --git a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html
index 7f2a1a9dc..c86e35d70 100644
--- a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html
+++ b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html
@@ -1,10 +1,10 @@
 <div class="user-invite-to-tenant-dialog container-fluid" *ngIf="formGroup">
-	<div class="row">
+	<div class="row align-items-center">
 		<div class="col">
 			<h1 class="title">{{'USER-INVITE-TO-TENANT-DIALOG.TITLE' | translate}}</h1>
 		</div>
-		<div class="col-auto" (click)="closeDialog()">
-			<mat-icon class="close-icon">close</mat-icon>
+		<div class="col-auto">
+			<button mat-icon-button tabindex="-1" (click)="closeDialog()"><mat-icon>close</mat-icon></button>
 		</div>
 	</div>
 	<div mat-dialog-content class="row">
diff --git a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.scss b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.scss
index 21cb6c862..3dd4f47f9 100644
--- a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.scss
+++ b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.scss
@@ -24,7 +24,6 @@
 		font-weight: lighter;
 		color: #000000;
 		opacity: 0.8;
-		margin-bottom: 0.842em;
 	}
 
 	.content {
diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.html b/frontend/src/app/ui/plan/overview/plan-overview.component.html
index 3bc7a63ab..1f464fa4c 100644
--- a/frontend/src/app/ui/plan/overview/plan-overview.component.html
+++ b/frontend/src/app/ui/plan/overview/plan-overview.component.html
@@ -57,7 +57,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="row" *ngIf="!lockStatus || canClonePlan() || (canDeletePlan() && !isLocked)">
+					<div class="row mb-4" *ngIf="!lockStatus || canClonePlan() || (canDeletePlan() && !isLocked)">
                         <div class="col-auto pr-0">
                             @if(isActive && canEditPlan(plan) && !lockStatus){
                                 <button (click)="editClicked()" mat-mini-fab class="d-flex justify-content-center align-items-center" matTooltip="{{'PLAN-OVERVIEW.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">