diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e4a5467fe7bc51c46540be0d4bcad3b9ebc942cc..14992b38e240ad50d1167e09603fb91c0d1c53e9 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -20,7 +20,24 @@
 .button:hover,
 .button:active,
 .button:focus {
-  text-decoration: none;
-  color: #5a5a5a;
   background: #dedede;
+  color: #5a5a5a;
+  text-decoration: none;
+}
+.button.is-disabled:hover,
+.button.is-disabled:active,
+.button.is-disabled:focus,
+.button.is-disabled {
+  background: #ededed;
+  border-color: #bbb;
+  color: #717171;
+  cursor: default;
+}
+.image-button.is-disabled:hover,
+.image-button.is-disabled:active,
+.image-button.is-disabled:focus,
+.image-button.is-disabled {
+  background: transparent;
+  opacity: 0.5;
+  cursor: default;
 }
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 69a0a72c3e1cbdd8532242be9431aa41d877eeb2..a5cfcf6731663859896dc8bbd5bf6d994f71b97e 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -171,24 +171,11 @@ input.form-submit:focus {
 /* Disabled form elements */
 .form-disabled input,
 .form-disabled select,
-.form-disabled textarea,
-.form-button-disabled,
-.form-button-disabled:hover,
-.form-button-disabled:active,
-.form-button-disabled:focus
- {
+.form-disabled textarea {
   background: #ededed;
   border-color: #bbb;
   color: #717171;
 }
-.image-button-disabled,
-.image-button-disabled:hover,
-.image-button-disabled:active,
-.image-button-disabled:focus {
-  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
 .form-disabled label {
   color: #717171;
 }