diff --git a/fittrackee_client/src/components/Footer.vue b/fittrackee_client/src/components/Footer.vue
index 6cdae94f..53b000a9 100644
--- a/fittrackee_client/src/components/Footer.vue
+++ b/fittrackee_client/src/components/Footer.vue
@@ -51,10 +51,6 @@
     color: var(--footer-color);
     font-size: 0.9em;
 
-    a {
-      text-decoration: none;
-    }
-
     .footer-items {
       display: flex;
       flex-wrap: wrap;
diff --git a/fittrackee_client/src/components/NavBar.vue b/fittrackee_client/src/components/NavBar.vue
index 30221ad9..8690ece5 100644
--- a/fittrackee_client/src/components/NavBar.vue
+++ b/fittrackee_client/src/components/NavBar.vue
@@ -200,6 +200,10 @@
     display: flex;
     padding: 15px 10px;
 
+    a {
+      text-decoration: none;
+    }
+
     .nav-container {
       display: flex;
 
diff --git a/fittrackee_client/src/components/Workout/WorkoutCard.vue b/fittrackee_client/src/components/Workout/WorkoutCard.vue
index 5c63ab3c..67b3c58f 100644
--- a/fittrackee_client/src/components/Workout/WorkoutCard.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutCard.vue
@@ -216,6 +216,7 @@
           .workout-user-name {
             white-space: nowrap;
             padding-left: 5px;
+            text-decoration: none;
           }
         }
         .workout-date {
diff --git a/fittrackee_client/src/scss/base.scss b/fittrackee_client/src/scss/base.scss
index 5175a83d..5e84bc1a 100644
--- a/fittrackee_client/src/scss/base.scss
+++ b/fittrackee_client/src/scss/base.scss
@@ -47,7 +47,11 @@ body {
 
 a {
   color: var(--app-a-color);
-  text-decoration: none;
+  text-decoration-color: var(--app-a-text-decoration-color);
+
+  &:hover {
+    text-decoration-color: var(--app-a-color);
+  }
 }
 
 img {
diff --git a/fittrackee_client/src/scss/colors-dark.scss b/fittrackee_client/src/scss/colors-dark.scss
index 35a224b3..7eae79d7 100644
--- a/fittrackee_client/src/scss/colors-dark.scss
+++ b/fittrackee_client/src/scss/colors-dark.scss
@@ -6,6 +6,7 @@
   --app-color: var(--light-grey);
   --app-color-light: #6f7070;
   --app-a-color: var(--light-grey);
+  --app-a-text-decoration-color: #494949;
   --app-shadow-color: #383d3f;
   --app-loading-color: #f3f3f3;
   --app-loading-top-color: var(--app-color);
diff --git a/fittrackee_client/src/scss/colors.scss b/fittrackee_client/src/scss/colors.scss
index a98ea448..bf19c724 100644
--- a/fittrackee_client/src/scss/colors.scss
+++ b/fittrackee_client/src/scss/colors.scss
@@ -3,6 +3,7 @@
   --app-color: #2c3e50;
   --app-color-light: #6f7070;
   --app-a-color: #40578a;
+  --app-a-text-decoration-color: #d2d2d2;
   --app-shadow-color: lightgrey;
   --app-loading-color: #f3f3f3;
   --app-loading-top-color: var(--app-color);