diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 9d4428e2d..063a3d599 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -9,6 +9,7 @@
             :disabled="disabled && !update"
             @click="handleCancel"
             data-test="cancel-button"
+            danger
           >
             {{ $t('actions.cancel') }}
           </base-button>
diff --git a/webapp/components/DeleteData/DeleteData.vue b/webapp/components/DeleteData/DeleteData.vue
index 045d00f26..167fa505f 100644
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@@ -62,7 +62,7 @@
               />
             </ds-flex-item>
             <ds-flex-item :width="{ base: '100%', sm: '100%', md: '100%', lg: 1 }">
-              <ds-button icon="trash" danger :disabled="!deleteEnabled" @click="handleSubmit">
+              <ds-button icon="trash" danger filled :disabled="!deleteEnabled" @click="handleSubmit">
                 {{ $t('settings.deleteUserAccount.name') }}
               </ds-button>
             </ds-flex-item>
diff --git a/webapp/components/Modal/ConfirmModal.vue b/webapp/components/Modal/ConfirmModal.vue
index 282dbed5e..9eb81b5ea 100644
--- a/webapp/components/Modal/ConfirmModal.vue
+++ b/webapp/components/Modal/ConfirmModal.vue
@@ -10,7 +10,12 @@
     <p v-html="message" />
 
     <template slot="footer">
-      <base-button class="cancel" :icon="modalData.buttons.cancel.icon" @click="cancel">
+      <base-button
+        class="cancel"
+        :danger="!modalData.buttons.confirm.danger"
+        :icon="modalData.buttons.cancel.icon"
+        @click="cancel"
+      >
         {{ $t(modalData.buttons.cancel.textIdent) }}
       </base-button>
 
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index e6aa3f5c7..19ef64332 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -5,7 +5,7 @@
 
     <template slot="footer">
       <base-button class="cancel" @click="cancel">{{ $t('disable.cancel') }}</base-button>
-      <base-button danger class="confirm" icon="exclamation-circle" @click="confirm">
+      <base-button danger filled class="confirm" icon="exclamation-circle" @click="confirm">
         {{ $t('disable.submit') }}
       </base-button>
     </template>
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 65ab41ec5..f6aca5f86 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -35,6 +35,7 @@
 
       <base-button
         danger
+        filled
         class="confirm"
         icon="exclamation-circle"
         :disabled="!form.reasonCategory"
diff --git a/webapp/components/ReleaseModal/ReleaseModal.vue b/webapp/components/ReleaseModal/ReleaseModal.vue
index 807610ba5..fef0d79d0 100644
--- a/webapp/components/ReleaseModal/ReleaseModal.vue
+++ b/webapp/components/ReleaseModal/ReleaseModal.vue
@@ -5,7 +5,7 @@
 
     <template slot="footer">
       <base-button class="cancel" @click="cancel">{{ $t('release.cancel') }}</base-button>
-      <base-button danger class="confirm" icon="exclamation-circle" @click="confirm">
+      <base-button danger filled class="confirm" icon="exclamation-circle" @click="confirm">
         {{ $t('release.submit') }}
       </base-button>
     </template>
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index a68c427a6..94938361d 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -18,6 +18,7 @@
         size="small"
         circle
         danger
+        filled
         @click="cancelCrop"
       />
     </div>
diff --git a/webapp/components/features/ReportRow/ReportRow.vue b/webapp/components/features/ReportRow/ReportRow.vue
index 4e69f6910..af9a317cd 100644
--- a/webapp/components/features/ReportRow/ReportRow.vue
+++ b/webapp/components/features/ReportRow/ReportRow.vue
@@ -64,6 +64,7 @@
         <base-button
           v-else
           danger
+          filled
           data-test="confirm"
           size="small"
           :icon="statusIconName"
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 5f489c303..6ed2f1bc6 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -57,7 +57,7 @@
           <base-button filled :disabled="disabled" type="submit">
             {{ editingLink.id ? $t('actions.save') : $t('settings.social-media.submit') }}
           </base-button>
-          <base-button v-if="editingLink.id" id="cancel" ghost @click="handleCancel()">
+          <base-button v-if="editingLink.id" id="cancel" danger @click="handleCancel()">
             {{ $t('actions.cancel') }}
           </base-button>
         </ds-space>