diff --git a/build/less/forms.less b/build/less/forms.less
index 109235bb1..f0ab5c43a 100644
--- a/build/less/forms.less
+++ b/build/less/forms.less
@@ -79,4 +79,20 @@
 
 .icheck > label {
   padding-left: 0;
-}
\ No newline at end of file
+}
+
+/* support Font Awesome icons in form-control */
+.form-control-feedback.fa {
+    line-height: @input-height-base;
+}
+
+.input-lg + .form-control-feedback.fa,
+.input-group-lg + .form-control-feedback.fa,
+.form-group-lg .form-control + .form-control-feedback.fa {
+  line-height: @input-height-large;
+}
+.input-sm + .form-control-feedback.fa,
+.input-group-sm + .form-control-feedback.fa,
+.form-group-sm .form-control + .form-control-feedback.fa {
+  line-height: @input-height-small;
+}