diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index bb9d164eb..d562d80cd 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -7,12 +7,16 @@
         <img class="company-logo" src="<%= @logoUrl %>" alt="<%= @C( 'product_name' ) %>">
         <form id="login">
           <div class="form-group">
-            <label for="username"><%- @Ti( 'Username / email' ) %></label>
+            <div class="formGroup-label">
+              <label for="username"><%- @Ti( 'Username / email' ) %></label>
+            </div>
             <input id="username" name="username" type="text" class="form-control" value="<%= @item.username %>" autocapitalize="off" />
           </div>
 
           <div class="form-group">
-            <label for="password"><%- @Ti( 'Password' ) %></label>
+            <div class="formGroup-label">
+              <label for="password"><%- @Ti( 'Password' ) %></label>
+            </div>
             <input id="password" name="password" type="password" class="form-control"/>
           </div>
 
@@ -21,7 +25,12 @@
             <label for="remember_me"><%- @Ti( 'Remember me' ) %></label>
             <input id="remember_me" name="remember_me" value="1" type="checkbox"/>
     -->
-            <label><input name="remember_me" value="1" type="checkbox"/> <%- @T( 'Remember me' ) %></label>
+            <label class="inline-label checkbox-replacement">
+              <input name="remember_me" value="1" type="checkbox">
+              <%- @Icon('checkbox', 'icon-unchecked') %>
+              <%- @Icon('checkbox-checked', 'icon-checked') %>
+              <span class="label-text"><%- @T( 'Remember me' ) %></span>
+            </label>
           </div>
 
           <div class="form-controls">
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index f932d0285..8e99f4cbc 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -818,7 +818,7 @@ label,
   text-transform: uppercase;
   color: hsl(198,19%,72%);
   display: block;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: normal;
   letter-spacing: 0.05em;
   margin-bottom: 4px;
@@ -989,7 +989,7 @@ fieldset > *:not(.form-group) .form-control {
 
 .formGroup-label {
   padding: 0 2px;
-  margin-bottom: 6px;
+  margin-bottom: 5px;
   position: relative;
   display: flex;
   align-items: center;
@@ -1567,6 +1567,14 @@ kbd {
   box-shadow:
     0 8px 17px 0 rgba(0, 0, 0, 0.2),
     0 6px 20px 0 rgba(0, 0, 0, 0.19);
+  
+  label {
+    color: hsl(0,0%,60%);
+  }
+
+  .inline-label {
+    font-size: inherit;
+  }
 }
 
   .hero-unit h1,