diff --git a/frontend/src/app/ui/admin/description-template/editor/table-of-contents/table-of-contents-internal-section/description-template-table-of-contents-internal-section.html b/frontend/src/app/ui/admin/description-template/editor/table-of-contents/table-of-contents-internal-section/description-template-table-of-contents-internal-section.html
index 6694f32b1..0316eb2d0 100644
--- a/frontend/src/app/ui/admin/description-template/editor/table-of-contents/table-of-contents-internal-section/description-template-table-of-contents-internal-section.html
+++ b/frontend/src/app/ui/admin/description-template/editor/table-of-contents/table-of-contents-internal-section/description-template-table-of-contents-internal-section.html
@@ -71,7 +71,7 @@
 					<ng-container *ngIf="!isDragging">
 
 						<ng-container *ngIf="selectedItemInLinks && (link.type != tocEntryType.Page) && isLast  && (!viewOnly)">
-							<button mat-button class="add-new-entry" style="padding-left: 0px;" (click)="createNewEntry({childType:link.type,parent:parentLink})">
+							<button mat-button style="padding-left: 0px;" (click)="createNewEntry({childType:link.type,parent:parentLink})">
 								<ng-container [ngSwitch]="link.type">
 									<ng-container *ngSwitchCase="tocEntryType.Section">
 										<div class="d-flex" style="align-items: center;">
