diff --git a/bootstrap-elements.html b/bootstrap-elements.html
index 64e05ce4..32e15ddc 100644
--- a/bootstrap-elements.html
+++ b/bootstrap-elements.html
@@ -508,7 +508,6 @@
           <h3><small>flat - default - no class needed</small></h3>
           <p class="bs-component">
             <a href="javascript:void(0)" class="btn"><code>btn</code> only</a>
-            <a href="javascript:void(0)" class="btn active"><code>.active</code></a>
             <a href="javascript:void(0)" class="btn btn-default">Default</a>
             <a href="javascript:void(0)" class="btn btn-primary">Primary</a>
             <a href="javascript:void(0)" class="btn btn-success">Success</a>
@@ -521,7 +520,6 @@
 
           <h3><small><code>.btn-raised</code></small></h3>
           <p class="bs-component">
-            <a href="javascript:void(0)" class="btn btn-raised active"><code>.active</code></a>
             <a href="javascript:void(0)" class="btn btn-raised btn-default">Default</a>
             <a href="javascript:void(0)" class="btn btn-raised btn-primary">Primary</a>
             <a href="javascript:void(0)" class="btn btn-raised btn-success">Success</a>
@@ -650,9 +648,12 @@
         
         
         <h3><small><code>btn-lg.btn-block.btn-raised</code></small></h3>
-        <p class="bs-component">
+        <div class="bs-component">
           <a href="javascript:void(0)" class="btn btn-default btn-lg btn-block btn-raised">Block level button</a>
-        </p>
+          <fieldset disabled>
+            <a href="javascript:void(0)" class="btn btn-default btn-lg btn-block btn-raised">Block level button disabled</a>
+          </fieldset>
+        </div>
 
 
         <div class="bs-component" style="margin-bottom: 15px;">
@@ -662,6 +663,15 @@
             <a href="javascript:void(0)" class="btn ">Middle</a>
             <a href="javascript:void(0)" class="btn ">Right</a>
           </div>
+
+          <h3><small>disabled <code>btn-group.btn-group-justified.btn-group-raised</code></small></h3>
+          <fieldset disabled>
+            <div class="btn-group btn-group-justified btn-group-raised">
+              <a href="javascript:void(0)" class="btn ">Left</a>
+              <a href="javascript:void(0)" class="btn ">Middle</a>
+              <a href="javascript:void(0)" class="btn ">Right</a>
+            </div>
+          </fieldset>
         </div>
 
         <div class="bs-component" style="margin-bottom: 15px;">
diff --git a/less/_buttons.less b/less/_buttons.less
index dd969664..7cce9aea 100644
--- a/less/_buttons.less
+++ b/less/_buttons.less
@@ -62,6 +62,7 @@
 
     &:not(.btn-link) {
       .shadow-2dp();
+
       &:hover {
 
         // Spec:
@@ -160,20 +161,36 @@
   i.material-icons {
     vertical-align: middle;
   }
+}
 
-  // Disabled text
-  // Spec:
-  //  - light theme: Disabled text: 26% #000000
-  //  - dark theme: Disabled text: 30% #FFFFFF
-  fieldset[disabled] &,
+// Disabled buttons and button groups
+.btn,
+.input-group-btn .btn,
+.btn-group {
+  // have to ratchet up the specificity to kill drop shadows on disabled raised buttons
+  fieldset[disabled][disabled] &,
   &.disabled,
-  &:disabled {
+  &:disabled,
+  &[disabled][disabled] {
+    // spec: light theme: Disabled text: 26% #000000
     color: fade(#000000, 26%);
     .theme-dark & {
+      // spec: dark theme: Disabled text: 30% #FFFFFF
       color: fade(#FFFFFF, 30%);
     }
 
     background: transparent;
+
+    // no box-shadow on disabled
+    &.btn-raised,
+    &.btn-group-raised {
+      &,
+      &.active,
+      &:active,
+      &:focus:not(:active) {
+        box-shadow: none;
+      }
+    }
   }
 }
 
@@ -203,7 +220,7 @@
     .shadow-2dp();
   }
 
-  & .btn+.btn,
+  & .btn + .btn,
   .btn,
   .btn:active,
   .btn-group {