diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 40160b2..1ecd819 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1092,7 +1092,6 @@ function install_settings_form($form, &$form_state, &$install_state) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['save'] = array(
     '#type' => 'submit',
-    '#button_type' => 'primary',
     '#value' => t('Save and continue'),
     '#limit_validation_errors' => array(
       array('driver'),
@@ -1385,7 +1384,6 @@ function install_select_profile_form($form, &$form_state, $install_state) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] =  array(
     '#type' => 'submit',
-    '#button_type' => 'primary',
     '#value' => t('Save and continue'),
   );
   return $form;
@@ -1582,7 +1580,6 @@ function install_select_language_form($form, &$form_state, $files = array()) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] =  array(
     '#type' => 'submit',
-    '#button_type' => 'primary',
     '#value' => t('Save and continue'),
   );
   return $form;
@@ -2471,7 +2468,6 @@ function _install_configure_form($form, &$form_state, &$install_state) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
-    '#button_type' => 'danger',
     '#value' => t('Save and continue'),
     '#weight' => 15,
   );
diff --git a/core/themes/seven/css/components/buttons.theme.css b/core/themes/seven/css/components/buttons.theme.css
index ee2ffa3..272c843 100644
--- a/core/themes/seven/css/components/buttons.theme.css
+++ b/core/themes/seven/css/components/buttons.theme.css
@@ -30,7 +30,6 @@
   font-size: 15px;
   /* @TODO uncomment once base typography from the style guide is in */
   /* font-size: 0.938rem; */
-
   -webkit-transition: all 0.1s;
   -moz-transition:    all 0.1s;
   -o-transition:      all 0.1s;
@@ -50,8 +49,7 @@
 .button:hover {
   box-shadow: 0 1px 2px hsla(0, 0%, 0%, 0.125);
 }
