diff --git a/views/account/login.jade b/views/account/login.jade
index a11ce70f14..3febce2ba5 100644
--- a/views/account/login.jade
+++ b/views/account/login.jade
@@ -29,4 +29,6 @@ block content
         label.control-label(for='username') Password
         input.form-control(type='password', name='password', id='password', placeholder='Password')
       .form-group
-        button.btn.btn-success(type='submit') Login
+        button.btn.btn-primary(type='submit')
+          i.fa.fa-unlock-alt
+          | Login
diff --git a/views/account/signup.jade b/views/account/signup.jade
index 5d965bed56..afe9ac6f62 100644
--- a/views/account/signup.jade
+++ b/views/account/signup.jade
@@ -11,7 +11,7 @@ block content
     .form-group
       label.col-sm-3.control-label(for='email') Email
       .col-sm-7
-        input.form-control(type='email', name='email', id='email', placeholder='Email')
+        input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus)
     .form-group
       label.col-sm-3.control-label(for='username') Password
       .col-sm-7
@@ -22,4 +22,6 @@ block content
         input.form-control(type='password', name='confirmPassword', id='confirmPassword', placeholder='Confirm Password')
     .form-group
       .col-sm-offset-3.col-sm-7
-        button.btn.btn-primary(type='submit') Signup
+        button.btn.btn-primary(type='submit')
+          i.fa.fa-check
+          | Signup
diff --git a/views/contact.jade b/views/contact.jade
index 54d8f79b91..13565f31c2 100644
--- a/views/contact.jade
+++ b/views/contact.jade
@@ -26,5 +26,7 @@ block content
         textarea.form-control(type='text', name='message', id='message', rows='7', required=true)
     .form-group
       .col-sm-offset-2.col-sm-8
-        button.btn.btn-success(type='submit') Send
+        button.btn.btn-default(type='submit')
+          i.fa.fa-mail-forward
+          | Send
         img.pull-right(height='34', src='/img/sendgrid.png')