diff --git a/core/css/guest.css b/core/css/guest.css
index d46b2e895ca..56f8c728d00 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -146,6 +146,13 @@ form #datadirField legend {
 	right: 24px;
 }
 
+#submit-wrapper #submit-icon {
+	pointer-events: none; /* The submit icon is positioned on the submit button.
+							 From the user point of view the icon is part of the
+							 button, so the clicks on the icon have to be
+							 applied to the button instead. */
+}
+
 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 36e1d8251de..667ca0dc2be 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -768,6 +768,13 @@ label.infield {
 		top: 22px;
 		right: 24px;
 	}
+
+	#submit-icon {
+		pointer-events: none; /* The submit icon is positioned on the submit
+								 button. From the user point of view the icon is
+								 part of the button, so the clicks on the icon
+								 have to be applied to the button instead. */
+	}
 }
 
 #body-login input {