diff --git a/src/components/BarcodeScannerDialog.vue b/src/components/BarcodeScannerDialog.vue
index 4e96fdae5a9..7baa7d9830d 100644
--- a/src/components/BarcodeScannerDialog.vue
+++ b/src/components/BarcodeScannerDialog.vue
@@ -46,7 +46,7 @@
                 persistent-hint
               >
                 <template #append-inner>
-                  <v-btn :icon="barcodeManualInputMode === 'search' ? 'mdi-magnify' : 'mdi-plus'" :disabled="!barcodeManualFormValid" @click="barcodeSearchOrSend" />
+                  <v-btn color="primary" :icon="barcodeManualInputMode === 'search' ? 'mdi-magnify' : 'mdi-plus'" :disabled="!barcodeManualFormValid" @click="barcodeSearchOrSend" />
                 </template>
               </v-text-field>
             </v-form>
diff --git a/src/components/ChallengeTakePicturesCard.vue b/src/components/ChallengeTakePicturesCard.vue
index 4b05f2f6573..9e2cf17073c 100644
--- a/src/components/ChallengeTakePicturesCard.vue
+++ b/src/components/ChallengeTakePicturesCard.vue
@@ -17,7 +17,7 @@
         <v-col>
           <v-btn 
             class="float-right"
-            color="success"
+            color="primary"
             variant="flat"
             to="/proofs/add/multiple"
           >
diff --git a/src/components/ChallengeValidateCard.vue b/src/components/ChallengeValidateCard.vue
index de1c251efd8..cee823bfd94 100644
--- a/src/components/ChallengeValidateCard.vue
+++ b/src/components/ChallengeValidateCard.vue
@@ -22,7 +22,7 @@
         <v-col>
           <v-btn
             class="float-right"
-            color="success"
+            color="primary"
             variant="flat"
             to="/experiments/price-validation-assistant"
           >
diff --git a/src/components/ContributionAssistantPriceFormCard.vue b/src/components/ContributionAssistantPriceFormCard.vue
index 4307eb1cf30..135cc37e417 100644
--- a/src/components/ContributionAssistantPriceFormCard.vue
+++ b/src/components/ContributionAssistantPriceFormCard.vue
@@ -41,7 +41,7 @@
       <v-spacer />
       <v-btn
         v-if="mode === 'Validation'"
-        color="success"
+        color="primary"
         variant="flat"
         @click="validatePriceTag"
       >
diff --git a/src/components/LocationSelectorDialog.vue b/src/components/LocationSelectorDialog.vue
index 49624b3afa7..2fb3a549d7d 100644
--- a/src/components/LocationSelectorDialog.vue
+++ b/src/components/LocationSelectorDialog.vue
@@ -46,7 +46,7 @@
                 persistent-hint
               >
                 <template #append-inner>
-                  <v-btn icon="mdi-magnify" :disabled="!locationOsmSearchForm.q" @click="locationOsmSearch" />
+                  <v-btn color="primary" icon="mdi-magnify" :disabled="!locationOsmSearchForm.q" @click="locationOsmSearch" />
                 </template>
               </v-text-field>
             </v-form>
@@ -106,7 +106,7 @@
                 persistent-hint
               >
                 <template #append-inner>
-                  <v-btn icon="mdi-plus" :disabled="!locationOnlineFormValid" @click="createOnline" />
+                  <v-btn color="primary" icon="mdi-plus" :disabled="!locationOnlineFormValid" @click="createOnline" />
                 </template>
               </v-text-field>
             </v-form>
diff --git a/src/components/PriceEditDialog.vue b/src/components/PriceEditDialog.vue
index 0b1322ce871..38d6c6707ca 100644
--- a/src/components/PriceEditDialog.vue
+++ b/src/components/PriceEditDialog.vue
@@ -43,7 +43,7 @@
       <v-card-actions>
         <v-btn
           class="float-right"
-          color="success"
+          color="primary"
           variant="flat"
           elevation="1"
           :loading="loading"
diff --git a/src/components/ProofEditDialog.vue b/src/components/ProofEditDialog.vue
index ea123005507..5fcd6d5a23a 100644
--- a/src/components/ProofEditDialog.vue
+++ b/src/components/ProofEditDialog.vue
@@ -23,7 +23,7 @@
       <v-card-actions>
         <v-btn
           class="float-right"
-          color="success"
+          color="primary"
           variant="flat"
           elevation="1"
           :disabled="!formFilled"
