diff --git a/modules/chat/client/views/chat.client.view.html b/modules/chat/client/views/chat.client.view.html
index b1ffe841..3b9174c6 100644
--- a/modules/chat/client/views/chat.client.view.html
+++ b/modules/chat/client/views/chat.client.view.html
@@ -7,7 +7,7 @@
   <form class="col-xs-12 col-md-offset-4 col-md-4" ng-submit="vm.sendMessage();">
     <fieldset class="row">
       <div class="input-group">
-        <input type="text" id="messageText" name="messageText" class="form-control" ng-model="vm.messageText" placeholder="Enter new message">
+        <input type="text" id="messageText" name="messageText" class="form-control" ng-model="vm.messageText" placeholder="Enter new message" autofocus>
         <span class="input-group-btn">
           <button type="submit" class="btn btn-primary" ng-disabled="!vm.messageText.length">Submit</button>
         </span>
diff --git a/modules/core/client/directives/autofocus.client.directives.js b/modules/core/client/directives/autofocus.client.directives.js
new file mode 100644
index 00000000..0cebc7dd
--- /dev/null
+++ b/modules/core/client/directives/autofocus.client.directives.js
@@ -0,0 +1,28 @@
+(function () {
+  'use strict';
+
+  // Focus the element on page load
+  // Unless the user is on a small device, because this could obscure the page with a keyboard
+
+  angular.module('core')
+    .directive('autofocus', autofocus);
+
+  autofocus.$inject = ['$timeout', '$window'];
+
+  function autofocus($timeout, $window) {
+    var directive = {
+      restrict: 'A',
+      link: link
+    };
+
+    return directive;
+
+    function link(scope, element, attrs) {
+      if ($window.innerWidth >= 800) {
+        $timeout(function() {
+          element[0].focus();
+        }, 100);
+      }
+    }
+  }
+}());
diff --git a/modules/users/client/img/buttons/facebook.png b/modules/users/client/img/buttons/facebook.png
index 8ebea4f7..984f261c 100644
Binary files a/modules/users/client/img/buttons/facebook.png and b/modules/users/client/img/buttons/facebook.png differ
diff --git a/modules/users/client/img/buttons/github.png b/modules/users/client/img/buttons/github.png
index 6ff6672f..86e33652 100644
Binary files a/modules/users/client/img/buttons/github.png and b/modules/users/client/img/buttons/github.png differ
diff --git a/modules/users/client/img/buttons/google.png b/modules/users/client/img/buttons/google.png
index 0c007125..baf5b7dc 100644
Binary files a/modules/users/client/img/buttons/google.png and b/modules/users/client/img/buttons/google.png differ
diff --git a/modules/users/client/img/buttons/linkedin.png b/modules/users/client/img/buttons/linkedin.png
index ff039a42..e9ef1fa5 100644
Binary files a/modules/users/client/img/buttons/linkedin.png and b/modules/users/client/img/buttons/linkedin.png differ
diff --git a/modules/users/client/img/buttons/paypal.png b/modules/users/client/img/buttons/paypal.png
index 54689395..17e70aba 100644
Binary files a/modules/users/client/img/buttons/paypal.png and b/modules/users/client/img/buttons/paypal.png differ
diff --git a/modules/users/client/img/buttons/twitter.png b/modules/users/client/img/buttons/twitter.png
index 2e399c17..66ca70c7 100644
Binary files a/modules/users/client/img/buttons/twitter.png and b/modules/users/client/img/buttons/twitter.png differ
diff --git a/modules/users/client/views/authentication/signin.client.view.html b/modules/users/client/views/authentication/signin.client.view.html
index 061677fc..d70ab885 100644
--- a/modules/users/client/views/authentication/signin.client.view.html
+++ b/modules/users/client/views/authentication/signin.client.view.html
@@ -4,8 +4,11 @@
     <form name="vm.userForm" ng-submit="vm.signin(vm.userForm.$valid)" class="signin" novalidate autocomplete="off">
       <fieldset>
         <div class="form-group" show-errors>
+          <uib-alert type="danger" ng-show="vm.error" class="text-center text-danger">
+            <span ng-bind="vm.error"></span>
+          </uib-alert>
           <label for="username">Username</label>
