diff --git a/fittrackee_client/src/components/Common/StaticMap.vue b/fittrackee_client/src/components/Common/StaticMap.vue
index 1ac60c5d..f6900c45 100644
--- a/fittrackee_client/src/components/Common/StaticMap.vue
+++ b/fittrackee_client/src/components/Common/StaticMap.vue
@@ -51,6 +51,12 @@
       width: 400px;
       height: 225px;
       z-index: 100;
+      filter: var(--map-display-hover-filter);
+
+      .map-attribution-text {
+        color: var(--map-display-hover-attribution-text);
+        background-color: var(--map-attribution-bg-color);
+      }
     }
 
     .bg-map-image {
@@ -59,6 +65,7 @@
       opacity: 0.6;
       height: 200px;
       width: 100%;
+      filter: var(--map-filter);
     }
 
     .map-attribution {
@@ -69,7 +76,8 @@
     }
 
     .map-attribution-text {
-      background-color: var(--map-attribution-text);
+      color: var(--map-attribution-text);
+      background-color: var(--map-attribution-bg-color);
     }
   }
 </style>
diff --git a/fittrackee_client/src/components/Workout/WorkoutCard.vue b/fittrackee_client/src/components/Workout/WorkoutCard.vue
index 796049b5..2b00f720 100644
--- a/fittrackee_client/src/components/Workout/WorkoutCard.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutCard.vue
@@ -238,6 +238,7 @@
         height: 150px;
         .no-map {
           line-height: 150px;
+          filter: var(--no-map-filter);
         }
         ::v-deep(.bg-map-image) {
           height: 150px;
diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
index 60357ad4..a9a85c91 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
@@ -213,6 +213,7 @@
     }
     .no-map {
       line-height: 400px;
+      filter: var(--no-map-filter);
     }
     .leaflet-container {
       .map {
diff --git a/fittrackee_client/src/components/Workouts/WorkoutsList.vue b/fittrackee_client/src/components/Workouts/WorkoutsList.vue
index 38e0e4c6..03c2360c 100644
--- a/fittrackee_client/src/components/Workouts/WorkoutsList.vue
+++ b/fittrackee_client/src/components/Workouts/WorkoutsList.vue
@@ -354,7 +354,7 @@
           }
           .static-map {
             display: none;
-            box-shadow: 3px 3px 3px 1px var(--app-shadow-color);
+            box-shadow: 3px 3px 3px 1px var(--workout-static-map-shadow-color);
           }
         }
         .workout-title:hover .static-map {
diff --git a/fittrackee_client/src/scss/colors-dark.scss b/fittrackee_client/src/scss/colors-dark.scss
index 33769d26..7981016b 100644
--- a/fittrackee_client/src/scss/colors-dark.scss
+++ b/fittrackee_client/src/scss/colors-dark.scss
@@ -84,10 +84,15 @@
   --map-control-color: #000000;
   --map-control-bg-color: #ffffff;
   --map-control-border-color: #bfc0ab;
-  --map-attribution-text: rgba(255, 255, 255, 0.7);
+  --map-attribution-text: #e8e8e8;
+  --map-display-hover-attribution-text: #444444;
+  --map-attribution-bg-color: none;
   --map-filter: invert(1) hue-rotate(180deg) brightness(0.8) contrast(0.8);
+  --map-display-hover-filter: invert(1) hue-rotate(180deg) brightness(1.5) contrast(0.6);
   --map-layers-overlays: var(--app-color);
   --map-control-bar: var(--app-color);
+  --no-map-filter: invert(1) brightness(1.5) contrast(.9);
+  --workout-static-map-shadow-color: #d2d2d2;
 
   --mountains-filter: invert(90%) sepia(19%) saturate(0%) hue-rotate(39deg)
     brightness(86%) contrast(102%);
diff --git a/fittrackee_client/src/scss/colors.scss b/fittrackee_client/src/scss/colors.scss
index 205144e3..a26306ef 100644
--- a/fittrackee_client/src/scss/colors.scss
+++ b/fittrackee_client/src/scss/colors.scss
@@ -81,10 +81,15 @@
   --map-control-color: #000000;
   --map-control-bg-color: #ffffff;
   --map-control-border-color: #bfc0ab;
-  --map-attribution-text: rgba(255, 255, 255, 0.7);
+  --map-attribution-text: var(--app-color);
+  --map-display-hover-attribution-text: initial;
+  --map-attribution-bg-color: rgba(255, 255, 255, 0.7);
   --map-filter: initial;
+  --map-display-hover-filter: initial;
   --map-layers-overlays: initial;
   --map-control-bar: #bfc0ab;
+  --no-map-filter: initial;
+  --workout-static-map-shadow-color: var(--app-shadow-color);
 
   --mountains-filter: invert(19%) sepia(9%) saturate(2921%) hue-rotate(169deg)
     brightness(85%) contrast(80%);