diff --git a/front/core/components/calendar/style.scss b/front/core/components/calendar/style.scss
index aecc3eecb..6a7995ea5 100644
--- a/front/core/components/calendar/style.scss
+++ b/front/core/components/calendar/style.scss
@@ -86,12 +86,12 @@
                 align-items: center;
 
                 &.today {
-                    color: $color-font-bg;
+                    color: $color-font;
                     & > .day-number {
                         border: 2px solid $color-font-link;
 
                         &:hover {
-                            background-color: lighten($color-font-link, 20%);
+                            background-color: $color-marginal;
                             opacity: .8
                         }
                     }
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index d1632890c..cc0554509 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -50,7 +50,7 @@ vn-chip {
     &.alert,
     &.alert.clickable:hover,
     &.alert.clickable:focus  {
-        background-color: $color-alert-medium;
+        background-color: lighten($color-alert, 5%);
     }
     &.message,
     &.message.clickable:hover,
diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss
index 855534011..21ac20c81 100644
--- a/front/core/components/smart-table/table.scss
+++ b/front/core/components/smart-table/table.scss
@@ -90,7 +90,7 @@ smart-table table {
                     color: $color-font-bg;
                 }
                 &.alert {
-                    background-color: $color-alert-medium;
+                    background-color: lighten($color-alert, 5%);
                     color: $color-font-bg;
                 }
                 &.message {
diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss
index edb40d385..b1ff51d6a 100644
--- a/front/core/components/table/style.scss
+++ b/front/core/components/table/style.scss
@@ -146,7 +146,7 @@ vn-table {
                     color: $color-font-bg;
                 }
                 &.alert {
-                    background-color: $color-alert-medium;
+                    background-color: lighten($color-alert, 5%);
                     color: $color-font-bg;
                 }
                 &.message {
diff --git a/front/core/directives/no-image-dark.png b/front/core/directives/no-image-dark.png
new file mode 100644
index 000000000..f94f96169
Binary files /dev/null and b/front/core/directives/no-image-dark.png differ
diff --git a/front/core/directives/on-error-src.js b/front/core/directives/on-error-src.js
index 094064aad..5cad42974 100644
--- a/front/core/directives/on-error-src.js
+++ b/front/core/directives/on-error-src.js
@@ -1,5 +1,5 @@
 import ngModule from '../module';
-import noImage from './no-image.png';
+import noImage from './no-image-dark.png';
 
 /**
  * Sets a default image when there is an error loading
diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss
index 4a00d716d..bd00c9a07 100644
--- a/front/core/styles/variables.scss
+++ b/front/core/styles/variables.scss
@@ -76,7 +76,7 @@ $color-alert-light: lighten($color-alert, 35%); */
 /**/
 
 // Dark theme
-$color-primary: #f7931e;
+$color-primary: #ec8916;
 $color-secondary: $color-primary;
 
 $color-font: #eee;
@@ -85,7 +85,7 @@ $color-font-secondary: #777;
 $color-font-dark: white;
 $color-font-link: #66bfff;
 $color-font-bg: rgba(0, 0, 0, .8);
-$color-font-bg-marginal: rgba(0, 0, 0, .4);
+$color-font-bg-marginal: rgba(255, 255, 255, .4);
 $color-font-bg-dark: rgba(255, 255, 255, .7);
 $color-font-bg-dark-marginal: rgba(255, 255, 255, .4);
 
@@ -97,7 +97,7 @@ $color-active: #666;
 $color-active-font: white;
 $color-bg-panel: #3c3b3b;
 $color-main: $color-primary;
-$color-marginal: #111;
+$color-marginal: #222;
 $color-success: #a3d131;
 $color-notice: #32b1ce;
 $color-alert: #fa3939;
diff --git a/modules/worker/front/calendar/style.scss b/modules/worker/front/calendar/style.scss
index 70e998a4f..d65c80833 100644
--- a/modules/worker/front/calendar/style.scss
+++ b/modules/worker/front/calendar/style.scss
@@ -44,7 +44,7 @@ vn-worker-calendar {
     
     .festive,
     vn-avatar.today {
-        background-color: $color-font-dark;
+        color: $color-font;
         width: 24px;
         min-width: 24px;
         height: 24px