diff --git a/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php b/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
index a174e31..3a9de3c 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
@@ -83,7 +83,12 @@ public function form(array $form, array &$form_state) {
   protected function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
     $actions['submit']['#value'] = $this->getConfirmText();
-    unset($actions['delete']);
+
+    // If we have a delete action, remove it and infer that our submit action is dangerous
+    if (isset($actions['delete'])) {
+      unset($actions['delete']);
+      $actions['submit']['#button_type'] = 'primary-danger';
+    }
 
     // Prepare cancel link.
     $actions['cancel'] = ConfirmFormHelper::buildCancelLink($this, $this->getRequest());
diff --git a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
index a86d646..d968b99 100644
--- a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
@@ -78,7 +78,12 @@ public function buildForm(array $form, array &$form_state) {
   protected function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
     $actions['submit']['#value'] = $this->getConfirmText();
-    unset($actions['delete']);
+
+    // If we have a delete action, remove it and infer that our submit action is dangerous
+    if (isset($actions['delete'])) {
+      unset($actions['delete']);
+      $actions['submit']['#button_type'] = 'primary-danger';
+    }
 
     // Prepare cancel link.
     $actions['cancel'] = ConfirmFormHelper::buildCancelLink($this, $this->getRequest());
diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index 8533e69..02b0f8c 100644
--- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -171,6 +171,7 @@ public function buildForm(array $form, array &$form_state) {
       $form['actions']['remove'] = array(
         '#type' => 'submit',
         '#value' => $this->t('Remove'),
+        '#button_type' => 'primary-danger',
         '#submit' => array(array($this, 'remove')),
         '#limit_validation_errors' => array(array('override')),
         '#ajax' => array(