diff --git a/src/frontend/app/indexation/indexation.component.html b/src/frontend/app/indexation/indexation.component.html
index 5fb49b0b299b4bade8111d516ae33894d608eb61..f0e4ea2605865730c6529d718efbe20d36b7751a 100644
--- a/src/frontend/app/indexation/indexation.component.html
+++ b/src/frontend/app/indexation/indexation.component.html
@@ -8,19 +8,18 @@
                 <button mat-button class="button-form-primary" [matMenuTriggerFor]="IndexingModelsMenu"
                     style="flex:1;margin-right:20px;">
                     <span class="menu-label">
-                        {{currentIndexingModel.label}} {{currentIndexingModel.default ? '(par défaut)': ''}}
+                        {{currentIndexingModel.label}} {{currentIndexingModel.default ? '(' + lang.default + ')': ''}}
                     </span>
                     <i class="fa fa-chevron-down menu-icon"></i></button>
                 <mat-menu #IndexingModelsMenu="matMenu" [class]="'menuForm'">
                     <ng-container *ngFor="let indexingModel of indexingModels">
                         <button *ngIf="indexingModel.id !== currentIndexingModel.id" mat-menu-item
                             (click)="loadIndexingModel(indexingModel)">{{indexingModel.label}}
-                            {{indexingModel.default ? '(par défaut)': ''}}</button>
+                            {{indexingModel.default ? '(' + lang.default + ')': ''}}</button>
                     </ng-container>
                 </mat-menu>
                 <button mat-button *ngIf="!appService.getViewMode()" class="button-form-primary"
-                    style="flex:1;align-items: center;justify-content: center;text-align: center;display: flex;">Enregistrer
-                    comme modèle</button>
+                    style="flex:1;align-items: center;justify-content: center;text-align: center;display: flex;">{{lang.saveAsModel}}</button>
                 <button mat-icon-button *ngIf="appService.getViewMode()" class="button-form-primary"
                     (click)="onSubmit()">
                     <mat-icon class="far fa-edit"></mat-icon>
@@ -38,22 +37,19 @@
                     </span>
                     <i class="fa fa-chevron-down menu-icon"></i></button>
                 <mat-menu #menu="matMenu" [class]="'menuForm'">
-                    <button mat-menu-item>Item 1</button>
-                    <button mat-menu-item>Item 2</button>
+                    <button mat-menu-item>Action 2</button>
+                    <button mat-menu-item>Action 3</button>
                 </mat-menu>
                 <button mat-button *ngIf="!appService.getViewMode()" class="button-form-primary"
                     style="width: 150px;align-items: center;justify-content: center;text-align: center;display: flex;"
-                    (click)="onSubmit()">Valider</button>
+                    (click)="onSubmit()">{{lang.validate}}</button>
                 <button mat-icon-button *ngIf="appService.getViewMode()" class="button-form-primary"
                     (click)="onSubmit()">
                     <mat-icon class="fa fa-check"></mat-icon>
                 </button>
             </div>
         </ng-container>
-        <div *ngIf="indexingModels.length === 0" class="emptyModel">
-            Aucun modèle d'enregistrement disponible<br /><br />
-            <small>Veuillez créer un modèle depuis Administation > Modèle d'enregistrement</small>
-        </div>
+        <div *ngIf="indexingModels.length === 0" class="emptyModel" [innerHTML]="lang.noAvailableIndexingModel"></div>
     </mat-sidenav>
     <mat-sidenav-content>
         <div class="bg-head">
@@ -79,8 +75,8 @@
                         <i class="fa fa-chevron-down menu-icon"></i>
                     </button>
                     <mat-menu #menu="matMenu" [class]="'menuForm'">
-                        <button mat-menu-item>Item 1</button>
-                        <button mat-menu-item>Item 2</button>
+                        <button mat-menu-item>Modèle 1</button>
+                        <button mat-menu-item>Modèle 2</button>
                     </mat-menu>
                     <button mat-button class="button-form-primary"
                         style="align-items: center;justify-content: center;text-align: center;display: flex;">Choisissez
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
index bcf761a78f43a9137dbe87c12a195310e731f014..c3e4c8a64f3d3454785ad1b09089fd93680980bd 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
@@ -3,7 +3,7 @@
 </div>
 <ng-container *ngIf="!loading">
     <div *ngIf="!adminMode" style="display: flex;align-items: center;justify-content: flex-end;margin-top: 10px;margin-bottom: -20px;">
-        <button mat-button class="categoryLabel" (click)="toggleMailTracking()" matTooltip="Activer le suivi de courrier">
+        <button mat-button class="categoryLabel" (click)="toggleMailTracking()" [title]="arrFormControl['mail­tracking'].value ? lang.untrackThisMail : lang.trackThisMail">
             {{lang[currentCategory]}}
             <mat-icon color="primary" class="{{this.arrFormControl['mail­tracking'].value ? 'fas':'far'}} fa-star" style="font-size: 20px;"></mat-icon>
         </button>
