diff --git a/src/frontend/app/header/header-panel.component.html b/src/frontend/app/header/header-panel.component.html
index 1d7467cdbc77c737298ce973f0b7fc5cfe5f3c4a..073106ce27e323e27199de59fb5cd2272c635c2c 100644
--- a/src/frontend/app/header/header-panel.component.html
+++ b/src/frontend/app/header/header-panel.component.html
@@ -1,11 +1,11 @@
 <div class="panelHeader">
-    <div *ngIf="showBackHome" class="panelHeader-backHome">
-        <button mat-button style="padding-top: 5px;padding-bottom: 5px;" (click)="gotToHome()">
-            <i class="fa fa-home" style="height: auto"></i>&nbsp;
-            <span>{{lang.backHome}}</span>
+    <div *ngIf="navButton !== null" class="panelHeader-backHome">
+        <button mat-button style="padding-top: 5px;padding-bottom: 5px;" (click)="gotTo()">
+            <i class="{{navButton.icon}}" style="height: auto"></i>&nbsp;
+            <span>{{navButton.label}}</span>
         </button>   
     </div>
-    <div class="panelHeader-logo" [class.text-center]="showBackHome">
+    <div class="panelHeader-logo" [class.text-center]="navButton !== null">
         <a href="#" title="{{lang.home}}" style="margin-right: 30px;">
             <mat-icon class="maarchLogo" svgIcon="maarchLogoFull"></mat-icon>
         </a>
diff --git a/src/frontend/app/header/header-panel.component.ts b/src/frontend/app/header/header-panel.component.ts
index e0c3277340904201ed0f8156757220586c9aa0bb..6b9658d6a55e5717cd1de0fd3dafe40f77a7aa95 100644
--- a/src/frontend/app/header/header-panel.component.ts
+++ b/src/frontend/app/header/header-panel.component.ts
@@ -19,7 +19,7 @@ export class HeaderPanelComponent implements OnInit {
     config      : any       = {};
 
 
-    @Input('showBackHome') showBackHome: boolean = false;
+    @Input('navButton') navButton: any = null;
     @Input('snavLeft') snavLeft: MatSidenav;
     
     constructor(
@@ -30,7 +30,7 @@ export class HeaderPanelComponent implements OnInit {
 
     ngOnInit(): void { }
 
-    gotToHome() {
-        this.router.navigate(['/home']);
+    gotTo() {
+        this.router.navigate([this.navButton.route]);
     }
 }
\ No newline at end of file
diff --git a/src/frontend/app/indexation/indexation.component.html b/src/frontend/app/indexation/indexation.component.html
index dfb3166843df2a980fd6bb1be767e7eb258ed827..563d68c1ff33e28b9ee3936d5d738dc10e5c573f 100644
--- a/src/frontend/app/indexation/indexation.component.html
+++ b/src/frontend/app/indexation/indexation.component.html
@@ -2,7 +2,7 @@
     <mat-sidenav #snavLeft class="panel-left" #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
         [fixedInViewport]="appService.getViewMode()" [opened]="appService.getViewMode() ? false : true"
         autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': appService.getViewMode() ? '95%' : '600px'}">
-        <header-panel [snavLeft]="snav" [showBackHome]="true"></header-panel>
+        <header-panel [snavLeft]="snav" [navButton]="{icon: 'fa fa-home', label: lang.backHome, route : '/home'}"></header-panel>
         <ng-container *ngIf="indexingModels.length > 0">
             <div class="listModels">
                 <button mat-button class="button-form-primary listModels-button"
@@ -93,7 +93,7 @@
         </div>
         <div class="document-container" [class.fullContainer]="appService.getViewMode()">
             <div class="content">
-                <app-document-viewer #appDocumentViewer [tmpFilename]="tmpFilename" style="height:100%;width:100%;">
+                <app-document-viewer #appDocumentViewer [editMode]="true" [tmpFilename]="tmpFilename" style="height:100%;width:100%;">
                 </app-document-viewer>
             </div>
         </div>
diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html
index 0020d023a639ac8a93d3bcbb2f7f574db02967f7..1445ae2455e84a9679595a8c34ec99aad281b2a1 100644
--- a/src/frontend/app/process/process.component.html
+++ b/src/frontend/app/process/process.component.html
@@ -2,7 +2,7 @@
     <mat-sidenav #snavLeft class="panel-left" #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
         [fixedInViewport]="appService.getViewMode()" [opened]="appService.getViewMode() ? false : true"
         autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': appService.getViewMode() ? '95%' : '600px'}">
-        <header-panel [snavLeft]="snav" [showBackHome]="true"></header-panel>
+        <header-panel [snavLeft]="snav" [navButton]="{icon: 'fa fa-inbox', label: lang.backBasket, route : '/basketList/users/'+currentUserId+'/groups/'+currentGroupId+'/baskets/'+currentBasketId}"></header-panel>
         <div class="listModels">
             <div class="processTool">
                 <div class="processTool-module jiggle" *ngFor="let module of processTool"
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 9bff904b7b72b8cfd3632c985d09d1e93b55ea17..78d5a7eb4becdbad1c22e7b17b2372044f9a7f93 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1246,4 +1246,5 @@ export const LANG_EN = {
     "chooseFile" : "Choose a file",
     "or" : "or",
     "dragAndDrop" : "Drag and drop",
+    "backBasket" : "Back to basket",
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index de99732d96b7324e5fb5c52b766cba5dbc5b60e7..eb394ae466ec61fdc89c41963a0466e96c4444d1 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1283,4 +1283,5 @@ export const LANG_FR = {
     "chooseFile" : "Choisissez un fichier",
     "or" : "ou",
     "dragAndDrop" : "Glisser-déposer",
+    "backBasket" : "Retour bannette",
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 8609321d9269459a56a974d12c57312edceab6f0..2e81ffad91decc69398d3991e8271da1e98e05ab 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1271,4 +1271,5 @@ export const LANG_NL = {
     "chooseFile" : "Choose a file", //_TO_TRANSLATE
     "or" : "or", //_TO_TRANSLATE
     "dragAndDrop" : "Drag and drop", //_TO_TRANSLATE
+    "backBasket" : "Back to basket", //_TO_TRANSLATE
 };