diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 4ede09eeddd8988b42acd2cb89578c8436fc2862..722dbb46a30a01094f0a7a03f2478f29848f990b 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -118,11 +118,10 @@
                                                 (change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
                                             </mat-checkbox>
                                         </span>
-                                        <span style="width:30px;">
-                                            <mat-icon [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail" color="primary" style="cursor: pointer;"
-                                                [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']" (click)="$event.stopPropagation();toggleMailTracking(row)">
-                                            </mat-icon>
-                                        </span>
+                                        <button mat-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>
                                         <span *ngIf="!appService.getViewMode()" style="cursor:pointer;" class="main-info-status" (click)="launch(defaultAction,row);">
                                             <mat-icon *ngIf="row.isLocked !== true" title="{{row.statusLabel}}" [ngStyle]="{'color': row.priorityColor}" color="primary"
                                                 class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x">
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 8c3339a8ea90a3729159df464179580353a888c6..411bf04a568b91a7871b4dd2e309c5bc56bbb4e5 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -300,7 +300,7 @@ export class BasketListComponent implements OnInit {
             Object.keys(element).forEach((key) => {
                 if (key == 'statusImage' && element[key] == null) {
                     element[key] = 'fa-question undefined';
-                } else if ((element[key] == null || element[key] == '') && ['closingDate', 'countAttachments', 'countNotes', 'display', 'folders', 'hasDocument'].indexOf(key) === -1) {
+                } else if ((element[key] == null || element[key] == '') && ['closingDate', 'countAttachments', 'countNotes', 'display', 'folders', 'hasDocument', 'mailTracking'].indexOf(key) === -1) {
                     element[key] = this.lang.undefined;
                 }
             });
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 74026fe92a87e04f6c328f1c45f6b8d5088bc057..76ff93e0bc46f9496979dac240be640bf16ca493 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1371,7 +1371,7 @@ export const LANG_EN = {
     "communicationMean": "Communication mean",
     "communicationMeanDesc": "Link a contact with another Maarch instance",
     "see": "see",
-    "notSavedBecauseInvalid": "Configuration not updated because some datas are invalid",
+    "notSavedBecauseInvalid": "Configuration not updated because some data are invalid",
     "deleteAll": "Delete all",
     "followedMail": "Followed mail(s)",
     "stopFollowingAlert": "Do you want to stop following these mails ?"
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 81005db16f16aa12397f7b2e6fcac8daf0776177..cb3b4c525cffa13dfce1b2614ffd1ceeba58eafd 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1396,7 +1396,7 @@ export const LANG_NL = {
     "communicationMean": "Communication mean", //_TO_TRANSLATE
     "communicationMeanDesc": "Link a contact with another Maarch instance", //_TO_TRANSLATE
     "see": "see", //_TO_TRANSLATE
-    "notSavedBecauseInvalid": "Configuration not updated because some datas are invalid", //_TO_TRANSLATE
+    "notSavedBecauseInvalid": "Configuration not updated because some data are invalid", //_TO_TRANSLATE
     "deleteAll": "Delete all", //_TO_TRANSLATE
     "followedMail": "Followed mail(s)", //_TO_TRANSLATE
     "stopFollowingAlert": "Do you want to stop following these mails ?", //_TO_TRANSLATE