diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
index 4abf3ae20..3e158e51f 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
@@ -82,7 +82,7 @@ form{
         .field{
             padding:0;
         }
-        .field.icon:before{
+        .iconfield:before{
             display:none;
         }
 
@@ -168,25 +168,29 @@ form{
         font-size:4em;
     }
 
-    .field.icon:before{
-        display:inline-block;
-        position: absolute;
-        color:$color-grey-4;
-        border: 2px solid $color-grey-4;
-        border-radius: 100%;
-        width: 1em;
-        padding: 0.3em;
-        left: $desktop-nice-padding;
-        margin-top: -1em;
-        top: 50%;
-        font-size:1.5em;
-    }
-
     .full{
         margin:0px (-$desktop-nice-padding);
 
-        input{
-            padding-left:($desktop-nice-padding + 50px);
+        .iconfield{
+            &:before{
+                display:inline-block;
+                position: absolute;
+                color:$color-grey-4;
+                border: 2px solid $color-grey-4;
+                border-radius: 100%;
+                width: 1em;
+                padding: 0.3em;
+                left: $desktop-nice-padding;
+                margin-top: -1.1rem;
+                top: 50%;
+                font-size:1.3rem;
+            }
+
+            input{
+                padding-left:($desktop-nice-padding + 50px);
+            }
         }
+
+       
     }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index 9cb28ed86..012dd32f8 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -28,15 +28,19 @@
           
             <ul class="fields">
                 <li class="full">
-                    <div class="field icon icon-user">
+                    <div class="field">
                         {{ form.username.label_tag }}
-                        {{ form.username }}
+                        <div class="input iconfield icon-user">
+                            {{ form.username }}
+                        </div>
                     </div>
                 </li>
                 <li class="full">
-                    <div class="field icon icon-password">
+                    <div class="field">
                         {{ form.password.label_tag }}
-                        {{ form.password }}
+                        <div class="input iconfield icon-password">
+                            {{ form.password }}
+                        </div>
                     </div>
                     {% if show_password_reset %}
                         <p class="help"><a href="{% url 'django.contrib.auth.views.password_reset' %}">{% trans "Forgotten it?" %}</a></p>