diff --git a/src/components/generic/ADialog.vue b/src/components/generic/ADialog.vue
index 74cf5eff3ccd6a26d6fb3558ecb0afd3e70f7bc2..de72f6779543038928aa80d550a454dc9255bc01 100644
--- a/src/components/generic/ADialog.vue
+++ b/src/components/generic/ADialog.vue
@@ -13,7 +13,7 @@
       </div>
       <button
         type="button"
-        class="tw-w-8 tw-h-8 tw-ml-auto tw-p-0 tw-flex tw-items-center tw-justify-center tw-bg-gray-100 tw-rounded-full tw-border-none"
+        class="btn btn-default tw-w-8 tw-h-8 tw-ml-auto tw-p-0 tw-flex tw-items-center tw-justify-center tw-rounded-full"
         tabindex="-1"
         @click="close"
       >
diff --git a/src/components/images/ImagePicker.vue b/src/components/images/ImagePicker.vue
index 76f5804f012a5677e7c1b0dd9cc18d58e1ae5b56..3be9bfe795e0980eed08523c1781f05efb861ca2 100644
--- a/src/components/images/ImagePicker.vue
+++ b/src/components/images/ImagePicker.vue
@@ -9,7 +9,7 @@
     >
       <button
         type="button"
-        class="btn btn-secondary btn-sm tw-inline-flex tw-items-center"
+        class="btn btn-default btn-sm tw-inline-flex tw-items-center"
         @click="showPicker = true"
       >
         <icon-carbon-image-search class="tw-mr-1 tw-w-6 tw-h-6" />
diff --git a/src/components/images/ImagePickerDialog.vue b/src/components/images/ImagePickerDialog.vue
index 55061a830b927e2c9f99e9adcbbc53a193895b27..9b968c7875b288f85b506b40f5389c410381f948 100644
--- a/src/components/images/ImagePickerDialog.vue
+++ b/src/components/images/ImagePickerDialog.vue
@@ -13,7 +13,7 @@
       <button
         v-if="imageStore.count > 0"
         type="button"
-        class="btn btn-sm btn-secondary tw-flex tw-items-center tw-grow md:tw-grow-0"
+        class="btn btn-sm btn-default tw-flex tw-items-center tw-grow md:tw-grow-0"
         @click.stop="showBrowser = true"
       >
         <icon-carbon-search class="tw-mr-1 tw-w-6 tw-h-6" />
@@ -22,7 +22,7 @@
       <button
         v-if="currentImage"
         type="button"
-        class="btn btn-sm btn-secondary tw-flex tw-items-center tw-grow md:tw-grow-0"
+        class="btn btn-sm btn-default tw-flex tw-items-center tw-grow md:tw-grow-0"
         @click.stop="selectedImage = currentImage"
       >
         <icon-carbon-pen class="tw-mr-1 tw-w-6 tw-h-6" />
@@ -49,13 +49,18 @@
           <template v-if="isSelectedImageNew">{{ t('imagePicker.useImage') }}</template>
           <template v-else>{{ t('imagePicker.saveChanges') }}</template>
         </button>
-        <button v-if="selectedImage" type="button" class="btn" @click.stop="deselectImage">
+        <button
+          v-if="selectedImage"
+          type="button"
+          class="btn btn-default"
+          @click.stop="deselectImage"
+        >
           {{ t('imagePicker.abort') }}
         </button>
         <button
           v-if="showBrowser"
           type="button"
-          class="btn btn-secondary"
+          class="btn btn-default"
           @click.stop="showBrowser = false"
         >
           {{ t('imagePicker.abort') }}