diff --git a/core/misc/configure-dark.png b/core/misc/configure-dark.png
new file mode 100644
index 000000000000..853ae5a1cec9
Binary files /dev/null and b/core/misc/configure-dark.png differ
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 0be7ffe735dd..29d586e4fbe0 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -1104,7 +1104,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
         $table[$name]['settings_edit'] = $base_button + array(
           '#type' => 'image_button',
           '#name' => $name . '_formatter_settings_edit',
-          '#src' => 'core/misc/configure.png',
+          '#src' => 'core/misc/configure-dark.png',
           '#attributes' => array('class' => array('field-formatter-settings-edit'), 'alt' => t('Edit')),
           '#op' => 'edit',
           // Do not check errors for the 'Edit' button, but make sure we get
diff --git a/core/themes/seven/images/buttons.png b/core/themes/seven/images/buttons.png
index ae833d5f8f17..0a89f98ea1f3 100644
Binary files a/core/themes/seven/images/buttons.png and b/core/themes/seven/images/buttons.png differ
diff --git a/core/themes/seven/jquery.ui.theme.css b/core/themes/seven/jquery.ui.theme.css
index 9245d947a652..ee7249783bff 100644
--- a/core/themes/seven/jquery.ui.theme.css
+++ b/core/themes/seven/jquery.ui.theme.css
@@ -361,10 +361,22 @@
   background: url(images/buttons.png) 0 0 repeat-x;
   border-radius: 20px;
 }
+.ui-dialog .ui-dialog-buttonpane button:hover,
+.ui-dialog .ui-dialog-buttonpane button:focus {
+  background-position: 0 -40px;
+  border: 1px solid #bebebe;
+  border-left-color: #afafaf;
+  border-right-color: #afafaf;
+  border-bottom-color: #9b9b9b;
+  color: #2e2e2e;
+}
 .ui-dialog .ui-dialog-buttonpane button:active {
-  background: #666;
+  background-position: 0 -80px;
+  border: 1px solid #333;
+  border-left-color: #222;
+  border-right-color: #222;
+  border-bottom-color: #111;
   color: #fff;
-  border-color: #555;
   text-shadow: #222 0px -1px 0px;
 }
 .overlay {
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 80a5874ae274..86f3fc52f381 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -621,21 +621,26 @@ a.button:visited,
 a.button:hover,
 a.button:active {
   text-decoration: none;
-  color: #5a5a5a;
 }
-.node-form input#edit-submit,
-.node-form input#edit-submit-1 {
-  border: 1px solid #8eB7cd;
-  border-left-color: #8eB7cd;
-  border-right-color: #8eB7cd;
-  border-bottom-color: #7691a2;
-  background: url(images/buttons.png) 0 -40px repeat-x;
-  color: #133B54;
+input.form-submit:hover,
+input.form-submit:focus,
+a.button:hover,
+a.button:focus {
+  background-position: 0 -40px;
+  border: 1px solid #bebebe;
+  border-left-color: #afafaf;
+  border-right-color: #afafaf;
+  border-bottom-color: #9b9b9b;
+  color: #2e2e2e;
 }
-input.form-submit:active {
-  background: #666;
+input.form-submit:active,
+a.button:active {
+  background-position: 0 -80px;
+  border: 1px solid #333;
+  border-left-color: #222;
+  border-right-color: #222;
+  border-bottom-color: #111;
   color: #fff;
-  border-color: #555;
   text-shadow: #222 0 -1px 0;
 }
 input.form-button-disabled,