diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss
index 0597b6666..00545fbeb 100644
--- a/app/assets/stylesheets/common/components/buttons.css.scss
+++ b/app/assets/stylesheets/common/components/buttons.css.scss
@@ -48,25 +48,22 @@ button {
   color: $primary;
   font-weight: normal;
   background: lighten($primary_lighter, 10%);
+
   &[href] {
     color: $btn-default-color;
   }
-  &:hover
-   {
+  &:hover {
     background: #aaa;
     color: #fff;
   }
   &:active {
-   @include linear-gradient( darken(#aaa, 8%), #aaa);
-    @include box-shadow(inset 0 1px 3px rgba($primary, 0.2));
+    @include linear-gradient( darken(#aaa, 8%), #aaa);
   }
   &[disabled] {
     background: $btn-default-background-color;
-    @include box-shadow(inset 0 -1px 2px rgba($primary, 0.2));
-    &:hover {color: $primary;}
+    &:hover { color: $primary; }
+    cursor: not-allowed;
   }
-
-
 }
 
 // Buttons used in admin panel
@@ -82,25 +79,18 @@ button {
   border: none;
   color: $secondary;
   font-weight: normal;
-
-    color: #fff;
-    background: $btn-primary-background-color;
-
-   
-
-
+  color: #fff;
+  background: $btn-primary-background-color;
 
   &[href] {
     color: $secondary;
   }
-  &:hover
-  {
+  &:hover {
     color: #fff;
     background: darken($btn-primary-background-color, 12%);
   }
   &:active {
     @include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%));
-    @include box-shadow(inset 0 1px 3px rgba($primary, 0.2));
     color: #fff;
   }
   &[disabled] {
@@ -114,7 +104,7 @@ button {
 .btn-danger {
   color: $secondary;
   font-weight: normal;
-  background: $btn-danger-background-color; 
+  background: $btn-danger-background-color;
   &[href] {
     color: $secondary;
   }
@@ -122,11 +112,10 @@ button {
     background: $btn-danger-background-color-dark;
   }
   &:active {
- @include linear-gradient($btn-primary-background-color-dark, $btn-primary-background-color);
-    @include box-shadow(inset 0 1px 3px rgba($primary, 0.2));
+    @include linear-gradient($btn-danger-background-color-dark, $btn-danger-background-color);
   }
   &[disabled] {
-  
+    background: $btn-danger-background-color;
   }
 }