diff --git a/src/app/features/invoice/invoice-page/invoice-page.component.html b/src/app/features/invoice/invoice-page/invoice-page.component.html
index 82dac47..804ecaa 100644
--- a/src/app/features/invoice/invoice-page/invoice-page.component.html
+++ b/src/app/features/invoice/invoice-page/invoice-page.component.html
@@ -13,12 +13,10 @@ <h4 [class.pt-3]="!fullScreen">{{ title }}</h4>
     <a ngbNavLink routerLink="/invoice/unprocessed">Unprocessed</a>
     <ng-template ngbNavContent>
       <div [class.fullscreen]="fullScreen" [class.p-3]="fullScreen">
-        <ng-component
-          [ngTemplateOutlet]="fullScreenTemplate"
-          [ngTemplateOutletContext]="{ title: 'Unprocessed' }"
-        ></ng-component>
-        <div class="d-block">
-          <app-invoice-table-result [archived]="false"></app-invoice-table-result>
+        <ng-component [ngTemplateOutlet]="fullScreenTemplate"
+          [ngTemplateOutletContext]="{ title: 'Unprocessed' }"></ng-component>
+        <div class="d-block" *ngIf="user">
+          <app-invoice-table-result [user]="user" [archived]="false"></app-invoice-table-result>
         </div>
       </div>
     </ng-template>
@@ -27,24 +25,20 @@ <h4 [class.pt-3]="!fullScreen">{{ title }}</h4>
     <a ngbNavLink routerLink="/invoice/processed">Processed</a>
     <ng-template ngbNavContent>
       <div [class.fullscreen]="fullScreen" [class.p-3]="fullScreen">
-        <ng-component
-          [ngTemplateOutlet]="fullScreenTemplate"
-          [ngTemplateOutletContext]="{ title: 'Processed' }"
-        ></ng-component>
-        <div class="d-block">
-          <app-invoice-table-result [archived]="true"></app-invoice-table-result>
+        <ng-component [ngTemplateOutlet]="fullScreenTemplate"
+          [ngTemplateOutletContext]="{ title: 'Processed' }"></ng-component>
+        <div class="d-block" *ngIf="user">
+          <app-invoice-table-result [user]="user" [archived]="true"></app-invoice-table-result>
         </div>
       </div>
     </ng-template>
   </li>
-  <li ngbNavItem="deleted-logically">
+  <li ngbNavItem="deleted-logically" *ngIf="user && hasRoleAdmin">
     <a ngbNavLink routerLink="/invoice/deleted-logically">Deleted</a>
     <ng-template ngbNavContent>
       <div [class.fullscreen]="fullScreen" [class.p-3]="fullScreen">
-        <ng-component
-          [ngTemplateOutlet]="fullScreenTemplate"
-          [ngTemplateOutletContext]="{ title: 'Deleted Logically' }"
-        ></ng-component>
+        <ng-component [ngTemplateOutlet]="fullScreenTemplate"
+          [ngTemplateOutletContext]="{ title: 'Deleted Logically' }"></ng-component>
         <div class="d-block">
           <app-invoice-table-result [logicalDelete]="true"></app-invoice-table-result>
         </div>
