diff --git a/core/includes/form.inc b/core/includes/form.inc
index 87f8edf..b3cb5bf 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2214,7 +2214,8 @@ function form_pre_render_button($element) {
 
   $element['#attributes']['class'][] = 'button';
   if (!empty($element['#button_type'])) {
-    $element['#attributes']['class'][] = 'button--' . $element['#button_type'];
+    $element_type = ($element['#button_type'] == 'danger') ? 'link--' : 'button--';
+    $element['#attributes']['class'][] = $element_type . $element['#button_type'];
   }
   // @todo Various JavaScript depends on this button class.
   $element['#attributes']['class'][] = 'form-submit';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
index 32120b2..da26f8a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
@@ -104,7 +104,7 @@ function testButtonClasses() {
     // by adding a space before and after.
     $this->assertEqual(2, count($this->xpath('//*[contains(concat(" ", @class, " "), " button ")]')));
     $this->assertEqual(1, count($this->xpath('//*[contains(concat(" ", @class, " "), " button--foo ")]')));
-    $this->assertEqual(1, count($this->xpath('//*[contains(concat(" ", @class, " "), " button--danger ")]')));
+    $this->assertEqual(1, count($this->xpath('//*[contains(concat(" ", @class, " "), " link--danger ")]')));
   }
 
   /**
diff --git a/core/themes/seven/css/components/buttons.theme.css b/core/themes/seven/css/components/buttons.theme.css
index 4ff9fa5..2ca4b4c 100644
--- a/core/themes/seven/css/components/buttons.theme.css
+++ b/core/themes/seven/css/components/buttons.theme.css
@@ -146,44 +146,41 @@
 }
 
 /**
- * We've temporarily added the danger button here, bit of a harsh reset but we
- * need it.
- * @todo replace with link--danger.
- * See https://drupal.org/node/2123731
+ * Style button with "link--danger" class as a link.
  */
-.button--danger {
-  display: inline;
-  cursor: pointer;
-  padding: 0;
-  border: 0;
+.link--danger {
+  background: none;
   border-radius: 0;
+  border: 0;
   box-shadow: none;
-  background: none;
-  -webkit-appearance: none;
-     -moz-appearance: none;
   color: #c72100;
+  cursor: pointer;
+  display: inline;
   font-weight: 400;
+  padding: 0;
   text-decoration: underline;
+     -moz-appearance: none;
+  -webkit-appearance: none;
 }
-.button--danger:focus,
-.button--danger:hover,
-.button--danger:active {
+.link--danger:focus,
+.link--danger:hover,
+.link--danger:active {
+  background: none;
+  border: 0;
+  box-shadow: none;
   color: #ff2a00;
+  padding: 0;
   text-decoration: underline;
   text-shadow: none;
-  padding: 0;
-  border: 0;
-  box-shadow: none;
-  background: none;
 }
-.button--danger:disabled,
-.button--danger.is-disabled {
- color: #737373;
- cursor: default;
- text-decoration: none;
- -webkit-font-smoothing: antialiased;
-  padding: 0;
+.link--danger:disabled,
+.link--danger.is-disabled {
+  background: none;
   border: 0;
   box-shadow: none;
-  background: none;
+  color: #737373;
+  cursor: default;
+  padding: 0;
+  text-decoration: none;
+  -webkit-font-smoothing: antialiased;
 }