diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 1f18cc068c..c9ea100912 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -66,7 +66,7 @@ input.primary {
 }
 
 @if (lightness($color-primary) > 50) {
-	#body-login input.login {
+	#body-login #submit-icon.icon-confirm-white {
 		background-image: url('../../../core/img/actions/confirm.svg');
 	}
 }
diff --git a/core/css/guest.css b/core/css/guest.css
index e65f0a5de0..d46b2e895c 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -131,6 +131,21 @@ form #datadirField legend {
 }
 
 /* Buttons and input */
+#submit-wrapper {
+	position: relative; /* Make the wrapper the containing block of its
+						   absolutely positioned descendant icons */
+}
+#submit-wrapper .icon-confirm-white {
+	position: absolute;
+	top: 23px;
+	right: 23px;
+}
+#submit-wrapper .icon-loading-small {
+	position: absolute;
+	top: 22px;
+	right: 24px;
+}
+
 input, textarea, select, button {
 	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 }
diff --git a/core/css/styles.scss b/core/css/styles.scss
index f2acca38e1..36e1d8251d 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -754,6 +754,22 @@ label.infield {
 
 /* Log in and install button */
 
+#body-login #submit-wrapper {
+	position: relative; /* Make the wrapper the containing block of its
+						   absolutely positioned descendant icons */
+
+	.icon-confirm-white {
+		position: absolute;
+		top: 23px;
+		right: 23px;
+	}
+	.icon-loading-small {
+		position: absolute;
+		top: 22px;
+		right: 24px;
+	}
+}
+
 #body-login input {
 	font-size: 20px;
 	margin: 5px;
diff --git a/core/js/login.js b/core/js/login.js
index 034bb169c5..81ef25ef2d 100644
--- a/core/js/login.js
+++ b/core/js/login.js
@@ -12,9 +12,10 @@
  */
 OC.Login = _.extend(OC.Login || {}, {
 	onLogin: function () {
-		$('#submit')
+		$('#submit-icon')
 			.removeClass('icon-confirm-white')
-			.addClass('icon-loading-small')
+			.addClass('icon-loading-small');
+		$('#submit')
 			.attr('value', t('core', 'Logging in …'));
 		return true;
 	},
diff --git a/core/templates/login.php b/core/templates/login.php
index 8545e5d07d..0801b3746d 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -61,7 +61,10 @@ script('core', 'merged-login');
 			</p>
 		<?php } ?>
 
-		<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
+		<div id="submit-wrapper">
+			<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
+			<div id="submit-icon" class="icon-confirm-white"></div>
+		</div>
 
 		<div class="login-additional">
 			<div class="remember-login-container">