@@ -23,8 +23,8 @@
                     <ng-container *ngFor="let field of this['indexingModels_'+category];let i=index">
                         <div class="fieldRow" *ngIf="field.unit === category" cdkDrag cdkDragLockAxis="y"
                             [cdkDragData]="field">
-                            <div class="fieldLabel" *ngIf="!adminMode && !appService.getViewMode()">
-                                <i *ngIf="adminMode" class="fas fa-bars fa-2x" color="primary" style="cursor: move"
+                            <div class="fieldLabel" *ngIf="(!adminMode && !appService.getViewMode()) || adminMode">
+                                <i *ngIf="adminMode" [title]="lang.move" class="fas fa-bars fa-2x" color="primary" style="cursor: move"
                                     cdkDragHandle></i>&nbsp;
                                 {{field.label}}
                                 <button *ngIf="adminMode && !field.system" mat-icon-button
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index 4917d7b1b6bde57c815489f4699a485cc142aa56..661d08f4c2e53c400de06b75d2102d96b1ff1aa6 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -198,7 +198,6 @@ export class IndexingFormComponent implements OnInit {
                     });
                     this.initElemForm();
                 }),
-                //finalize(() => this.loading = false),
                 catchError((err: any) => {
                     this.notify.handleErrors(err);
                     return of(false);
@@ -498,7 +497,7 @@ export class IndexingFormComponent implements OnInit {
                             this.initValidator(field);
                         });
                     });
-                    this.notify.error("Champs introuvables! les données de base ont été chargés");
+                    this.notify.error(this.lang.noFieldInModelMsg);
                 } else {
                     data.indexingModel.fields.forEach((field: any) => {
                         fieldExist = false;
@@ -544,7 +543,7 @@ export class IndexingFormComponent implements OnInit {
                             this['indexingModels_' + field.unit].push(field);
                             this.initValidator(field);
                         } else {
-                            this.notify.error("Le champ " + field.identifier + " n'existe pas !");
+                            this.notify.error(this.lang.fieldNotExist + ': ' + field.identifier);
                         }
 
                     });
@@ -553,7 +552,6 @@ export class IndexingFormComponent implements OnInit {
                 this.initElemForm();
                 this.createForm();
             }),
-            //finalize(() => this.loading = false),
             catchError((err: any) => {
                 this.notify.handleErrors(err);
                 return of(false);
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 4941bce8c3f7eda022bda0e5e81a1dec8bc8f70c..fd5eefcc74d52b69ab3bd2d3c0738fbadb96e96d 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1123,4 +1123,10 @@ export const LANG_EN = {
     "autocompleteInput" : "Autocomplete input",
     "typeEnterToCreate" : "Type on <b>enter</b> to create element",
     "ged_doc" : "GED Document",
+    "trackThisMail" : "Track this mail",
+    "untrackThisMail" : "Untrack this mail",
+    "noFieldInModelMsg" : "No field found ! Default fields have been loaded",
+    "fieldNotExist" : "Field not exist",
+    "saveAsModel" : "Save as Model",
+    "noAvailableIndexingModel" : "No indexing model found<br /><br /><small>Please create a model in Administation > Indexing model</small>",
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 8e4387d9bcbf3302d10a957dd2342ededb34bc7b..064b4e3996c2819f67f4d868185d347046564af6 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1160,4 +1160,10 @@ export const LANG_FR = {
     "autocompleteInput" : "Auto-completion",
     "typeEnterToCreate" : "Taper sur <b>entrée</b> pour créer l'element",
     "ged_doc" : "Document GED",
+    "trackThisMail" : "Suivre le courrier",
+    "untrackThisMail" : "Ne plus suivre le courrier",
+    "noFieldInModelMsg" : "Champs introuvables! les données de base ont été chargées",
+    "fieldNotExist" : "Le champ n'existe pas",
+    "saveAsModel" : "Enregistrer comme modèle",
+    "noAvailableIndexingModel" : "Aucun modèle d'enregistrement disponible<br /><br /><small>Veuillez créer un modèle depuis Administation > Modèle d'enregistrement</small>",
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index c0c2ac962e99b18545e7312455e1112839d4e3d0..44c9ae3161a7b698e9d388a4329a5236dac99bb0 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1149,4 +1149,10 @@ export const LANG_NL = {
     "autocompleteInput" : "Autocomplete input", //_TO_TRANSLATE
     "typeEnterToCreate" : "Type on <b>enter</b> to create element", //_TO_TRANSLATE
     "ged_doc" : "GED Document", //_TO_TRANSLATE
+    "trackThisMail" : "Track this mail", //_TO_TRANSLATE
+    "untrackThisMail" : "Untrack this mail", //_TO_TRANSLATE
+    "noFieldInModelMsg" : "No field found ! Default fields have been loaded", //_TO_TRANSLATE
+    "fieldNotExist" : "Field not exist", //_TO_TRANSLATE
+    "saveAsModel" : "Save as Model", //_TO_TRANSLATE
+    "noAvailableIndexingModel" : "No indexing model found<br /><br /><small>Please create a model in Administation > Indexing model</small>", //_TO_TRANSLATE
 };