diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html
index 1e9fa8a8f..ffe03b0a4 100644
--- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html
@@ -35,11 +35,11 @@
 		<div class="col-12">
 			<div class="row actions-row">
 				<div class="col"></div>
-				<div class="col-auto" *ngIf="editorModel.id"><button mat-raised-button color="primary" (click)="delete()">
+				<div class="col-auto" *ngIf="editorModel.id"><button class="normal-btn" (click)="delete()">
 						{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.RESET-TO-DEFAULT' | translate}}
 					</button>
 				</div>
-				<div class="col-auto"><button mat-raised-button color="primary" (click)="formSubmit()">
+				<div class="col-auto"><button class="normal-btn" (click)="formSubmit()">
 						{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.SAVE' | translate}}
 					</button>
 				</div>
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
index b6dce98d4..f61dff138 100644
--- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
@@ -8,63 +8,72 @@
 				</div>
 			</div>
 
-			<mat-card appearance="outlined">
-				<mat-card-header>
-					<mat-card-title>{{'TENANT-CONFIGURATION-EDITOR.TITLE' | translate}}</mat-card-title>
-				</mat-card-header>
-				<mat-card-content>
-					<div class="row">
-						<mat-accordion class="col-12 headers-align">
-							<mat-expansion-panel>
-								<mat-expansion-panel-header>
-									<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.TITLE' | translate}}</mat-panel-title>
-									<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.HINT' | translate}}</mat-panel-description>
-								</mat-expansion-panel-header>
-								<ng-template matExpansionPanelContent>
-									<app-tenant-configuration-default-user-locale-editor></app-tenant-configuration-default-user-locale-editor>
-								</ng-template>
-							</mat-expansion-panel>
-							<mat-expansion-panel>
-								<mat-expansion-panel-header>
-									<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.CSS-COLORS.TITLE' | translate}}</mat-panel-title>
-									<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.CSS-COLORS.HINT' | translate}}</mat-panel-description>
-								</mat-expansion-panel-header>
-								<ng-template matExpansionPanelContent>
-									<app-tenant-configuration-css-colors-editor></app-tenant-configuration-css-colors-editor>
-								</ng-template>
-							</mat-expansion-panel>
-							<mat-expansion-panel>
-								<mat-expansion-panel-header>
-									<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.TITLE' | translate}}</mat-panel-title>
-									<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.HINT' | translate}}</mat-panel-description>
-								</mat-expansion-panel-header>
-								<ng-template matExpansionPanelContent>
-									<app-tenant-configuration-deposit-editor></app-tenant-configuration-deposit-editor>
-								</ng-template>
-							</mat-expansion-panel>
-							<mat-expansion-panel>
-								<mat-expansion-panel-header>
-									<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.FILE-TRANSFORMER-PLUGINS.TITLE' | translate}}</mat-panel-title>
-									<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.FILE-TRANSFORMER-PLUGINS.HINT' | translate}}</mat-panel-description>
-								</mat-expansion-panel-header>
-								<ng-template matExpansionPanelContent>
-									<app-tenant-configuration-file-transformer-editor></app-tenant-configuration-file-transformer-editor>
-								</ng-template>
-							</mat-expansion-panel>
-							<mat-expansion-panel>
-								<mat-expansion-panel-header>
-									<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.LOGO.TITLE' | translate}}</mat-panel-title>
-									<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.LOGO.HINT' | translate}}</mat-panel-description>
-								</mat-expansion-panel-header>
-								<ng-template matExpansionPanelContent>
-									<app-tenant-configuration-logo-editor></app-tenant-configuration-logo-editor>
-								</ng-template>
-							</mat-expansion-panel>
+			<div class="row">
+				<div class="col-12">	
+					<mat-card appearance="outlined">
+						<mat-card-header>
+							<mat-card-title>{{'TENANT-CONFIGURATION-EDITOR.TITLE' | translate}}</mat-card-title>
+						</mat-card-header>
+						<mat-card-content>
+							<div class="row mt-3">
+								<div class="col-12">
+									<mat-accordion class="headers-align">
+										<mat-expansion-panel>
+											<mat-expansion-panel-header>
+												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.TITLE' | translate}}</mat-panel-title>
+												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.HINT' | translate}}</mat-panel-description>
+											</mat-expansion-panel-header>
+											<ng-template matExpansionPanelContent>
+												<div class="mt-3">
+													<app-tenant-configuration-default-user-locale-editor></app-tenant-configuration-default-user-locale-editor>
+												</div>
+											</ng-template>
+										</mat-expansion-panel>
+										<mat-expansion-panel>
+											<mat-expansion-panel-header>
+												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.CSS-COLORS.TITLE' | translate}}</mat-panel-title>
+												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.CSS-COLORS.HINT' | translate}}</mat-panel-description>
+											</mat-expansion-panel-header>
+											<ng-template matExpansionPanelContent>
+												<app-tenant-configuration-css-colors-editor></app-tenant-configuration-css-colors-editor>
+											</ng-template>
+										</mat-expansion-panel>
 
-						</mat-accordion>
-					</div>
-				</mat-card-content>
-			</mat-card>
+										<mat-expansion-panel>
+											<mat-expansion-panel-header>
+												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.TITLE' | translate}}</mat-panel-title>
+												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.HINT' | translate}}</mat-panel-description>
+											</mat-expansion-panel-header>
+											<ng-template matExpansionPanelContent>
+												<app-tenant-configuration-deposit-editor></app-tenant-configuration-deposit-editor>
+											</ng-template>
+										</mat-expansion-panel>
+										<mat-expansion-panel>
+											<mat-expansion-panel-header>
+												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.FILE-TRANSFORMER-PLUGINS.TITLE' | translate}}</mat-panel-title>
+												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.FILE-TRANSFORMER-PLUGINS.HINT' | translate}}</mat-panel-description>
+											</mat-expansion-panel-header>
+											<ng-template matExpansionPanelContent>
+												<app-tenant-configuration-file-transformer-editor></app-tenant-configuration-file-transformer-editor>
+											</ng-template>
+										</mat-expansion-panel>
+										<mat-expansion-panel>
+											<mat-expansion-panel-header>
+												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.LOGO.TITLE' | translate}}</mat-panel-title>
+												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.LOGO.HINT' | translate}}</mat-panel-description>
+											</mat-expansion-panel-header>
+											<ng-template matExpansionPanelContent>
+												<app-tenant-configuration-logo-editor></app-tenant-configuration-logo-editor>
+											</ng-template>
+										</mat-expansion-panel>
+
+									</mat-accordion>
+								</div>
+							</div>
+						</mat-card-content>
+					</mat-card>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>