diff --git a/src/app/pages/forms/components/inputs/components/standardInputs/standardInputs.html b/src/app/pages/forms/components/inputs/components/standardInputs/standardInputs.html
index c656c333..21daa77e 100644
--- a/src/app/pages/forms/components/inputs/components/standardInputs/standardInputs.html
+++ b/src/app/pages/forms/components/inputs/components/standardInputs/standardInputs.html
@@ -27,9 +27,9 @@
   </div>
 
   <div class="form-group">
-    <input type="text" class="form-control input-sm" id="input2" placeholder="Small Input">
+    <input type="text" class="form-control form-control-sm" id="input2" placeholder="Small Input">
   </div>
   <div class="form-group">
-    <input type="text" class="form-control input-lg" id="input4" placeholder="Large Input">
+    <input type="text" class="form-control form-control-lg" id="input4" placeholder="Large Input">
   </div>
 </form>
diff --git a/src/app/theme/sass/_form.scss b/src/app/theme/sass/_form.scss
index de8b8720..92573203 100644
--- a/src/app/theme/sass/_form.scss
+++ b/src/app/theme/sass/_form.scss
@@ -365,21 +365,42 @@ label.custom-input-danger {
   }
 }
 
+.form-control-feedback {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+  pointer-events: none;
+}
+
 .has-success {
   @include validationState($success-bg, $success);
+  position: relative;
 }
 
 .has-warning {
   @include validationState($warning-bg, $warning);
+  position: relative;
 }
 
 .has-error {
   @include validationState($danger-bg, $danger);
+  position: relative;
 }
 
-.has-feedback label ~ .form-control-feedback {
-  top: 21px;
-  font-size: 18px;
+.has-feedback {
+  .form-control {
+    padding-right: 42.5px;
+  }
+  label ~ .form-control-feedback {
+    top: 21px;
+    font-size: 18px;
+  }
 }
 
 .bootstrap-select {
@@ -480,8 +501,8 @@ label.custom-input-danger {
       border-top: none;
     }
   }
-  &.with-search.open{
-    .btn-default.btn{
+  &.with-search.open {
+    .btn-default.btn {
       background-color: rgba(0, 0, 0, 0.2);
       border-color: 1px solid $default;
     }
@@ -558,6 +579,6 @@ label.custom-input-danger {
   border-bottom-right-radius: 5px;
 }
 
-.sub-little-text{
+.sub-little-text {
   font-size: 12px;
-}
\ No newline at end of file
+}