diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8a8094fbb..e79ecb5c7 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -164,7 +164,7 @@ menu {
       &:hover,
       &:focus-visible {
         my-global-icon {
-          @include apply-svg-color(var(--mainBackgroundColor));
+          @include apply-svg-color(var(--menuForegroundColor));
         }
       }
 
@@ -269,7 +269,7 @@ menu {
     a, span[role=button] {
       display: inline-block;
       text-decoration: none;
-      color: pvar(--mainBackgroundColor);
+      color: pvar(--menuForegroundColor);
       opacity: $footer-links-base-opacity;
       white-space: nowrap;
       font-size: 90%;
@@ -284,7 +284,7 @@ menu {
         height: 1.4rem;
 
         my-global-icon {
-          @include apply-svg-color(pvar(--mainBackgroundColor));
+          @include apply-svg-color(pvar(--menuForegroundColor));
 
           display: flex;
           width: auto;
@@ -298,7 +298,7 @@ menu {
   .footer-copyleft small a {
     @include disable-default-a-behaviour;
 
-    color: pvar(--mainBackgroundColor);
+    color: pvar(--menuForegroundColor);
     opacity: $footer-links-base-opacity - .2;
   }
 }
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 25db91670..ece8411af 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -105,6 +105,7 @@ label {
 
 code {
   background-color: pvar(--greyBackgroundColor);
+  color: pvar(--greyForegroundColor);
   border-radius: 3px;
   padding: .2em .4em;
   margin: auto .4em;
@@ -261,7 +262,7 @@ code {
     opacity: 0.6;
 
     &.active {
-      background-color: #f0f0f0;
+      background-color: pvar(--submenuColor);
     }
 
     &.active, &:hover, &:active, &:focus {