diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html
index 2c4f8f38f57d28e4500983450bb02b3d091a65fa..5514a09d88af49da3c365c469d4983557358df6f 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.html
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.html
@@ -101,7 +101,8 @@
                                             (change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
                                         </mat-checkbox>
                                     </span>
-                                    <button mat-icon-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;"
+                                        class="followIcon"
                                         [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail">
                                         <mat-icon [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']" style="margin-bottom: 5px;"></mat-icon>
                                     </button>
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.scss b/src/frontend/app/folder/document-list/folder-document-list.component.scss
index 6ce6d16afd178e5e22029298a68e94635238c26b..7a6af119a53257534cc90bb70e36a7e6cc50df81 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.scss
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.scss
@@ -88,4 +88,8 @@
         margin: 0px;
         color: white;
     }
-}
\ No newline at end of file
+}
+
+.followIcon {
+    color: $secondary;
+}
diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.html b/src/frontend/app/home/followed-list/followed-document-list.component.html
index 41e5dafd9aee5dfdfbe91b3f876bb6e23c8f6f68..f48fd2a4f04569c4e8d3a3834fd4fa772a2de369 100644
--- a/src/frontend/app/home/followed-list/followed-document-list.component.html
+++ b/src/frontend/app/home/followed-list/followed-document-list.component.html
@@ -76,7 +76,8 @@
                                             (change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
                                         </mat-checkbox>
                                     </span>
-                                    <button mat-icon-button (click)="$event.stopPropagation();unfollowMail(row)" style="margin-left: -25px; color: #F99830"
+                                    <button mat-icon-button (click)="$event.stopPropagation();unfollowMail(row)" style="margin-left: -25px;"
+                                        class="followIcon"
                                         title="{{lang.untrackThisMail}}">
                                         <mat-icon class="fas fa-star" style="margin-bottom: 5px;"></mat-icon>
                                     </button>
diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.scss b/src/frontend/app/home/followed-list/followed-document-list.component.scss
index 6ce6d16afd178e5e22029298a68e94635238c26b..7a6af119a53257534cc90bb70e36a7e6cc50df81 100644
--- a/src/frontend/app/home/followed-list/followed-document-list.component.scss
+++ b/src/frontend/app/home/followed-list/followed-document-list.component.scss
@@ -88,4 +88,8 @@
         margin: 0px;
         color: white;
     }
-}
\ No newline at end of file
+}
+
+.followIcon {
+    color: $secondary;
+}
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 5774f08bcf30b94db1226e3b31f156ccba03b5cc..76a78c37eed40408fa4e71fdfda7a9a63a199821 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -118,7 +118,8 @@
                                                 (change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
                                             </mat-checkbox>
                                         </span>
-                                        <button mat-icon-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;"
+                                            class="followIcon"
                                             [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/list/basket-list.component.scss b/src/frontend/app/list/basket-list.component.scss
index 9b1dfe2a015a9e9bc364256dbf3f597cb897f525..7e95d28ac09efd065ebc1ed70a73146761c493ab 100644
--- a/src/frontend/app/list/basket-list.component.scss
+++ b/src/frontend/app/list/basket-list.component.scss
@@ -78,4 +78,8 @@
     &:hover {
         color: $primary;
     }
-}
\ No newline at end of file
+}
+
+.followIcon {
+    color: $secondary;
+}
diff --git a/src/frontend/app/process/process.component.scss b/src/frontend/app/process/process.component.scss
index d674ae01b7eda9b0680f3cdfbe78506d03993edf..e30a811f4559ffe95c99a9746b4beb7cfacdd2c1 100644
--- a/src/frontend/app/process/process.component.scss
+++ b/src/frontend/app/process/process.component.scss
@@ -412,5 +412,5 @@
 }
 
 .followIcon {
-    color: #F99830;
+    color: $secondary;
 }