diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts
index 8c6eb12ce6..b163d254dd 100644
--- a/ionic/components/checkbox/checkbox.ts
+++ b/ionic/components/checkbox/checkbox.ts
@@ -29,12 +29,9 @@ import {Icon} from '../icon/icon';
   '<div class="item-media media-checkbox" (click)="onClick($event)">' +
     '<icon [name]="iconOff" class="checkbox-off"></icon>' +
     '<icon [name]="iconOn" class="checkbox-on"></icon>' +
-    '<content select="input"></content>' +
   '</div>' +
   '<div class="item-content">' +
-    '<div class="item-label">' +
-      '<content></content>' +
-    '</div>' +
+    '<content></content>' +
   '</div>'
 })
 export class Checkbox extends Ion {
diff --git a/ionic/components/checkbox/test/basic/main.html b/ionic/components/checkbox/test/basic/main.html
index ae2a54024a..b7b035ea7a 100644
--- a/ionic/components/checkbox/test/basic/main.html
+++ b/ionic/components/checkbox/test/basic/main.html
@@ -2,7 +2,7 @@
   <form (^submit)="doSubmit($event)" [ng-form-model]="fruitsForm">
       <ion-checkbox icon-on="ion-android-checkmark-circle"><input #apple type="checkbox" ng-control="appleCtrl"></ion-checkbox>
 
-      <ion-checkbox><input #banana type="checkbox" ng-control="bananaCtrl"><span>Test</span></ion-checkbox>
+      <ion-checkbox><label>Test</label><input #banana type="checkbox" ng-control="bananaCtrl"></ion-checkbox>
 
       <!-- <ion-checkbox ng-control="appleCtrl">
         Apples