diff --git a/src/components/button/button.js b/src/components/button/button.js
index 4f199895cf3..8bc32094b74 100644
--- a/src/components/button/button.js
+++ b/src/components/button/button.js
@@ -38,7 +38,7 @@ angular.module('material.components.button', [
  *  <md-button href="http://google.com" class="md-button-colored">
  *    I'm a link
  *  </md-button>
- *  <md-button disabled class="md-colored">
+ *  <md-button ng-disabled="true" class="md-colored">
  *    I'm a disabled button
  *  </md-button>
  * </hljs>
@@ -58,12 +58,11 @@ function MdButtonDirective($mdInkRipple, $mdTheming, $mdAria) {
   }
   
   function getTemplate(element, attr) {
-    var tag = isAnchor(attr) ? 'a' : 'button';
-    //We need to manually pass disabled to the replaced element because
-    //of a bug where it isn't always passed.
-    var disabled = element[0].hasAttribute('disabled') ? ' disabled ' : ' ';
-
-    return '<' + tag + disabled + 'class="md-button" ng-transclude></' + tag + '>';
+    if (isAnchor(attr)) {
+      return '<a class="md-button" ng-transclude></a>';
+    } else {
+      return '<button class="md-button" ng-transclude></button>';
+    }
   }
 
   function postLink(scope, element, attr) {
@@ -79,9 +78,7 @@ function MdButtonDirective($mdInkRipple, $mdTheming, $mdAria) {
     // For anchor elements, we have to set tabindex manually when the 
     // element is disabled
     if (isAnchor(attr)) {
-      scope.$watch(function() {
-        return node.hasAttribute('disabled');
-      }, function(isDisabled) {
+      scope.$watch(attr.ngDisabled, function(isDisabled) {
         element.attr('tabindex', isDisabled ? -1 : 0);
       });
     }
diff --git a/src/components/button/button.spec.js b/src/components/button/button.spec.js
index 2b610171e4b..c58020d9d7e 100644
--- a/src/components/button/button.spec.js
+++ b/src/components/button/button.spec.js
@@ -21,12 +21,6 @@ describe('md-button', function() {
     expect(button[0].tagName.toLowerCase()).toEqual('button');
   }));
 
-  it('should pass in disabled attribute (testing our DOM bug-fix)', inject(function($compile, $rootScope) {
-    var button = $compile('<md-button disabled>')($rootScope.$new());
-    $rootScope.$apply();
-    expect(button[0].hasAttribute('disabled')).toBe(true);
-  }));
-
   it('should expect an aria-label if element has no text', inject(function($compile, $rootScope, $log) {
     spyOn($log, 'warn');
     var button = $compile('<md-button><md-icon></md-icon></md-button>')($rootScope);
diff --git a/src/components/button/demoBasicUsage/index.html b/src/components/button/demoBasicUsage/index.html
index 5ba8bc35876..70a26eb74c1 100644
--- a/src/components/button/demoBasicUsage/index.html
+++ b/src/components/button/demoBasicUsage/index.html
@@ -13,7 +13,7 @@
     <section layout="vertical" layout-sm="horizontal" layout-align="center center">
       <md-button class="md-raised">Button</md-button>
       <md-button class="md-raised md-primary">Primary</md-button>
-      <md-button disabled class="md-raised md-primary">Disabled</md-button>
+      <md-button ng-disabled="true" class="md-raised md-primary">Disabled</md-button>
       <md-button class="md-raised md-warn">Warn</md-button>
       <div class="label">raised</div>
     </section>
@@ -27,7 +27,7 @@
         <md-icon icon="/img/icons/ic_insert_drive_file_24px.svg" style="width: 24px; height: 24px;"></md-icon>
       </md-button>
 
-        <md-button class="md-fab" disabled aria-label="Comment">
+        <md-button class="md-fab" ng-disabled="true" aria-label="Comment">
             <md-icon icon="/img/icons/ic_comment_24px.svg" style="width: 24px; height: 24px;"></md-icon>
         </md-button>
 
diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
index d6e7e976f9d..68d2e92f871 100644
--- a/src/components/checkbox/checkbox.js
+++ b/src/components/checkbox/checkbox.js
@@ -26,7 +26,6 @@ angular.module('material.components.checkbox', [
  * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
  * @param {string=} ngChange Angular expression to be executed when input changes due to user interaction with the input element.
  * @param {boolean=} mdNoInk Use of attribute indicates use of ripple ink effects
- * @param {boolean=} disabled Use of attribute indicates the switch is disabled: no ink effects and not selectable
  * @param {string=} ariaLabel Publish the button label used by screen-readers for accessibility. Defaults to the checkbox's text.
  *
  * @usage
@@ -39,7 +38,7 @@ angular.module('material.components.checkbox', [
  *   No Ink Effects
  * </md-checkbox>
  *
- * <md-checkbox disabled ng-model="isDisabled" aria-label="Disabled">
+ * <md-checkbox ng-disabled="true" ng-model="isDisabled" aria-label="Disabled">
  *   Disabled
  * </md-checkbox>
  *
diff --git a/src/components/checkbox/checkbox.spec.js b/src/components/checkbox/checkbox.spec.js
index c875a2a1dbc..bb1947ec62e 100644
--- a/src/components/checkbox/checkbox.spec.js
+++ b/src/components/checkbox/checkbox.spec.js
@@ -52,18 +52,19 @@ describe('mdCheckbox', function() {
 
   it('should be disabled with disabled attr', inject(function($compile, $rootScope) {
     var element = $compile('<div>' +
-                             '<md-checkbox disabled ng-model="blue">' +
+                             '<md-checkbox ng-disabled="isDisabled" ng-model="blue">' +
                              '</md-checkbox>' +
                            '</div>')($rootScope);
 
     var checkbox = element.find('md-checkbox');
+    $rootScope.$apply('isDisabled = true');
 
     $rootScope.$apply('blue = false');
 
     checkbox.triggerHandler('click');
     expect($rootScope.blue).toBe(false);
 
-    checkbox.removeAttr('disabled');
+    $rootScope.$apply('isDisabled = false');
 
     checkbox.triggerHandler('click');
     expect($rootScope.blue).toBe(true);
diff --git a/src/components/checkbox/demoBasicUsage/index.html b/src/components/checkbox/demoBasicUsage/index.html
index f0620ecda6a..259f77f77af 100644
--- a/src/components/checkbox/demoBasicUsage/index.html
+++ b/src/components/checkbox/demoBasicUsage/index.html
@@ -9,11 +9,11 @@
     Checkbox 2: {{ data.cb2 }}
   </md-checkbox>
 
-  <md-checkbox disabled aria-label="Disabled checkbox">
+  <md-checkbox ng-disabled="true" aria-label="Disabled checkbox">
     Checkbox (Disabled)
   </md-checkbox>
 
-  <md-checkbox disabled aria-label="Disabled checked checkbox" ng-model="data.cb4" ng-init="data.cb4=true">
+  <md-checkbox ng-disabled="true" aria-label="Disabled checked checkbox" ng-model="data.cb4" ng-init="data.cb4=true">
     Checkbox (Disabled, Checked)
   </md-checkbox>
 
diff --git a/src/components/radioButton/radioButton.spec.js b/src/components/radioButton/radioButton.spec.js
index cda14db073f..ea2e4763272 100644
--- a/src/components/radioButton/radioButton.spec.js
+++ b/src/components/radioButton/radioButton.spec.js
@@ -132,15 +132,16 @@ describe('radioButton', function() {
 
     it('should be disabled', inject(function($compile, $rootScope) {
       var element = $compile('<md-radio-group ng-model="color">' +
-                              '<md-radio-button value="white" disabled></md-radio-button>' +
+                              '<md-radio-button value="white" ng-disabled="isDisabled"></md-radio-button>' +
                               '</md-radio-group>')($rootScope);
       var radio = element.find('md-radio-button');
 
+      $rootScope.$apply('isDisabled = true');
       $rootScope.$apply('color = null');
       radio.triggerHandler('click');
       expect($rootScope.color).toBe(null);
 
-      radio.removeAttr('disabled');
+      $rootScope.$apply('isDisabled = false');
       radio.triggerHandler('click');
       expect($rootScope.color).toBe('white');
     }));
diff --git a/src/components/slider/demoBasicUsage/index.html b/src/components/slider/demoBasicUsage/index.html
index 11d351f6f2a..474611732e0 100644
--- a/src/components/slider/demoBasicUsage/index.html
+++ b/src/components/slider/demoBasicUsage/index.html
@@ -44,12 +44,12 @@ <h3>Rating: {{rating}}/5</h3>
     </md-slider>
 
     <h3>Disabled</h3>
-    <md-slider ng-model="disabled1" disabled aria-label="Disabled 1"></md-slider>
-    <md-slider ng-model="disabled2" disabled aria-label="Disabled 2"></md-slider>
+    <md-slider ng-model="disabled1" ng-disabled="true" aria-label="Disabled 1"></md-slider>
+    <md-slider ng-model="disabled2" ng-disabled="true" aria-label="Disabled 2"></md-slider>
 
     <h3>Disabled, Discrete</h3>
-    <md-slider ng-model="disabled1" disabled step="3" md-discrete min="0" max="10" aria-label="Disabled discrete 1"></md-slider>
-    <md-slider ng-model="disabled2" disabled step="10" md-discrete aria-label="Disabled discrete 2"></md-slider>
+    <md-slider ng-model="disabled1" ng-disabled="true" step="3" md-discrete min="0" max="10" aria-label="Disabled discrete 1"></md-slider>
+    <md-slider ng-model="disabled2" ng-disabled="true" step="10" md-discrete aria-label="Disabled discrete 2"></md-slider>
 
   </md-content>
 </div>
diff --git a/src/components/slider/slider.js b/src/components/slider/slider.js
index 6b3528422d4..9454f2a2291 100644
--- a/src/components/slider/slider.js
+++ b/src/components/slider/slider.js
@@ -112,8 +112,6 @@ function SliderController($scope, $element, $attrs, $$rAF, $window, $mdAria, $md
     var stopDisabledWatch = angular.noop;
     if ($attrs.ngDisabled) {
       stopDisabledWatch = $scope.$parent.$watch($attrs.ngDisabled, updateAriaDisabled);
-    } else {
-      updateAriaDisabled(!!$attrs.disabled);
     }
 
     $mdAria.expect($element, 'aria-label');
diff --git a/src/components/sticky/sticky.js b/src/components/sticky/sticky.js
index 62aeaa7895a..128f68eed0b 100644
--- a/src/components/sticky/sticky.js
+++ b/src/components/sticky/sticky.js
@@ -112,9 +112,6 @@ function MdSticky($document, $mdConstant, $compile, $$rAF, $mdUtil) {
     }
 
     function refreshElements() {
-      var contentRect = contentEl[0].getBoundingClientRect();
-
-
       // Sort our collection of elements by their current position in the DOM.
       // We need to do this because our elements' order of being added may not
       // be the same as their order of display.
diff --git a/src/components/switch/demoBasicUsage/index.html b/src/components/switch/demoBasicUsage/index.html
index fe3c2f9463d..c400d520568 100644
--- a/src/components/switch/demoBasicUsage/index.html
+++ b/src/components/switch/demoBasicUsage/index.html
@@ -7,11 +7,11 @@
     Switch 2: {{ data.cb2 }}
   </md-switch>
 
-  <md-switch disabled aria-label="Disabled switch">
+  <md-switch ng-disabled="true" aria-label="Disabled switch">
     Switch (Disabled)
   </md-switch>
 
-  <md-switch disabled aria-label="Disabled active switch" ng-model="data.cb4" ng-init="data.cb4=true">
+  <md-switch ng-disabled="true" aria-label="Disabled active switch" ng-model="data.cb4" ng-init="data.cb4=true">
     Switch (Disabled, Active)
   </md-switch>
 
diff --git a/src/components/switch/switch.js b/src/components/switch/switch.js
index f296fe13cbb..74d955ff1d9 100644
--- a/src/components/switch/switch.js
+++ b/src/components/switch/switch.js
@@ -29,7 +29,6 @@ angular.module('material.components.switch', [
  * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
  * @param {string=} ngChange Angular expression to be executed when input changes due to user interaction with the input element.
  * @param {boolean=} mdNoInk Use of attribute indicates use of ripple ink effects.
- * @param {boolean=} disabled Use of attribute indicates the switch is disabled: no ink effects and not selectable
  * @param {string=} ariaLabel Publish the button label used by screen-readers for accessibility. Defaults to the switch's text.
  *
  * @usage
@@ -42,7 +41,7 @@ angular.module('material.components.switch', [
  *   No Ink Effects
  * </md-switch>
  *
- * <md-switch disabled ng-model="isDisabled" aria-label="Disabled">
+ * <md-switch ng-disabled="true" ng-model="isDisabled" aria-label="Disabled">
  *   Disabled
  * </md-switch>
  *
@@ -65,17 +64,11 @@ function MdSwitch(mdCheckboxDirective, mdRadioButtonDirective, $mdTheming) {
   };
 
   function compile(element, attr) {
-    
     var thumb = angular.element(element[0].querySelector('.md-switch-thumb'));
-    //Copy down disabled attributes for checkboxDirective to use
-    thumb.attr('disabled', attr.disabled);
-    thumb.attr('ngDisabled', attr.ngDisabled);
-
     var checkboxLink = checkboxDirective.compile(thumb, attr);
 
     return function (scope, element, attr, ngModelCtrl) {
       $mdTheming(element);
-      var thumb = angular.element(element[0].querySelector('.md-switch-thumb'));
       return checkboxLink(scope, thumb, attr, ngModelCtrl);
     };
   }
diff --git a/src/components/tabs/demoStaticTabs/index.html b/src/components/tabs/demoStaticTabs/index.html
index 792e4ee938e..ed8316bf1f1 100644
--- a/src/components/tabs/demoStaticTabs/index.html
+++ b/src/components/tabs/demoStaticTabs/index.html
@@ -1,6 +1,6 @@
 <div ng-controller="AppCtrl">
 
-    <md-tabs md-selected="data.selectedIndex"  center>
+    <md-tabs selected="data.selectedIndex">
       <md-tab id="tab1" aria-controls="tab1-content">
         Item One
       </md-tab>
diff --git a/src/components/tabs/js/tabItemController.js b/src/components/tabs/js/tabItemController.js
index 14f0a6ea35a..6c9c75e9b34 100644
--- a/src/components/tabs/js/tabItemController.js
+++ b/src/components/tabs/js/tabItemController.js
@@ -5,7 +5,7 @@
 angular.module('material.components.tabs')
   .controller('$mdTab', TabItemController);
 
-function TabItemController($scope, $element, $compile, $animate, $mdUtil) {
+function TabItemController($scope, $element, $attrs, $compile, $animate, $mdUtil, $parse) {
   var self = this;
 
   // Properties
@@ -20,8 +20,9 @@ function TabItemController($scope, $element, $compile, $animate, $mdUtil) {
   self.onSelect = onSelect;
   self.onDeselect = onDeselect;
 
+  var disabledParsed = $parse($attrs.ngDisabled);
   function isDisabled() {
-    return $element[0].hasAttribute('disabled');
+    return disabledParsed($scope.$parent);
   }
   
   /**
diff --git a/src/components/tabs/tabs.spec.js b/src/components/tabs/tabs.spec.js
index d4c8df504d6..3fd761b6401 100644
--- a/src/components/tabs/tabs.spec.js
+++ b/src/components/tabs/tabs.spec.js
@@ -175,11 +175,11 @@ describe('<md-tabs>', function() {
       tabs.scope().$apply('disabled0 = true');
       expect(tabItems.eq(1)).toBeActiveTab();
       expect(tabItems.eq(0).attr('aria-disabled')).toBe('true');
-      expect(tabItems.eq(1).attr('aria-disabled')).toBe('false');
+      expect(tabItems.eq(1).attr('aria-disabled')).not.toBe('true');
 
       tabs.scope().$apply('disabled0 = false; disabled1 = true');
       expect(tabItems.eq(0)).toBeActiveTab();
-      expect(tabItems.eq(0).attr('aria-disabled')).toBe('false');
+      expect(tabItems.eq(0).attr('aria-disabled')).not.toBe('true');
       expect(tabItems.eq(1).attr('aria-disabled')).toBe('true');
     });
 
diff --git a/src/components/textField/textField.js b/src/components/textField/textField.js
index 39e04a9b5ec..2d62eb5ae06 100644
--- a/src/components/textField/textField.js
+++ b/src/components/textField/textField.js
@@ -36,13 +36,13 @@ angular.module('material.components.textField', [
  * <md-text-float label="LastName" ng-model="user.lastName" > </md-text-float>
  *
  * <!-- Specify a read-only input field by using the `disabled` attribute -->
- * <md-text-float label="Company"  ng-model="user.company"    disabled > </md-text-float>
+ * <md-text-float label="Company"  ng-model="user.company" ng-disabled="true" > </md-text-float>
  *
  * <!-- Specify an input type if desired. -->
  * <md-text-float label="eMail"    ng-model="user.email" type="email" ></md-text-float>
  * </hljs>
  */
-function mdTextFloatDirective($mdTheming, $mdUtil) {
+function mdTextFloatDirective($mdTheming, $mdUtil, $parse) {
   return {
     restrict: 'E',
     replace: true,
@@ -59,26 +59,20 @@ function mdTextFloatDirective($mdTheming, $mdUtil) {
 
       return {
         pre : function(scope, element, attrs) {
-          // transpose `disabled` flag
-          if ( angular.isDefined(attrs.disabled) ) {
-            element.attr('disabled', true);
-            scope.isDisabled = true;
-          }
+          var disabledParsed = $parse(attrs.ngDisabled);
+          scope.isDisabled = function() {
+            return disabledParsed(scope.$parent);
+          };
 
           scope.inputType = attrs.type || "text";
-          element.removeAttr('type');
-
-          // transpose optional `class` settings
-          element.attr('class', attrs.class );
-
         },
         post: $mdTheming
       };
     },
     template:
-    '<md-input-group ng-disabled="isDisabled" tabindex="-1">' +
+    '<md-input-group tabindex="-1">' +
     ' <label for="{{fid}}" >{{label}}</label>' +
-    ' <md-input id="{{fid}}" ng-model="value" type="{{inputType}}"></md-input>' +
+    ' <md-input id="{{fid}}" ng-disabled="isDisabled()" ng-model="value" type="{{inputType}}"></md-input>' +
     '</md-input-group>'
   };
 }
@@ -148,15 +142,11 @@ function mdInputDirective($mdUtil) {
       var inputGroupCtrl = ctrls[0];
       var ngModelCtrl = ctrls[1];
 
-      // scan for disabled and transpose the `type` value to the <input> element
-      var parent = element[0].parentNode;
-      var isDisabled = parent && parent.hasAttribute('disabled');
-
-      element.attr({
-        'tabindex': isDisabled ? -1 : 0,
-        'aria-disabled': isDisabled ? 'true' : 'false',
-        'type': attr.type || element.parent().attr('type') || "text"
+      scope.$watch(scope.isDisabled, function(isDisabled) {
+        element.attr('aria-disabled', !!isDisabled);
+        element.attr('tabindex', !!isDisabled);
       });
+      element.attr('type', attr.type || element.parent().attr('type') || "text");
 
       // When the input value changes, check if it "has" a value, and
       // set the appropriate class on the input group
@@ -191,7 +181,7 @@ function mdInputDirective($mdUtil) {
       function isNotEmpty(value) {
         value = angular.isUndefined(value) ? element.val() : value;
         return (angular.isDefined(value) && (value!==null) &&
-               (value.toString().trim() != ""));
+               (value.toString().trim() !== ""));
       }
     }
   };
diff --git a/src/components/textField/textField.spec.js b/src/components/textField/textField.spec.js
index 2ced9a8c079..e39b914568a 100644
--- a/src/components/textField/textField.spec.js
+++ b/src/components/textField/textField.spec.js
@@ -215,7 +215,7 @@ describe('Text Field directives', function() {
     });
 
     it('should add an ARIA attribute for disabled inputs', function() {
-      var markup ='<md-text-float disabled ' +
+      var markup ='<md-text-float ng-disabled="true" ' +
                   '  label="{{labels.firstName}}" ' +
                   '  ng-model="user.firstName" >' +
                   '</md-text-float>';
diff --git a/src/core/services/ripple/ripple.js b/src/core/services/ripple/ripple.js
index 4b1468f4f72..7c259d8b959 100644
--- a/src/core/services/ripple/ripple.js
+++ b/src/core/services/ripple/ripple.js
@@ -67,8 +67,9 @@ function InkRippleService($window, $timeout) {
     };
 
     function rippleIsAllowed() {
+      var parent;
       return !element[0].hasAttribute('disabled') &&
-          !(element[0].parentNode && element[0].parentNode.hasAttribute('disabled'));
+          !((parent = element[0].parentNode) && parent.hasAttribute('disabled'));
     }
 
     function removeElement(element, wait) {