diff --git a/assets/scripts/app/helpers/handlebars.coffee b/assets/scripts/app/helpers/handlebars.coffee
index 5d08f647..f90f0f9c 100644
--- a/assets/scripts/app/helpers/handlebars.coffee
+++ b/assets/scripts/app/helpers/handlebars.coffee
@@ -23,6 +23,7 @@ LabelView = Ember.View.extend(
   tagName: 'label'
 
   attributeBindings: ['for', 'accesskey', 'form']
+  classNameBindings: ['class']
 )
 
 Ember.Handlebars.registerHelper('label', (options) ->
diff --git a/assets/styles/components/travis-switch.sass b/assets/styles/components/travis-switch.sass
index ccf1f16a..f217ff46 100644
--- a/assets/styles/components/travis-switch.sass
+++ b/assets/styles/components/travis-switch.sass
@@ -11,15 +11,15 @@ p.settings-row
   position: relative
   display: inline-block
   float: left
-  width: 60px
-  height: 18px
+  width: 5em
+  height: 1.52em
   margin: 20px 0 50px 0
-  padding: 5px 18px 5px 18px
+  padding: 0.42em 1.5em
   background-color: #F5F5F5
   border: 1px solid #E3E1E1
   border-radius: 4px
-  line-height: 19px
-  font-size: 11px
+  line-height: 1.58em
+  font-size: 12px
   color: #999999
   cursor: pointer
   text-align: right
@@ -28,15 +28,13 @@ p.settings-row
     position: absolute
     top: 1px
     left: 1px
-    width: 42px
-    height: 24px
+    width: 3.5em
+    height: 2em
     background: #e9e9e7
     border: 1px solid #d7d4d4
     border-radius: 2px
 
 .travis-switch.active
-  width: 60px
-  padding: 5px 18px 5px 18px
   background-color: #607A83
   border-radius: 4px
   color: #ffffff
@@ -45,8 +43,6 @@ p.settings-row
   &:before
     left: auto
     right: 1px
-    width: 42px
-    height: 24px
     border: 1px solid #9cafb5
 
 span.on