diff --git a/app/src/components/globals/Card.vue b/app/src/components/globals/Card.vue
index b8e24249..9a7dcb3f 100644
--- a/app/src/components/globals/Card.vue
+++ b/app/src/components/globals/Card.vue
@@ -79,6 +79,7 @@ export default {
     .btn + .btn {
       margin-left: .5rem;
     }
+    background-color: $background-color-primary !important;
   }
 }
 
diff --git a/app/src/components/globals/formItems/TagsSelectizeItem.vue b/app/src/components/globals/formItems/TagsSelectizeItem.vue
index f2243538..0177bb83 100644
--- a/app/src/components/globals/formItems/TagsSelectizeItem.vue
+++ b/app/src/components/globals/formItems/TagsSelectizeItem.vue
@@ -12,7 +12,6 @@
               @remove="onRemoveTag({ option: tag, removeTag })"
               :title="tag"
               :disabled="disabled || disabledItems.includes(tag)"
-              variant="light"
               class="border border-dark mb-2"
             >
               <icon v-if="tagIcon" :iname="tagIcon" /> {{ tag }}
diff --git a/app/src/views/PostInstall.vue b/app/src/views/PostInstall.vue
index 7edc353f..88e62d61 100644
--- a/app/src/views/PostInstall.vue
+++ b/app/src/views/PostInstall.vue
@@ -63,7 +63,7 @@
         </b-card-body>
 
         <template #buttons>
-          <b-button variant="light" size="sm" @click="performPostInstall(true)">
+          <b-button size="sm" @click="performPostInstall(true)">
             <icon iname="warning" /> {{ $t('postinstall.force') }}
           </b-button>
         </template>
diff --git a/app/src/views/_partials/ErrorDisplay.vue b/app/src/views/_partials/ErrorDisplay.vue
index 7ed16a4e..6f77522a 100644
--- a/app/src/views/_partials/ErrorDisplay.vue
+++ b/app/src/views/_partials/ErrorDisplay.vue
@@ -42,7 +42,7 @@
     <b-card-footer footer-bg-variant="danger">
       <!-- TODO add copy error ? -->
       <b-button
-        variant="light" size="sm"
+        size="sm"
         v-t="'ok'" @click="dismiss"
       />
     </b-card-footer>
diff --git a/app/src/views/_partials/ViewLockOverlay.vue b/app/src/views/_partials/ViewLockOverlay.vue
index efe6ba66..8bc37075 100644
--- a/app/src/views/_partials/ViewLockOverlay.vue
+++ b/app/src/views/_partials/ViewLockOverlay.vue
@@ -1,6 +1,6 @@
 <template>
   <b-overlay
-    variant="white" opacity="0.75"
+    variant="" opacity="0.75"
     no-center
     :show="waiting || reconnecting || error !== null"
   >
@@ -8,7 +8,7 @@
 
     <template v-slot:overlay>
       <b-card no-body class="card-overlay">
-        <b-card-header header-bg-variant="white">
+        <b-card-header>
           <query-header :request="error || currentRequest" status-size="lg" />
         </b-card-header>
 
diff --git a/app/src/views/_partials/WarningDisplay.vue b/app/src/views/_partials/WarningDisplay.vue
index e156a30f..b1ce5d72 100644
--- a/app/src/views/_partials/WarningDisplay.vue
+++ b/app/src/views/_partials/WarningDisplay.vue
@@ -5,7 +5,7 @@
 
     <b-card-footer footer-bg-variant="warning">
       <b-button
-        variant="light" size="sm"
+        size="sm"
         v-t="'ok'" @click="dismiss"
       />
     </b-card-footer>
diff --git a/app/src/views/diagnosis/Diagnosis.vue b/app/src/views/diagnosis/Diagnosis.vue
index 4e1d26ee..739f2ba4 100644
--- a/app/src/views/diagnosis/Diagnosis.vue
+++ b/app/src/views/diagnosis/Diagnosis.vue
@@ -134,7 +134,6 @@ export default {
         icon = 'info-circle'
       } else if (item.ignored) {
         icon = status !== 'error' ? status : 'times'
-        item.variant = 'light'
         report.ignoreds++
       } else if (status === 'warning') {
         icon = status
diff --git a/app/src/views/tool/ToolLog.vue b/app/src/views/tool/ToolLog.vue
index 0708de1b..2fd94840 100644
--- a/app/src/views/tool/ToolLog.vue
+++ b/app/src/views/tool/ToolLog.vue
@@ -44,7 +44,7 @@
 
       <b-button
         v-if="moreLogsAvailable"
-        variant="white" class="w-100 rounded-0"
+        class="w-100 rounded-0"
         @click="$refs.view.fetchQueries()"
       >
         <icon iname="plus" /> {{ $t('logs_more') }}