diff --git a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
index d2da35f1c..5b829b2b7 100644
--- a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
+++ b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
@@ -90,19 +90,19 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/', row.id])">
 					<mat-icon>edit</mat-icon>{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
-				<button *ngIf="canAddNewVersion(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/new-version/', row.id])">
+				</a>
+				<a *ngIf="canAddNewVersion(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/new-version/', row.id])">
 					<mat-icon>queue</mat-icon>{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.NEW-VERSION' | translate}}
-				</button>
-				<button *ngIf="canClone(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/clone/', row.id])">
+				</a>
+				<a *ngIf="canClone(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/clone/', row.id])">
 					<mat-icon>content_copy</mat-icon>{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.CLONE' | translate}}
-				</button>
-				<button *ngIf="canViewVersions(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/versions/', row.groupId])">
+				</a>
+				<a *ngIf="canViewVersions(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-templates/versions/', row.groupId])">
 					<mat-icon>library_books</mat-icon>
 					{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.VIEW-VERSIONS' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDownloadXml(row)" mat-menu-item (click)="export($event, row.id)">
 					<mat-icon>download</mat-icon>{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.DOWNLOAD-XML' | translate}}
 				</button>
diff --git a/frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html b/frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
index 6d35ce31b..c19bd931f 100644
--- a/frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
+++ b/frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
@@ -90,9 +90,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-template-type/' + row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-template-type/' + row.id])">
 					<mat-icon>edit</mat-icon>{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button  *ngIf="canDelete(row)"  mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/language/listing/language-listing.component.html b/frontend/src/app/ui/admin/language/listing/language-listing.component.html
index a11a2f370..109e324a0 100644
--- a/frontend/src/app/ui/admin/language/listing/language-listing.component.html
+++ b/frontend/src/app/ui/admin/language/listing/language-listing.component.html
@@ -81,9 +81,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/languages/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/languages/', row.id])">
 					<mat-icon>edit</mat-icon>{{'LANGUAGE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'LANGUAGE-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html b/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html
index 5c92338da..2b80be3ba 100644
--- a/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html
+++ b/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html
@@ -17,8 +17,8 @@
 						</mat-panel-description>
 					</mat-expansion-panel-header>
 					<div class="mt-2">
-						<button mat-raised-button color="primary" (click)="generateIndex($event)" class="mb-1 mr-1 rounded-btn lightblue-btn">{{language.instant('MAINTENANCE-TASKS.SECTIONS.INDEXES.ACTIONS.GENERATE-INDEX')}}</button>
-						<button mat-raised-button color="primary" (click)="clearIndex($event)" class="mb-1 mr-1 rounded-btn lightblue-btn">{{language.instant('MAINTENANCE-TASKS.SECTIONS.INDEXES.ACTIONS.CLEAR-INDEX')}}</button>
+						<button mat-button color="primary" (click)="generateIndex($event)" class="mb-1 mr-1 rounded-btn lightblue-btn">{{language.instant('MAINTENANCE-TASKS.SECTIONS.INDEXES.ACTIONS.GENERATE-INDEX')}}</button>
+						<button mat-button color="primary" (click)="clearIndex($event)" class="mb-1 mr-1 rounded-btn lightblue-btn">{{language.instant('MAINTENANCE-TASKS.SECTIONS.INDEXES.ACTIONS.CLEAR-INDEX')}}</button>
 					</div>
 				</mat-expansion-panel>
 				<mat-expansion-panel>
diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
index 19f4c7b7c..c466d7ab9 100644
--- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
+++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
@@ -53,7 +53,7 @@
 													<div class="col-auto d-flex"><mat-icon [ngClass]="{'drag-handle-disabled': hideEditActions}" cdkDragHandle class="drag-handle">drag_indicator</mat-icon></div>
 
 													<div class="col-auto d-flex" *ngIf="!hideEditActions">
-														<button mat-icon-button class="action-list-icon" matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-SECTION' | translate}}" (click)="removeSection(sectionIndex)">
+														<button mat-icon-button matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-SECTION' | translate}}" (click)="removeSection(sectionIndex)">
 															<mat-icon>delete</mat-icon>
 														</button>
 													</div>
@@ -247,7 +247,7 @@
 																		<mat-icon *ngIf="isDescriptionTemplateSelected(descriptionTemplateIndex)" [ngClass]="{'drag-handle-disabled': hideEditActions}" cdkDragHandle class="drag-handle" style="margin-top: 0.9rem;">drag_indicator</mat-icon>
 																	</div>
 																	<div class="col-auto" *ngIf="!hideEditActions">
-																		<button mat-icon-button class="action-list-icon" matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-DESCRIPTION-TEMPLATE' | translate}}" (click)="removeDescriptionTemplate(sectionIndex, descriptionTemplateIndex)">
+																		<button mat-icon-button matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-DESCRIPTION-TEMPLATE' | translate}}" (click)="removeDescriptionTemplate(sectionIndex, descriptionTemplateIndex)">
 																			<mat-icon>delete</mat-icon>
 																		</button>
 																	</div>
@@ -297,7 +297,7 @@
 															<div class="col-12 col-xl-auto section-options-horizontal">
 																<div class="row">
 																	<div class="col-auto" *ngIf="!hideEditActions">
-																		<button mat-icon-button class="action-list-icon" matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-DESCRIPTION-TEMPLATE' | translate}}" (click)="removeDescriptionTemplate(sectionIndex, descriptionTemplateIndex)">
+																		<button mat-icon-button matTooltip="{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.REMOVE-DESCRIPTION-TEMPLATE' | translate}}" (click)="removeDescriptionTemplate(sectionIndex, descriptionTemplateIndex)">
 																			<mat-icon>delete</mat-icon>
 																		</button>
 																	</div>
diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.scss b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.scss
index 948baf217..e52566192 100644
--- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.scss
+++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.scss
@@ -67,22 +67,6 @@
 	transform: translateX(-50%);
 }
 
-.action-list-item{
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-  
-    .action-list-icon{
-      font-size: 1.2em;
-      color: var(--primary-color);
-    }
-    
-    .action-list-text{
-      font-size: 1em;
-	  color: var(--primary-color);
-    }
-}
-
 .field-delete{
   align-items: center;
 	display: flex;
diff --git a/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html b/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html
index 46c2ae36d..3b6763cb9 100644
--- a/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html
+++ b/frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html
@@ -85,19 +85,19 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/', row.id])">
 					<mat-icon>edit</mat-icon>{{'PLAN-BLUEPRINT-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
-				<button *ngIf="canCreateNewVersion(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/new-version/', row.id])">
+				</a>
+				<a *ngIf="canCreateNewVersion(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/new-version/', row.id])">
 					<mat-icon>queue</mat-icon>{{'PLAN-BLUEPRINT-LISTING.ACTIONS.NEW-VERSION' | translate}}
-				</button>
-				<button mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/clone/', row.id])">
+				</a>
+				<a mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/clone/', row.id])">
 					<mat-icon>content_copy</mat-icon>{{'PLAN-BLUEPRINT-LISTING.ACTIONS.CLONE' | translate}}
-				</button>
-				<button *ngIf="row.isActive == isActive.Active" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/versions/', row.groupId])">
+				</a>
+				<a *ngIf="row.isActive == isActive.Active" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-blueprints/versions/', row.groupId])">
 					<mat-icon>library_books</mat-icon>
 					{{'PLAN-BLUEPRINT-LISTING.ACTIONS.VIEW-VERSIONS' | translate}}
-				</button>
+				</a>
 				<button mat-menu-item (click)="export($event, row.id)" *ngIf="canDownloadXML(row)">
 					<mat-icon>download</mat-icon>{{'PLAN-BLUEPRINT-LISTING.ACTIONS.DOWNLOAD-XML' | translate}}
 				</button>
diff --git a/frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing.component.html b/frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing.component.html
index 0e709a45f..004000c49 100644
--- a/frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing.component.html
+++ b/frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing.component.html
@@ -53,9 +53,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button  *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-statuses/', row.id])"> 
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/plan-statuses/', row.id])"> 
 					<mat-icon>edit</mat-icon>{{'PLAN-STATUS-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="delete(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'PLAN-STATUS-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html b/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
index ea9749673..925a151db 100644
--- a/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
+++ b/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
@@ -70,7 +70,7 @@
 															<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}}</mat-card-title>
 														</div>
 														<div class="col-auto d-flex">
-															<button mat-icon-button class="action-list-icon" matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeFixedValueField(fieldIndex)" [disabled]="formGroup.disabled">
+															<button mat-icon-button matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeFixedValueField(fieldIndex)" [disabled]="formGroup.disabled">
 																<mat-icon>delete</mat-icon>
 															</button>
 														</div>
@@ -112,7 +112,7 @@
 											<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}}</mat-card-title>
 										</div>
 										<div class="col-auto d-flex">
-											<button mat-icon-button class="action-list-icon" matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
+											<button mat-icon-button matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
 												<mat-icon>delete</mat-icon>
 											</button>
 										</div>
diff --git a/frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html b/frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html
index 61dcac821..307c7321a 100644
--- a/frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html
+++ b/frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html
@@ -83,10 +83,10 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/prefilling-sources/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/prefilling-sources/', row.id])">
 					<mat-icon>edit</mat-icon>{{'PREFILLING-SOURCE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
-				<button *ngIf="canDelete(row)"  mat-menu-item (click)="deleteType(row.id)">
+				</a>
+				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'PREFILLING-SOURCE-LISTING.ACTIONS.DELETE' | translate}}
 				</button>
diff --git a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
index 6b1b33f2f..74270b0fb 100644
--- a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
+++ b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
@@ -117,7 +117,7 @@
 															</mat-form-field>
 														</div>
 														<div class="col-auto pb-3 d-flex">
-															<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.get('definition').get('fields').disabled">
+															<button mat-icon-button matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.get('definition').get('fields').disabled">
 																<mat-icon>delete</mat-icon>
 															</button>
 														</div>
@@ -144,7 +144,7 @@
 															<mat-card-title>{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} {{sourceIndex + 1}}</mat-card-title>
 														</div>
 														<div class="col-auto d-flex">
-															<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.get('definition').get('fields').disabled">
+															<button mat-icon-button matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.get('definition').get('fields').disabled">
 																<mat-icon>delete</mat-icon>
 															</button>
 														</div>
diff --git a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss
index 77591bcb1..cf8c26656 100644
--- a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss
+++ b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss
@@ -39,22 +39,6 @@
 	transform: translateX(-50%);
 }
 
-.action-list-item{
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-  
-    .action-list-icon{
-      font-size: 1.2em;
-      color: var(--primary-color);
-    }
-    
-    .action-list-text{
-      font-size: 1em;
-	  color: var(--primary-color);
-    }
-}
-
 .field-delete{
     align-items: center;
 	display: flex;
diff --git a/frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html b/frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
index 37272c224..87e9cbdc6 100644
--- a/frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
+++ b/frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
@@ -84,9 +84,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/reference-type/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/reference-type/', row.id])">
 					<mat-icon>edit</mat-icon>{{'REFERENCE-TYPE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'REFERENCE-TYPE-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html b/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
index bb288a0fc..494eebf23 100644
--- a/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
+++ b/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
@@ -129,7 +129,7 @@
 												</mat-form-field>
 											</div>
 											<div class="col-auto pb-3 d-flex">
-												<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
+												<button mat-icon-button matTooltip="{{'REFERENCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
 													<mat-icon>delete</mat-icon>
 												</button>
 											</div>
diff --git a/frontend/src/app/ui/admin/reference/listing/reference-listing.component.html b/frontend/src/app/ui/admin/reference/listing/reference-listing.component.html
index 0632a7c62..3d75e9fed 100644
--- a/frontend/src/app/ui/admin/reference/listing/reference-listing.component.html
+++ b/frontend/src/app/ui/admin/reference/listing/reference-listing.component.html
@@ -105,9 +105,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/references/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/references/', row.id])">
 					<mat-icon>edit</mat-icon>{{'REFERENCE-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'REFERENCE-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html
index 96e4d0694..997e2b38f 100644
--- a/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html
+++ b/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html
@@ -18,7 +18,7 @@
 								<mat-card-title>{{'TENANT-CONFIGURATION-EDITOR.FIELDS.DEPOSIT-PLUGINS' | translate}} {{sourceIndex + 1}}</mat-card-title>
 							</div>
 							<div class="col-auto d-flex">
-								<button mat-icon-button class="action-list-icon" matTooltip="{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
+								<button mat-icon-button matTooltip="{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
 									<mat-icon>delete</mat-icon>
 								</button>
 							</div>
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html
index dad1c387b..342e767a3 100644
--- a/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html
+++ b/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html
@@ -27,7 +27,7 @@
                             <mat-card-title>{{'WORKFLOW-EDITOR.FIELDS.STATUS-TRANSITION' | translate}} {{index + 1}}</mat-card-title>
                         </div>
                         <div class="col-auto d-flex">
-                            <button mat-icon-button class="action-list-icon" matTooltip="{{'WORKFLOW-EDITOR.ACTIONS.REMOVE-STATUS-TRANSITION' | translate}}" (click)="removeStatusTransition(index)" [disabled]="formGroup.disabled">
+                            <button mat-icon-button matTooltip="{{'WORKFLOW-EDITOR.ACTIONS.REMOVE-STATUS-TRANSITION' | translate}}" (click)="removeStatusTransition(index)" [disabled]="formGroup.disabled">
                                 <mat-icon>delete</mat-icon>
                             </button>
                         </div>
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html
index 608f0e314..1b2d89e70 100644
--- a/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html
+++ b/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html
@@ -9,7 +9,7 @@
 					<mat-error *ngIf=" formGroup.get('fileTransformerPlugins')?.get('disableSystemSources')?.hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</mat-checkbox>
 			</div>
-			<button  mat-button class="rounded-btn secondary" type="button" (click)="addSource()" [disabled]="formGroup.disabled">{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
+			<button mat-button class="rounded-btn secondary" type="button" (click)="addSource()" [disabled]="formGroup.disabled">{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
 			<div *ngFor="let source of formGroup.get('fileTransformerPlugins').get('sources').controls; let sourceIndex=index;" class="row mb-3">
 				<div class="col-12">
 						<div class="row mb-3 d-flex align-items-center">
@@ -17,7 +17,7 @@
 								<mat-card-title>{{'TENANT-CONFIGURATION-EDITOR.FIELDS.FILE-TRANSFORMER-PLUGINS' | translate}} {{sourceIndex + 1}}</mat-card-title>
 							</div>
 							<div class="col-auto d-flex">
-								<button mat-icon-button class="action-list-icon" matTooltip="{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
+								<button mat-icon-button matTooltip="{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
 									<mat-icon>delete</mat-icon>
 								</button>
 							</div>
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html
index 594607a0b..458fd70d2 100644
--- a/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html
+++ b/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html
@@ -27,7 +27,7 @@
                             <mat-card-title>{{'WORKFLOW-EDITOR.FIELDS.STATUS-TRANSITION' | translate}} {{index + 1}}</mat-card-title>
                         </div>
                         <div class="col-auto d-flex">
-                            <button mat-icon-button class="action-list-icon" matTooltip="{{'WORKFLOW-EDITOR.ACTIONS.REMOVE-STATUS-TRANSITION' | translate}}" (click)="removeStatusTransition(index)" [disabled]="formGroup.disabled">
+                            <button mat-icon-button matTooltip="{{'WORKFLOW-EDITOR.ACTIONS.REMOVE-STATUS-TRANSITION' | translate}}" (click)="removeStatusTransition(index)" [disabled]="formGroup.disabled">
                                 <mat-icon>delete</mat-icon>
                             </button>
                         </div>
diff --git a/frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html b/frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html
index 71ca3b62f..13b666668 100644
--- a/frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html
+++ b/frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html
@@ -84,9 +84,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/tenants/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/tenants/', row.id])">
 					<mat-icon>edit</mat-icon>{{'TENANT-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'TENANT-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/usage-limit/listing/usage-limit-listing.component.html b/frontend/src/app/ui/admin/usage-limit/listing/usage-limit-listing.component.html
index 8d61f1301..7c1dd0127 100644
--- a/frontend/src/app/ui/admin/usage-limit/listing/usage-limit-listing.component.html
+++ b/frontend/src/app/ui/admin/usage-limit/listing/usage-limit-listing.component.html
@@ -84,9 +84,9 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/usage-limits/', row.id])">
+				<a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/usage-limits/', row.id])">
 					<mat-icon>edit</mat-icon>{{'USAGE-LIMIT-LISTING.ACTIONS.EDIT' | translate}}
-				</button>
+				</a>
 				<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
 					<mat-icon>delete</mat-icon>
 					{{'USAGE-LIMIT-LISTING.ACTIONS.DELETE' | translate}}
diff --git a/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html b/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
index 5f706640e..3e19a08f6 100644
--- a/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
+++ b/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
@@ -37,14 +37,13 @@
 			</div>
 
 			<div *ngIf="!this.nowEditing" class="col-2 p-0">
-				<button mat-icon-button color="primary" type="button" (click)="editItem()">
-					<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.EDIT' | translate}}">edit</mat-icon>
-					<span class="row-action"></span>
+				<button mat-icon-button color="primary" type="button" (click)="editItem()" matTooltip="{{'USER-LISTING.ACTIONS.EDIT' | translate}}">
+					<mat-icon>edit</mat-icon>
 				</button>
 			</div>
 			<div *ngIf="this.nowEditing" class="col-2 p-0">
-				<button class="save-button" mat-icon-button color="primary" type="submit">
-					<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.SAVE' | translate}}">save</mat-icon>
+				<button mat-icon-button color="primary" type="submit" matTooltip="{{'USER-LISTING.ACTIONS.SAVE' | translate}}">
+					<mat-icon>save</mat-icon>
 				</button>
 			</div>
 		</div>
diff --git a/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss b/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
index aa35222a8..b71c301ce 100644
--- a/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
+++ b/frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
@@ -18,10 +18,6 @@
 		margin-right: 8px;
 	}
 
-	.row-action {
-		color: var(--primary-color);
-		cursor: pointer;
-	}
 	.user-role{
 		text-align: center;
 		width: auto;
@@ -150,10 +146,6 @@
 		padding-left: 10px;
 		padding-right: 10px;
 	}
-
-	.save-button {
-		margin-bottom: 1em;
-	}
 }
 
 :host ::ng-deep .mat-form-field-wrapper {