diff --git a/src/components/ProofUploadCard.vue b/src/components/ProofUploadCard.vue
index 346f14412de..71944124673 100644
--- a/src/components/ProofUploadCard.vue
+++ b/src/components/ProofUploadCard.vue
@@ -39,7 +39,7 @@
     <v-card-actions>
       <v-spacer />
       <v-btn
-        color="success"
+        color="primary"
         variant="flat"
         :loading="loading || step === 2"
         :disabled="!proofFormFilled || loading || step === 2"
diff --git a/src/views/ContributionAssistant.vue b/src/views/ContributionAssistant.vue
index 7d08d35e0ab..211748b582e 100644
--- a/src/views/ContributionAssistant.vue
+++ b/src/views/ContributionAssistant.vue
@@ -61,7 +61,7 @@
               <h3 class="mb-4">
                 {{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabels') }}
               </h3>
-              <v-btn color="success" :disabled="!extractedLabels.length" :loading="processLabelsLoading" @click="processLabels">
+              <v-btn color="primary" :disabled="!extractedLabels.length" :loading="processLabelsLoading" @click="processLabels">
                 {{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabelsButton') }}
               </v-btn>
             </v-col>
@@ -106,7 +106,7 @@
                   {{ $t('ContributionAssistant.PriceAddConfirmationMessage', { numberOfPricesAdded: productPriceFormsWithoutPriceId.length, date: proofObject.date, locationName: locationName }) }}
                 </p>
               </v-alert>
-              <v-btn class="float-right mt-4" color="success" :loading="loading" @click="addPrices">
+              <v-btn class="float-right mt-4" color="primary" :loading="loading" @click="addPrices">
                 {{ $t('Common.UploadMultiplePrices', productPriceFormsWithoutPriceId.length) }}
               </v-btn>
             </v-col>
@@ -129,16 +129,16 @@
               >
                 <strong>{{ $t('ContributionAssistant.PriceAddProgress', { numberOfPricesAdded: numberOfPricesAdded, totalNumberOfPrices: productPriceFormsWithoutPriceId.length }) }}</strong>
               </v-progress-linear>
-              <v-btn to="/dashboard" class="mt-4" :aria-label="$t('Common.Dashboard')" :disabled="!allDone">
+              <v-btn class="mt-4" color="primary" :aria-label="$t('Common.Dashboard')" to="/dashboard" :disabled="!allDone">
                 {{ $t('ContributionAssistant.GoToDashboard') }}
               </v-btn>
-              <v-btn :to="'/proofs/' + proofObject.id" class="mt-4 ml-4" :disabled="!allDone">
+              <v-btn class="mt-4 ml-4" color="primary" :to="'/proofs/' + proofObject.id" :disabled="!allDone">
                 {{ $t('ContributionAssistant.GoToProof') }}
               </v-btn>
-              <v-btn class="mt-4 ml-4" :disabled="!allDone" @click="reloadPage">
+              <v-btn class="mt-4 ml-4" color="primary" :disabled="!allDone" @click="reloadPage">
                 {{ $t('ContributionAssistant.AddNewProof') }}
               </v-btn>
-              <v-btn v-if="proofIdsFromQueryParam" class="mt-4 ml-4" :disabled="!allDone" @click="nextProof">
+              <v-btn v-if="proofIdsFromQueryParam" class="mt-4 ml-4" color="primary" :disabled="!allDone" @click="nextProof">
                 {{ $t('ContributionAssistant.NextProof') }}
               </v-btn>
             </v-col>
diff --git a/src/views/PriceAddMultiple.vue b/src/views/PriceAddMultiple.vue
index 87953f7c0c4..e7e0e193c05 100644
--- a/src/views/PriceAddMultiple.vue
+++ b/src/views/PriceAddMultiple.vue
@@ -75,7 +75,7 @@
               <v-col>
                 <v-btn
                   class="float-right"
-                  color="success"
+                  color="primary"
                   variant="flat"
                   type="submit"
                   :loading="loading"
@@ -117,7 +117,6 @@
             <v-col cols="12" md="6">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-tag-plus-outline"
                 @click="reloadPage"
               >
@@ -127,7 +126,6 @@
             <v-col cols="12" md="6">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-account-circle"
                 @click="goToDashboard"
               >
diff --git a/src/views/PriceAddSingle.vue b/src/views/PriceAddSingle.vue
index 822c3f868cc..a9f2fb31bff 100644
--- a/src/views/PriceAddSingle.vue
+++ b/src/views/PriceAddSingle.vue
@@ -48,7 +48,7 @@
         <v-btn
           type="submit"
           class="float-right"
-          :color="formFilled ? 'success' : ''"
+          color="primary"
           :loading="loading"
           :disabled="!formFilled"
         >
diff --git a/src/views/ProofAddMultiple.vue b/src/views/ProofAddMultiple.vue
index 2b2634338ce..807a4ea4370 100644
--- a/src/views/ProofAddMultiple.vue
+++ b/src/views/ProofAddMultiple.vue
@@ -33,7 +33,6 @@
             <v-col cols="12" md="4">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-image-plus"
                 @click="reloadPage"
               >
@@ -43,7 +42,6 @@
             <v-col cols="12" md="4">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-checkbox-marked-circle-plus-outline"
                 @click="goToPriceValidation"
               >
@@ -53,7 +51,6 @@
             <v-col cols="12" md="4">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-account-circle"
                 @click="goToDashboard"
               >
diff --git a/src/views/ProofAddSingle.vue b/src/views/ProofAddSingle.vue
index 918c8cd8540..190db29b762 100644
--- a/src/views/ProofAddSingle.vue
+++ b/src/views/ProofAddSingle.vue
@@ -29,7 +29,6 @@
             <v-col cols="12" md="6">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-image-plus"
                 @click="reloadPage"
               >
@@ -39,7 +38,6 @@
             <v-col cols="12" md="6">
               <v-btn
                 color="primary"
-                variant="outlined"
                 prepend-icon="mdi-account-circle"
                 @click="goToDashboard"
               >
diff --git a/src/views/Search.vue b/src/views/Search.vue
index df3f5590c20..c5f4a8a2ff5 100644
--- a/src/views/Search.vue
+++ b/src/views/Search.vue
@@ -18,7 +18,7 @@
             <v-icon :icon="formFilled ? 'mdi-barcode' : 'mdi-barcode-scan'" @click="showBarcodeScannerDialog" />
           </template>
           <template #append-inner>
-            <v-btn icon="mdi-magnify" @click="search" />
+            <v-btn color="primary" icon="mdi-magnify" @click="search" />
           </template>
         </v-text-field>
       </v-form>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 4e1ad5a510e..c580e3d4d8f 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -10,7 +10,7 @@
           </h3>
           <v-switch
             v-model="appStore.user.preferedTheme"
-            color="success"
+            color="primary"
             false-value="light"
             true-value="dark"
             density="compact"
@@ -119,7 +119,7 @@
           </h3>
           <v-switch
             v-model="appStore.user.drawer_display_experiments"
-            color="success"
+            color="primary"
             :label="$t('UserSettings.SideMenuExperimentsDisplay')"
             density="compact"
             hide-details="auto"
@@ -131,7 +131,7 @@
           <v-switch
             v-model="appStore.user.product_display_barcode"
             class="mb-4"
-            color="success"
+            color="primary"
             :label="$t('UserSettings.ProductDisplayBarcode')"
             :hint="$t('Common.ExampleWithColonAndValue', { value: '1234567890123' })"
             density="compact"
@@ -140,7 +140,7 @@
           />
           <v-switch
             v-model="appStore.user.product_display_category_tag"
-            color="success"
+            color="primary"
             :label="$t('UserSettings.ProductDisplayCategoryTag')"
             :hint="$t('Common.ExampleWithColonAndValue', { value: 'en:oranges' })"
             density="compact"
@@ -153,7 +153,7 @@
           </h3>
           <v-switch
             v-model="appStore.user.location_display_osm_id"
-            color="success"
+            color="primary"
             :label="$t('UserSettings.LocationDisplayOSMID')"
             :hint="$t('Common.ExampleWithColonAndValue', { value: 'N652825274' })"
             density="compact"
diff --git a/src/views/UserSettings.vue b/src/views/UserSettings.vue
index a176e08fb7a..2f8a3317e38 100644
--- a/src/views/UserSettings.vue
+++ b/src/views/UserSettings.vue
@@ -70,7 +70,7 @@
 
     <v-row>
       <v-col>
-        <v-btn type="submit" :color="formFilled ? 'success' : ''" :disabled="!formFilled">
+        <v-btn type="submit" color="primary" :disabled="!formFilled">
           {{ $t('UserSettings.Save') }}
         </v-btn>
       </v-col>