diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 89bb310fc..12ad7a1ea 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -115,19 +115,16 @@
 		}
 
 		.input-append .add-on {
+			margin-left: -1.5em;
 			position: relative;
-			height: 30px;
-			background: none;
-			margin-left: -35px;
-			z-index: 1000;
-			border: 0;
+			font-size: 17px;
+			line-height: 29px;
+			top: 6px;
 		}
 
 		.input-append .add-on * {
 			font-size: 17px;
 			line-height: 29px;
-			outline: none !important;
-			box-shadow: none !important;
 		}
 
 		.controls.error .add-on *,
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index bf7f94225..9ef4a06c5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -12,9 +12,7 @@
 							autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: login, disable: submitRequest"
 							data-i18n="[placeholder]LOGIN/LABEL_LOGIN" />
-						<span class="add-on">
-							<i class="fontastic">👤</i>
-						</span>
+						<span class="add-on fontastic">👤</span>
 					</div>
 				</div>
 				<div class="controls" data-bind="css: {'error': passwordError}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 7723af6a4..f73606fa4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -17,9 +17,7 @@
 							autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: email, disable: submitRequest"
 							data-i18n="[placeholder]GLOBAL/EMAIL" />
-						<span class="add-on">
-							<i class="icon-mail"></i>
-						</span>
+						<span class="add-on icon-mail"></span>
 					</div>
 				</div>
 				<div class="controls" data-bind="css: {'error': passwordError}">
@@ -63,15 +61,15 @@
 					<div class="forgot-link pull-left" data-bind="visible: '' !== forgotPasswordLinkUrl"
 						style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
-							data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"><span
-								data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
+							data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"
+							data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></a>
 					</div>
 					&nbsp;
 					<div class="registration-link pull-right"
 						data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
-							data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"><span
-								data-i18n="LOGIN/LABEL_REGISTRATION"></span></a>
+							data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"
+							data-i18n="LOGIN/LABEL_REGISTRATION"></a>
 					</div>
 				</div>
 			</form>
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index adf4f381e..d066054fc 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -235,21 +235,6 @@ select:focus:required:invalid {
       z-index: 2;
     }
   }
-  .add-on {
-    display: inline-block;
-    width: auto;
-    height: @baseLineHeight;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-size: @baseFontSize;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    text-align: center;
-    text-shadow: 0 1px 0 @white;
-    background-color: @grayLighter;
-    border: 1px solid #ccc;
-  }
-  .add-on,
   .btn {
     margin-left: -1px;
     vertical-align: top;
@@ -259,7 +244,6 @@ select:focus:required:invalid {
     background-color: lighten(@green, 30);
     border-color: @green;
   }
-  .add-on:last-child,
   .btn:last-child {
     border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
   }
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index 879264b5c..0acc7292d 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -63,12 +63,6 @@
       box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
     }
   }
-  // Give a small background color for input-prepend/-append
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
 }