diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e2370e2..6e1b5c4 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -23,3 +23,20 @@
   color: #5a5a5a;
   background: #dedede;
 }
+.button.is-disabled,
+.button.is-disabled:hover,
+.button.is-disabled:active,
+.button.is-disabled:focus
+ {
+  background: #ededed;
+  border-color: #bbb;
+  color: #717171;
+  cursor: default;
+}
+.image-button.is-disabled,
+.image-button.is-disabled:hover,
+.image-button.is-disabled:active,
+.image-button.is-disabled:focus {
+  opacity: .5;
+  cursor: default;
+}
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 82377ad..2975652 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -138,23 +138,12 @@ 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;
+  cursor: default;
 }
 .form-disabled label {
   color: #717171;