diff --git a/assets/scripts/app/templates/env_vars/_form.hbs b/assets/scripts/app/templates/env_vars/_form.hbs
index 7abcc634..414ccfd5 100644
--- a/assets/scripts/app/templates/env_vars/_form.hbs
+++ b/assets/scripts/app/templates/env_vars/_form.hbs
@@ -10,8 +10,8 @@
     </div>
   {{/if}}
   <div class="field">
-    {{#label for="public"}}Public:{{/label}}
-    {{input type="checkbox" checked=public}}
+    {{travis-switch active=public class="value"}}
+    {{#label for="secure" class="value"}}Display value in build logs{{/label}}
   </div>
 
   <div class="actions">
diff --git a/assets/styles/components/travis-switch.sass b/assets/styles/components/travis-switch.sass
index f217ff46..f5bc0bf5 100644
--- a/assets/styles/components/travis-switch.sass
+++ b/assets/styles/components/travis-switch.sass
@@ -12,7 +12,7 @@ p.settings-row
   display: inline-block
   float: left
   width: 5em
-  height: 1.52em
+  height: 1.55em
   margin: 20px 0 50px 0
   padding: 0.42em 1.5em
   background-color: #F5F5F5
diff --git a/assets/styles/settings.sass b/assets/styles/settings.sass
index 008d0d8a..ff21bb73 100644
--- a/assets/styles/settings.sass
+++ b/assets/styles/settings.sass
@@ -50,6 +50,11 @@
   form.env-var
     label
       width: 40px
+    label.value
+      width: auto
+      line-height: 1.9em
+    .travis-switch.value
+      font-size: 10px
   form.ssh-key
     span.error
       display: block
@@ -95,7 +100,7 @@
     span
       color: #838b8c
       marin-bottom: 6px
-        
+
     .value-display
       letter-spacing: 2px
       font-size: 15px