diff --git a/client/css/forms.styl b/client/css/forms.styl
index 532b1534..c5db36a8 100644
--- a/client/css/forms.styl
+++ b/client/css/forms.styl
@@ -17,10 +17,6 @@ form
         margin-bottom: 1em
     .buttons
         margin-top: 1em
-        a
-            margin-left: 1em
-            .fa-question-circle-o
-                font-size: 120%
     .input li:first-child label:not(.radio):not(.checkbox):not(.file-dropper),
     .input li:first-child
         padding-top: 0
@@ -49,8 +45,11 @@ form.horizontal
     margin-bottom: 1em
     .input, .buttons, ul
         display: inline-block
+        vertical-align: middle
         margin: 0
         padding: 0
+        input
+            vertical-align: middle
     .buttons
         margin-right: 0.5em
 
@@ -162,7 +161,7 @@ input[type=password]
     border: 2px solid $input-enabled-border-color
     background: $input-enabled-background-color
     color: $input-enabled-text-color
-    box-shadow: none; /* :-moz-submit-invalid on FF */
+    box-shadow: none /* :-moz-submit-invalid on FF */
     transition: border-color 0.1s linear, background-color 0.1s linear
 
     &:disabled
diff --git a/client/css/main.styl b/client/css/main.styl
index 9f8c4781..1d14547b 100644
--- a/client/css/main.styl
+++ b/client/css/main.styl
@@ -19,6 +19,15 @@ a
     color: $main-color
     text-decoration: none
     transition: color 0.1s linear
+    &.icon
+        color: $inactive-link-color
+        opacity: .5
+
+a.append
+    margin-left: 1em
+form .fa-question-circle-o
+    font-size: 110%
+    vertical-align: middle
 
 #content-holder
     margin: 2em
@@ -52,7 +61,7 @@ nav ul
             display: inline-block
         img
             margin: 0
-            vertical-align: top; /* fix ghost margin under the image */
+            vertical-align: top /* fix ghost margin under the image */
 
 nav.plain-nav ul li
     display: block
@@ -122,7 +131,7 @@ nav.text-nav
         background: $message-success-background-color
 
 .thumbnail
-    /*background-image: attr(data-src url);*/ /* not available yet */
+    /*background-image: attr(data-src url)*/ /* not available yet */
     background-repeat: no-repeat
     background-size: cover
     background-position: center
diff --git a/client/html/login.hbs b/client/html/login.hbs
index 0d1e6e6e..2e365b64 100644
--- a/client/html/login.hbs
+++ b/client/html/login.hbs
@@ -18,7 +18,7 @@
         <div class='buttons'>
             <input type='submit' value='Log in'/>
             {{#if this.canSendMails}}
-                <a href='/password-reset'>Forgot the password?</a>
+                <a class='append' href='/password-reset'>Forgot the password?</a>
             {{/if}}
         </div>
     </form>
diff --git a/client/html/user_list_header.hbs b/client/html/user_list_header.hbs
index 27c6ed28..6a82eda9 100644
--- a/client/html/user_list_header.hbs
+++ b/client/html/user_list_header.hbs
@@ -9,7 +9,7 @@
         </div>
         <div class='buttons'>
             <input type='submit' value='Search'/>
-            <a href='/help/search#user-search-help'><i class='fa fa-question-circle-o'></i></a>
+            <a class='append icon' href='/help/search#user-search-help'><i class='fa fa-question-circle-o'></i></a>
         </div>
     </form>
 </div>