-.button:active,
-.button.is-active {
+.button:active {
   background-color: #dfdfd9;
   background-image: -webkit-linear-gradient(top, #d4d4cd, #ecebe5);
   background-image:    -moz-linear-gradient(top, #d4d4cd, #ecebe5);
@@ -66,10 +64,10 @@
 
 .button--primary {
   border-color: #1e5c90;
-  background-image: -webkit-linear-gradient(top, #0A7BC2, #096CAA);
-  background-image:    -moz-linear-gradient(top, #0A7BC2, #096CAA);
-  background-image:      -o-linear-gradient(top, #0A7BC2, #096CAA);
-  background-image:   linear-gradient(to bottom, #0A7BC2, #096CAA);
+  background-image: -webkit-linear-gradient(top, #007bc6, #0071b8);
+  background-image:    -moz-linear-gradient(top, #007bc6, #0071b8);
+  background-image:      -o-linear-gradient(top, #007bc6, #0071b8);
+  background-image:   linear-gradient(to bottom, #007bc6, #0071b8);
   color: #fff;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
   font-weight: 700;
@@ -78,10 +76,11 @@
 .button--primary:focus,
 .button--primary:hover {
   background-color: #2369a6;
-  background-image: -webkit-linear-gradient(top, #0B8BDA, #1C77B0);
-  background-image:    -moz-linear-gradient(top, #0B8BDA, #1C77B0);
-  background-image:      -o-linear-gradient(top, #0B8BDA, #1C77B0);
-  background-image:   linear-gradient(to bottom, #0B8BDA, #1C77B0);
+  background-image: -webkit-linear-gradient(top, #0c97ed, #1f86c7);
+  background-image:    -moz-linear-gradient(top, #0c97ed, #1f86c7);
+  background-image:      -o-linear-gradient(top, #0c97ed, #1f86c7);
+  background-image:   linear-gradient(to bottom, #0c97ed, #1f86c7);
+  border-color: #1e5c90;
   color: #fff;
 }
 .boxshadow .button--primary:focus {
@@ -90,13 +89,13 @@
 .button--primary:hover {
   box-shadow: 0 1px 2px hsla(203, 10%, 10%, 0.25);
 }
-.button--primary:active,
-.button--primary.is-active {
+.button--primary:active {
   background-image: -webkit-linear-gradient(top, #08639b, #0071b8);
   background-image:    -moz-linear-gradient(top, #08639b, #0071b8);
   background-image:      -o-linear-gradient(top, #08639b, #0071b8);
   background-image:   linear-gradient(to bottom, #08639b, #0071b8);
   border-color: #144b78;
+  box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.2);
 }
 
 /**
@@ -111,10 +110,12 @@
 }
 
 .button:disabled,
-.button.is-disabled {
+.button:disabled:active,
+.button.is-disabled,
+.button.is-disabled:active {
   border-color: #d4d4d4;
   background: #ededed;
-  box-shadow:         none;
+  box-shadow: none;
   color: #5c5c5c;
   font-weight: normal;
   cursor: default;
@@ -131,7 +132,7 @@
 /*.boxshadow*/ .button:focus {
   outline: none;
   border-color: #40b6ff;
-  box-shadow:         0 0 0.5em 0.1em hsla(203, 100%, 60%, 0.7);
+  box-shadow: 0 0 0.5em 0.1em hsla(203, 100%, 60%, 0.7);
 }
 /*.boxshadow*/ .button:active:focus,
 /*.boxshadow*/ .button.is-active:focus {
@@ -165,6 +166,7 @@
   cursor: pointer;
   padding: 0!important;
   border: 0!important;
+  border-radius: 0;
   box-shadow: none!important;
   background: none!important;
   -webkit-appearance: none;
@@ -177,6 +179,7 @@
 .button--danger:active {
   color: #ff2a00;
   text-decoration: underline;
+  text-shadow: none;
 }
 .button--danger:disabled,
 .button--danger.is-disabled {
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index a973559..a5464ea 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -153,6 +153,8 @@ function seven_menu_local_action($variables) {
   // Will be the existing classes array or NULL
   $classes = &$link['localized_options']['attributes']['class'];
   $classes = array_merge((array)$classes, array('button', 'button--primary', 'button--small'));
+  // We require modernizr for button styling
+  drupal_add_library('system', 'modernizr');
 
   // @TODO Replace with a generalized solution for icons.
   // See http://drupal.org/node/1849712
@@ -168,6 +170,16 @@ function seven_menu_local_action($variables) {
 }
 
 /**
+ * Implements hook_element_info_alter().
+ */
+function seven_element_info_alter(&$types) {
+  // We require modernizr for button styling
+  if (isset($types['button'])) {
+    drupal_add_library('system', 'modernizr');
+  }
+}
+
+/**
  * Implements hook_preprocess_install_page().
  */
 function seven_preprocess_install_page(&$variables) {
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 86ac064..68b7838 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -604,68 +604,6 @@ body div.form-type-radio div.description,
 body div.form-type-checkbox div.description {
   margin-left: 1.5em; /* LTR */
 }
-.button {
-  cursor: pointer;
-  padding: 4px 17px;
-  color: #5a5a5a;
-  text-align: center;
-  font-weight: normal;
-  font-size: 1.077em;
-  font-family: "Lucida Grande", Verdana, sans-serif;
-  border: 1px solid #e4e4e4;
-  border-bottom: 1px solid #b4b4b4;
-  border-left-color: #d2d2d2;
-  border-right-color: #d2d2d2;
-  background-color: #e4e4e4;
-  border-radius: 20px;
-  text-decoration: none;
-}
-.button:focus,
-.button:hover {
-  background-color: #c0c0c0;
-  border: 1px solid #bebebe;
-  border-left-color: #afafaf;
-  border-right-color: #afafaf;
-  border-bottom-color: #9b9b9b;
-  color: #2e2e2e;
-  text-decoration: none;
-}
-.button:active {
-  background-color: #565656;
-  border: 1px solid #333;
-  border-left-color: #222;
-  border-right-color: #222;
-  border-bottom-color: #111;
-  color: #fff;
-  text-decoration: none;
-  text-shadow: #222 0 -1px 0;
-}
-.button-primary {
-  background-color: #9dcae7;
-  border: 1px solid #8eB7cd;
-  border-bottom-color: #7691a2;
-  color: #133B54;
-}
-.button-primary:focus,
-.button-primary:hover {
-  background-color: #73b3dd;
-  border: 1px solid #6ea3bf;
-  border-bottom-color: #4680a0;
-}
-.button-primary:active {
-  background-color: #3981b1;
-  border: 1px solid #36647c;
-  border-bottom-color: #284657;
-}
-.button-disabled,
-.button-disabled:active,
-.button[disabled],
-.button[disabled]:active {
-  background-color: #eee;
-  border-color: #eee;
-  text-shadow: none;
-  color: #999;
-}
 input.form-autocomplete,
 input.form-text,
 input.form-tel,
@@ -711,42 +649,6 @@ select.form-select:focus {
 .js input.throbbing {
   background-position: 100% -16px;
 }
-.button-action {
-  background: #1078d4;
-  background-image: -webkit-linear-gradient(top, #419ff1, #1076d5);
-  background-image: -moz-linear-gradient(top, #419ff1, #1076d5);
-  background-image: -o-linear-gradient(top, #419ff1, #1076d5);
-  background-image: linear-gradient(to bottom, #419ff1, #1076d5);
-  border: 1px solid #0048c8;
-  border-radius: .4em;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4);
-  color: #fff;
-  font-size: 1em;
-  line-height: normal;
-  margin: 0;
-  padding: 4px 1em;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
-}
-.button-action:focus,
-.button-action:hover {
-  background-color: #419cf1;
-  background-image: -webkit-linear-gradient(top, #59abf3, #2a90ef);
-  background-image: -moz-linear-gradient(top, #59abf3, #2a90ef);
-  background-image: -o-linear-gradient(top, #59abf3, #2a90ef);
-  background-image: linear-gradient(to bottom, #59abf3, #2a90ef);
-  border: 1px solid #0048c8;
-  color: #fff;
-}
-.button-action:active {
-  background-color: #0e69be;
-  background-image: -webkit-linear-gradient(top, #0e69be, #2a93ef);
-  background-image: -moz-linear-gradient(top, #0e69be, #2a93ef);
-  background-image: -o-linear-gradient(top, #0e69be, #2a93ef);
-  background-image: -ms-linear-gradient(top, #0e69be, #2a93ef);
-  background-image: linear-gradient(to bottom, #0e69be, #2a93ef);
-  border: 1px solid #0048c8;
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, .25);
-}
 
 /**
  * Improve spacing of cancel link.