diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e2370e2..90c800e 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -21,5 +21,16 @@
 .button:focus {
   text-decoration: none;
   color: #5a5a5a;
-  background: #dedede;
+  background: none;
+}
+.button.is-disabled {
+  background: #ededed;
+  border-color: #bbb;
+  color: #717171;
+  cursor: default;
+}
+.image-button.is-disabled {
+  background: #ededed;
+  opacity: 0.5;
+  cursor: default;
 }
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 82377ad..84fa88e 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -138,24 +138,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;
 }