diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index c63b00497..e178cd073 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -12,28 +12,31 @@
 						<p class="col dataset-label p-0 ml-3 mb-0">{{ dataset.label }}</p>
 					</div>
 					<div class="row d-flex align-items-center mt-3 mb-4 label-txt">
-						<div *ngIf="isUserDatasetRelated()" class="d-flex mr-2">
+						<div *ngIf="isUserDatasetRelated()" class="d-flex">
 							<p class="ml-0 mb-0 label2-txt">
 								{{ roleDisplayFromList(dataset.users) }}
 							</p>
 						</div>
-						<span *ngIf="isUserDatasetRelated()" class="mr-2">.</span>
-						<div class="d-flex mr-2">
-							<div *ngIf="dataset.public" class="d-flex flex-row">
-								<mat-icon class="status-icon">public</mat-icon>
-								{{'DMP-OVERVIEW.PUBLIC' | translate}}
-							</div>
-							<div *ngIf="!dataset.public" class="d-flex flex-row">
-								<mat-icon class="status-icon">public_off</mat-icon>
-								{{'DMP-OVERVIEW.PRIVATE' | translate}}
-							</div>
+						<span *ngIf="isUserDatasetRelated()" class="ml-2 mr-2">.</span>
+						<!-- UNCOMMENT TO ADD PRIVATE ICON -->
+						<!-- <span *ngIf="isUserDatasetRelated() && (dataset.public || !dataset.public || lockStatus)" class="ml-2 mr-2">.</span> -->
+						<div *ngIf="dataset.public" class="d-flex flex-row">
+							<mat-icon class="status-icon">public</mat-icon>
+							{{'DMP-OVERVIEW.PUBLIC' | translate}}
 						</div>
-						<span>.</span>
-						<div *ngIf="lockStatus" class="d-flex flex-row ml-2 mr-2">
+						<span *ngIf="dataset.public" class="ml-2 mr-2">.</span>
+						<!-- UNCOMMENT TO ADD PRIVATE ICON -->
+						<!-- <div *ngIf="!dataset.public" class="d-flex flex-row">
+							<mat-icon class="status-icon">public_off</mat-icon>
+							{{'DMP-OVERVIEW.PRIVATE' | translate}}
+						</div>
+						<span *ngIf="!dataset.public" class="ml-2 mr-2">.</span> -->
+						<div *ngIf="lockStatus" class="d-flex flex-row">
 							<mat-icon class="status-icon">lock_outline</mat-icon>
 							{{'DMP-OVERVIEW.LOCKED' | translate}}
 						</div>
-						<div class="d-flex ml-2 mr-2">{{'GENERAL.STATUSES.EDIT' | translate}} :
+						<span *ngIf="lockStatus" class="ml-2 mr-2">.</span>
+						<div class="d-flex mr-2">{{'GENERAL.STATUSES.EDIT' | translate}} :
 							{{dataset.modified | date:"longDate"}}
 						</div>
 						<div class="d-flex ml-2 mr-4">
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index fb3457e6d..7ffe466cd 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -13,28 +13,28 @@
 					</div>
 					<div class="row d-flex align-items-center mt-3 mb-4 label-txt">
 						<div *ngIf="isUserDMPRelated()" class="d-flex">
-							<p class="ml-0 mr-2 mb-0 label2-txt">
+							<p class="ml-0 mb-0 label2-txt">
 								{{ roleDisplayFromList(dmp.users) }}</p>
 						</div>
-						<span *ngIf="isUserDMPRelated()" class="mr-2">.</span>
-						<div class="d-flex mr-2">
-							<div *ngIf="dmp.isPublic" class="d-flex flex-row">
-								<mat-icon class="status-icon">public</mat-icon>
-								{{'DMP-OVERVIEW.PUBLIC' | translate}}
-							</div>
-							<div *ngIf="!dmp.isPublic" class="d-flex flex-row">
-								<mat-icon class="status-icon">public_off</mat-icon>
-								{{'DMP-OVERVIEW.PRIVATE' | translate}}
-							</div>
+						<span *ngIf="isUserDMPRelated() && (dmp.isPublic || lockStatus)" class="ml-2 mr-2">.</span>
+						<!-- UNCOMMENT TO ADD PRIVATE ICON -->
+						<!-- <span *ngIf="isUserDMPRelated() && (dmp.isPublic || !dmp.isPublic || lockStatus)" class="ml-2 mr-2">.</span> -->
+						<div *ngIf="dmp.isPublic" class="d-flex flex-row">
+							<mat-icon class="status-icon">public</mat-icon>
+							{{'DMP-OVERVIEW.PUBLIC' | translate}}
 						</div>
-						
-						<div *ngIf="lockStatus" class="d-flex flex-row mr-2">
-							<span>.</span>
-							<mat-icon class="status-icon ml-2">lock_outline</mat-icon>
+						<span *ngIf="dmp.isPublic && lockStatus" class="ml-2 mr-2">.</span>
+						<!-- UNCOMMENT TO ADD PRIVATE ICON -->
+						<!-- <div *ngIf="!dmp.isPublic" class="d-flex flex-row">
+							<mat-icon class="status-icon">public_off</mat-icon>
+							{{'DMP-OVERVIEW.PRIVATE' | translate}}
+						</div>
+						<span *ngIf="!dmp.isPublic && lockStatus" class="ml-2 mr-2">.</span> -->
+						<div *ngIf="lockStatus" class="d-flex flex-row">
+							<mat-icon class="status-icon">lock_outline</mat-icon>
 							{{'DMP-OVERVIEW.LOCKED' | translate}}
 						</div>
-						<span>.</span>
-						<mat-form-field appearance="outline" class="versions-select ml-2 mr-4">
+						<mat-form-field appearance="outline" class="versions-select ml-3 mr-3">
 							<mat-select placeholder="{{'DMP-LISTING.VERSION' | translate}} {{dmp.version}}"
 								[(ngModel)]="version" (ngModelChange)="versionChanged(version.id)">
 								<mat-option *ngFor="let version of versions" [value]="version">