diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 722dbb46a30a01094f0a7a03f2478f29848f990b..f8011b6181f253f8b65f035d480749ce23313463 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -113,12 +113,12 @@
                                         </span>
                                     </div>
                                     <div class="main-info">
-                                        <span style="width:50px;">
+                                        <span style="width:50px;height: 16px;">
                                             <mat-checkbox color="primary" [checked]="row.checked"
                                                 (change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
                                             </mat-checkbox>
                                         </span>
-                                        <button mat-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px; color: #F99830"
+                                        <button mat-icon-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px; color: #F99830"
                                             [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail">
                                             <mat-icon [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']"></mat-icon>
                                         </button>
diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html
index 1c6e9a73f320745b7e025daf5c4adfc6d6edab00..556281fab5c6bc09e04f49d19479209597c7c0da 100644
--- a/src/frontend/app/process/process.component.html
+++ b/src/frontend/app/process/process.component.html
@@ -86,19 +86,21 @@
                 </app-attachments-list>
                 <app-indexing-form *ngIf="currentTool === 'info' && !loading" #indexingForm [groupId]="currentGroupId"
                     [resId]="currentResourceInformations.resId" [indexingFormId]="currentResourceInformations.modelId"
-                    [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true" (loadingFormEndEvent)="triggerProcessAction()"></app-indexing-form>
+                    [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true"
+                    (loadingFormEndEvent)="triggerProcessAction()"></app-indexing-form>
                 <div style="position: sticky;bottom: 0px;text-align:right;">
-                    <button mat-fab *ngIf="indexingForm !== undefined && indexingForm.isResourceModified() && currentTool === 'info'"
-                        (click)="confirmModification()" color="accent"
-                        [title]="lang.saveModifications">
+                    <button mat-fab
+                        *ngIf="indexingForm !== undefined && indexingForm.isResourceModified() && currentTool === 'info'"
+                        (click)="confirmModification()" color="accent" [title]="lang.saveModifications">
                         <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
                     </button>
-                    <button mat-fab [title]="lang.saveModifications" *ngIf="appDiffusionsList !== undefined && appDiffusionsList.isModified() && currentTool === 'diffusionList'"
+                    <button mat-fab [title]="lang.saveModifications"
+                        *ngIf="appDiffusionsList !== undefined && appDiffusionsList.isModified() && currentTool === 'diffusionList'"
                         (click)="saveListinstance()" color="accent">
                         <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
                     </button>
                 </div>
-                
+
             </ng-container>
             <ng-template #elseTemplate>
                 <div class="openedModal">
@@ -165,9 +167,11 @@
                             <div class="title-divider"></div>
                         </div>
                         <div class="content">
-                            <button mat-button class="categoryLabel" (click)="toggleFollow()">
+                            <button mat-icon-button
+                                [title]="this.resourceFollowed ? lang.untrackThisMail:lang.trackThisMail"
+                                class="categoryLabel" (click)="toggleFollow()">
                                 <mat-icon class="followIcon {{this.resourceFollowed ? 'fas':'far'}} fa-star"
-                                          style="font-size: 20px;"></mat-icon>
+                                    style="font-size: 20px;"></mat-icon>
                             </button>
                             <div class="content-item" *ngIf="this.currentResourceInformations.priority !== undefined">
                                 <b><i class="fas fa-flag" [style.color]="this.currentResourceInformations.priorityColor"
@@ -256,18 +260,20 @@
         </app-attachments-list>
         <app-indexing-form *ngIf="modal.id === 'info' && !loading" #indexingForm [groupId]="currentGroupId"
             [indexingFormId]="currentResourceInformations.modelId" [resId]="currentResourceInformations.resId"
-            [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true" (loadingFormEndEvent)="triggerProcessAction()">
+            [mode]="'process'" [canEdit]="canEditData" [hideDiffusionList]="true"
+            (loadingFormEndEvent)="triggerProcessAction()">
         </app-indexing-form>
         <div style="position: sticky;bottom: 0px;text-align:right;padding:15px;">
-            <button mat-fab *ngIf="indexingForm !== undefined && indexingForm.isResourceModified() && modal.id === 'info'"
-                (click)="confirmModification()" color="accent"
-                [title]="lang.saveModifications">
+            <button mat-fab
+                *ngIf="indexingForm !== undefined && indexingForm.isResourceModified() && modal.id === 'info'"
+                (click)="confirmModification()" color="accent" [title]="lang.saveModifications">
                 <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
             </button>
-            <button mat-fab [title]="lang.saveModifications" *ngIf="appDiffusionsList !== undefined && appDiffusionsList.isModified() && modal.id === 'diffusionList'"
+            <button mat-fab [title]="lang.saveModifications"
+                *ngIf="appDiffusionsList !== undefined && appDiffusionsList.isModified() && modal.id === 'diffusionList'"
                 (click)="saveListinstance()" color="accent">
                 <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
             </button>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file