diff --git a/app/src/main.js b/app/src/main.js
index 2073316c..e182a1d1 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -17,12 +17,7 @@ Vue.config.productionTip = false
 Vue.use(BootstrapVue, {
   BSkeleton: { animation: 'none' },
   BAlert: { show: true },
-  BBadge: { pill: true },
-  BModal: {
-    bodyBgVariant: 'warning',
-    centered: true,
-    bodyClass: ['font-weight-bold', 'rounded-top']
-  }
+  BBadge: { pill: true }
 })
 
 Vue.use(VueShowdown, {
@@ -37,6 +32,9 @@ Vue.prototype.$askConfirmation = function (message, props) {
   return this.$bvModal.msgBoxConfirm(message, {
     okTitle: this.$i18n.t('ok'),
     cancelTitle: this.$i18n.t('cancel'),
+    bodyBgVariant: 'warning',
+    centered: true,
+    bodyClass: ['font-weight-bold', 'rounded-top', store.state.theme ? 'text-white' : 'text-black'],
     ...props
   })
 }
diff --git a/app/src/scss/_variables.scss b/app/src/scss/_variables.scss
index a5cc4b36..6a42f5fa 100644
--- a/app/src/scss/_variables.scss
+++ b/app/src/scss/_variables.scss
@@ -66,7 +66,7 @@ $alert-color-level:  5;
 $list-group-item-bg-level:     -11;
 $list-group-item-color-level:  6;
 
-$code-color: var(--code-color);
+$code-color: $black;
 
 // Replace font-weight 300 with 200
 $font-weight-light: 200;
diff --git a/app/src/scss/main.scss b/app/src/scss/main.scss
index 7525c567..e223f54c 100644
--- a/app/src/scss/main.scss
+++ b/app/src/scss/main.scss
@@ -85,8 +85,6 @@
   @include hsl-color('gray-800', 210, 10%, 23%);
   @include hsl-color('gray-900', 210, 11%, 15%);
 
-  --code-color: var(--pink);
-
   // Overwrite list-group-item variants to lighter ones (used in diagnosis for example)
   @each $color, $value in $theme-colors {
     @include list-group-item-variant($color, theme-color-level($color, $list-group-item-bg-level), theme-color-level($color, $list-group-item-color-level));
@@ -98,6 +96,11 @@
       }
     }
   }
+
+  // FIX svg fill not working with CSS variables
+  .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
+    background-image: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'><path fill='white' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/></svg>"));
+  }
 }
 
 [dark-theme="true"] {
@@ -123,8 +126,6 @@
   @include hsl-color('gray-200', 256, 0%, 23%);
   @include hsl-color('gray-100', 256, 0%, 15%);
 
-  --code-color: var(--gray-800);
-
   @each $color, $value in $theme-colors {
     @include list-group-item-variant($color, theme-color-level($color, -6), theme-color-level($color, 2));
 
@@ -132,6 +133,11 @@
       @include alert-variant(theme-color-level($color, -6), theme-color-level($color, -5), theme-color-level($color, 2));
     }
   }
+
+  // FIX svg fill not working with CSS variables
+  .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
+    background-image: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'><path fill='#202020' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/></svg>"));
+  }
 }
 
 // Style overrides happens after dependencies imports
@@ -294,7 +300,7 @@ h3.card-title {
 }
 
 code {
-  background: $light;
+  background: $gray-300;
   padding: .15rem .25rem;
   border-radius: $border-radius;
 }