-          <input type="text" id="username" name="username" class="form-control" ng-model="vm.credentials.username" placeholder="Username" lowercase required>
+          <input type="text" id="username" name="username" class="form-control" ng-model="vm.credentials.username" placeholder="Username" lowercase required autofocus>
           <div ng-messages="vm.userForm.username.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Username is required.</p>
           </div>
@@ -25,12 +28,7 @@
         <div class="text-center forgot-password">
           <a ui-sref="password.forgot">Forgot your password?</a>
         </div>
-        <p> 
-          &nbsp;
-        </p>
-        <uib-alert type="danger" ng-show="vm.error" class="text-center text-danger">
-          <span ng-bind="vm.error"></span>
-        </uib-alert>
+        <br />
       </fieldset>
     </form>
   </div>
diff --git a/modules/users/client/views/authentication/signup.client.view.html b/modules/users/client/views/authentication/signup.client.view.html
index 927f59bf..edd6214e 100644
--- a/modules/users/client/views/authentication/signup.client.view.html
+++ b/modules/users/client/views/authentication/signup.client.view.html
@@ -5,7 +5,7 @@
       <fieldset>
         <div class="form-group" show-errors>
           <label for="firstName">First Name</label>
-          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.credentials.firstName" placeholder="First Name" required>
+          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.credentials.firstName" placeholder="First Name" required autofocus>
           <div ng-messages="vm.userForm.firstName.$error" role="alert">
             <p class="help-block error-text" ng-message="required">First name is required.</p>
           </div>
@@ -34,7 +34,7 @@
         </div>
         <div class="form-group" show-errors>
           <label for="password">Password</label>
-            <input type="password" id="password" name="password" class="form-control" ng-model="vm.credentials.password" placeholder="Password" uib-popover="{{vm.getPopoverMsg()}}" uib-popover-trigger="focus" password-validator required>
+            <input type="password" id="password" name="password" class="form-control" ng-model="vm.credentials.password" placeholder="Password" uib-popover="{{vm.getPopoverMsg()}}" popover-trigger="outsideClick" password-validator required>
           <div ng-messages="vm.userForm.password.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Password is required.</p>
             <div ng-repeat="passwordError in passwordErrors">
diff --git a/modules/users/client/views/settings/edit-profile.client.view.html b/modules/users/client/views/settings/edit-profile.client.view.html
index 64821554..62ab9198 100644
--- a/modules/users/client/views/settings/edit-profile.client.view.html
+++ b/modules/users/client/views/settings/edit-profile.client.view.html
@@ -4,7 +4,7 @@
       <fieldset>
         <div class="form-group" show-errors>
           <label for="firstName">First Name</label>
-          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.user.firstName" placeholder="First Name" required>
+          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.user.firstName" placeholder="First Name" required autofocus>
           <div ng-messages="vm.userForm.firstName.$error" role="alert">
             <p class="help-block error-text" ng-message="required">First name is required.</p>
           </div>
diff --git a/modules/users/client/views/settings/manage-social-accounts.client.view.html b/modules/users/client/views/settings/manage-social-accounts.client.view.html
index cba91a03..0fe8b324 100644
--- a/modules/users/client/views/settings/manage-social-accounts.client.view.html
+++ b/modules/users/client/views/settings/manage-social-accounts.client.view.html
@@ -7,9 +7,11 @@
       <i class="glyphicon glyphicon-check text-success user-primary-account" data-toggle="popover" title="Primary: {{vm.user.provider}}"></i>
     </div>
     <div ng-repeat="(providerName, providerData) in vm.user.additionalProvidersData" class="social-account-container">
-      <img ng-src="/modules/users/client/img/buttons/{{providerName}}.png">
-      <a class="btn btn-danger btn-add-remove-account" ng-click="vm.removeUserSocialAccount(providerName)">
-        <i class="glyphicon glyphicon-trash"></i>
+      <a href ng-click="vm.removeUserSocialAccount(providerName)">
+        <img class="social-button" ng-src="/modules/users/client/img/buttons/{{::providerName}}.png">
+        <span class="btn btn-danger btn-add-remove-account">
+          <i class="glyphicon glyphicon-trash"></i>
+        </span>
       </a>
     </div>
   </div>