diff --git a/src/app/features/invoice/invoice-page/invoice-page.component.ts b/src/app/features/invoice/invoice-page/invoice-page.component.ts
index c777c68..df6da3d 100644
--- a/src/app/features/invoice/invoice-page/invoice-page.component.ts
+++ b/src/app/features/invoice/invoice-page/invoice-page.component.ts
@@ -2,6 +2,8 @@ import { Component, HostListener, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Title } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { User } from '@core/models/user';
+import { PersonalInfoService } from '@core/service/personal.info.service';
 
 @Component({
   selector: 'app-invoice-page',
@@ -11,17 +13,26 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 export class InvoicePageComponent implements OnInit {
   activeId: string;
   fullScreen: boolean;
-
+  user: User;
+  get hasRoleAdmin(): boolean {
+    return this.user.authorities.includes('ADMIN');
+  }
   @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) {
     if (!this.modalService.hasOpenModals()) {
       this.fullScreen = false;
     }
   }
 
-  constructor(public route: ActivatedRoute, private modalService: NgbModal, private titleService: Title) {}
+  constructor(
+    public route: ActivatedRoute,
+    private modalService: NgbModal,
+    private titleService: Title,
+    private personalInfoService: PersonalInfoService,
+  ) { }
 
   ngOnInit(): void {
     this.titleService.setTitle('Invoices');
     this.activeId = this.route.snapshot.params.name || 'unprocessed';
+    this.personalInfoService.me().subscribe((u) => (this.user = u));
   }
 }
diff --git a/src/app/features/invoice/invoice-table-result/invoice-table-result.component.html b/src/app/features/invoice/invoice-table-result/invoice-table-result.component.html
index 4788a5f..8bb9b42 100644
--- a/src/app/features/invoice/invoice-table-result/invoice-table-result.component.html
+++ b/src/app/features/invoice/invoice-table-result/invoice-table-result.component.html
@@ -5,7 +5,7 @@
   <p class="" *ngIf="!logicalDelete">
     <span class="text-secondary" *ngIf="activeDossier && !archived">Dossier: {{ activeDossier?.name }} </span>
   </p>
-  <div *ngIf="!logicalDelete" ngbDropdown class="d-inline-block mt-0" container="body">
+  <div *ngIf="!logicalDelete && hasRoleAdmin" ngbDropdown class="d-inline-block mt-0" container="body">
     <button class="btn btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>
       <fa-icon icon="exclamation"></fa-icon>&nbsp;Actions
     </button>
@@ -93,7 +93,7 @@
               <span>{{ invoice.newInvoiceNumber || invoice.invoiceNumber }}</span>
               <ng-container *ngIf="invoice.imported">
                 <ng-template #infoFrontend>
-                  Imported on {{ invoice.importedDate | date : 'dd/MM/yyyy HH:mm' }}
+                  Imported on {{ invoice.importedDate | date: 'dd/MM/yyyy HH:mm' }}
                 </ng-template>
                 <button (click)="$event.stopPropagation()" type="button"
                   class="ps-0 ms-0 mt-0 pt-0 mb-0 pb-0 me-0 pe-0 btn btn-link text-dark" [ngbTooltip]="infoFrontend"
@@ -103,13 +103,13 @@
               </ng-container>
             </div>
           </td>
-          <td class="fit d-md-table-cell d-none">{{ invoice.dateCreation | date : 'dd/MM/yyyy' }}</td>
+          <td class="fit d-md-table-cell d-none">{{ invoice.dateCreation | date: 'dd/MM/yyyy' }}</td>
           <td class="fit d-md-table-cell">{{ invoice.billTo.clientName }}</td>
-          <td class="fit d-md-table-cell">{{ invoice.dateOfInvoice | date : 'dd/MM/yyyy' }}</td>
-          <td class="d-md-table-cell text-primary d-none">{{ invoice.dueDate | date : 'dd/MM/yyyy' }}</td>
-          <td class="d-md-table-cell d-none">{{ invoice.subTotal | currency : '€' }}</td>
-          <td class="d-md-table-cell d-none">{{ invoice.taxes | currency : '€' }}</td>
-          <td class="d-md-table-cell d-none text-danger">{{ invoice.total | currency : '€' }}</td>
+          <td class="fit d-md-table-cell">{{ invoice.dateOfInvoice | date: 'dd/MM/yyyy' }}</td>
+          <td class="d-md-table-cell text-primary d-none">{{ invoice.dueDate | date: 'dd/MM/yyyy' }}</td>
+          <td class="d-md-table-cell d-none">{{ invoice.subTotal | currency: '€' }}</td>
+          <td class="d-md-table-cell d-none">{{ invoice.taxes | currency: '€' }}</td>
+          <td class="d-md-table-cell d-none text-danger">{{ invoice.total | currency: '€' }}</td>
           <td class="text-center fit">
             <div ngbDropdown class="d-inline-block" container="body">
               <button class="btn btn-outline-secondary" id="dropdownBasic2" ngbDropdownToggle
@@ -118,28 +118,29 @@
                 <button [disabled]="!invoice.invoiceUploadId" ngbDropdownItem (click)="download(invoice)">
                   <fa-icon [icon]="['fas', 'download']"></fa-icon>&nbsp;Download
                 </button>
-                <button [disabled]="!invoice.timesheetId" ngbDropdownItem
-                  [routerLink]="['/timesheets/timesheet/'+invoice.timesheetId]">
+                <button [disabled]="!invoice.timesheetId" *ngIf="hasRoleAdmin" ngbDropdownItem
+                  [routerLink]="['/timesheets/timesheet/' + invoice.timesheetId]">
                   <fa-icon [icon]="['fas', 'clock']"></fa-icon>&nbsp;Timesheet
                 </button>
-                <button [disabled]="!invoice.invoiceUploadId" ngbDropdownItem (click)="sendMail(invoice)">
+                <button [disabled]="!invoice.invoiceUploadId" *ngIf="hasRoleAdmin" ngbDropdownItem
+                  (click)="sendMail(invoice)">
                   <fa-icon [icon]="['fas', 'mail-bulk']"></fa-icon>&nbsp;Send
                 </button>
                 <button ngbDropdownItem (click)="openModal(invoice)">
                   <fa-icon [icon]="['fas', 'eye']"></fa-icon>&nbsp;Open
                 </button>
-                <button *ngIf="activeDossier && !invoice.archived && !invoice.logicalDelete" ngbDropdownItem
-                  (click)="process(invoice)">
+                <button *ngIf="hasRoleAdmin && activeDossier && !invoice.archived && !invoice.logicalDelete"
+                  ngbDropdownItem (click)="process(invoice)">
                   <fa-icon [icon]="['fas', 'cog']"></fa-icon>&nbsp;Process
                 </button>
-                <button ngbDropdownItem (click)="newInvoiceFromTemplate(invoice)">
+                <button *ngIf="hasRoleAdmin" ngbDropdownItem (click)="newInvoiceFromTemplate(invoice)">
                   <fa-icon [icon]="['fas', 'plus']"></fa-icon>&nbsp;From Template
                 </button>
-                <button *ngIf="!invoice.archived && invoices?.content?.length == 1" ngbDropdownItem
+                <button *ngIf="hasRoleAdmin && !invoice.archived && invoices?.content?.length == 1" ngbDropdownItem
                   (click)="delete(invoice)">
                   <fa-icon [icon]="['fas', 'trash']"></fa-icon>&nbsp;Delete
                 </button>
-                <button *ngIf="invoice.logicalDelete" ngbDropdownItem (click)="restore(invoice)">
+                <button *ngIf="hasRoleAdmin && invoice.logicalDelete" ngbDropdownItem (click)="restore(invoice)">
                   <fa-icon [icon]="['fas', 'trash-restore']"></fa-icon>&nbsp;Restore
                 </button>
                 <button ngbDropdownItem [disabled]="!invoice.invoiceUploadId" (click)="openPdfViewer(invoice)">
diff --git a/src/app/features/invoice/invoice-table-result/invoice-table-result.component.ts b/src/app/features/invoice/invoice-table-result/invoice-table-result.component.ts
index a8ce621..0d14a5c 100644
--- a/src/app/features/invoice/invoice-table-result/invoice-table-result.component.ts
+++ b/src/app/features/invoice/invoice-table-result/invoice-table-result.component.ts
@@ -22,6 +22,7 @@ import { SortCriteria, Direction } from '@core/models/page';
 import { MailFormComponent } from '@shared/mail-form/mail-form.component';
 import { MailService } from '@core/service/mail.service';
 import { MailContextType, MailRequest } from '@core/models/mail';
+import { User } from '@core/models/user';
 @Component({
   selector: 'app-invoice-table-result',
   templateUrl: './invoice-table-result.component.html',
@@ -40,6 +41,11 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   @Input()
   logicalDelete: boolean;
   @Input()
+  user: User;
+  get hasRoleAdmin(): boolean {
+    return this.user.authorities.includes('ADMIN');
+  }
+  @Input()
   archived: boolean;
 
   clients: BillableClient[];
@@ -78,6 +84,9 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   }
 
   async sendMail(invoice: Invoice) {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     const upload = await firstValueFrom(this.fileService.findById(invoice.invoiceUploadId));
     const context: Map<string, MailContextType> = new Map();
     context.set('Invoice Ref', invoice.invoiceNumber);
@@ -122,14 +131,23 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   }
 
   newInvoiceFromTemplate(invoice: Invoice) {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     this.invoiceService.newInvoiceFromTemplate(invoice).subscribe((data) => this.openModal(data));
   }
 
   newInvoice() {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     this.invoiceService.newInvoice().subscribe((data) => this.openModal(data));
   }
 
   delete(invoice: Invoice) {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     if (isPlatformBrowser(this.platformId)) {
       let areYouSureYouWantToDeleteTheInvoice = `Are you sure you want to delete the invoice (${this.logicalDelete ? 'REALLY' : 'logically'
         }) ?`;
@@ -143,6 +161,9 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   }
 
   restore(invoice: Invoice) {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     if (isPlatformBrowser(this.platformId)) {
       let areYouSureYouWantToDeleteTheInvoice = `Are you sure you want to restore this invoice?`;
       let resp = this.windowRefService.nativeWindow.confirm(areYouSureYouWantToDeleteTheInvoice);
@@ -155,6 +176,9 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   }
 
   process(invoice: Invoice) {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     if (isPlatformBrowser(this.platformId)) {
       if (this.windowRefService.nativeWindow.confirm('Process this invoice?')) {
         this.dossierService.processInvoice(invoice.id).subscribe((dt) => {
@@ -192,6 +216,9 @@ export class InvoiceTableResultComponent implements OnInit, OnApplicationEvent {
   }
 
   templateModal() {
+    if (!this.hasRoleAdmin) {
+      return;
+    }
     this.invoiceService.listTemplates().subscribe((templates) => {
       const ngbModalRef = this.modalService.open(TemplateComponent, {
         size: 'lg',