diff --git a/theme-base/components/input/_inputicon.scss b/theme-base/components/input/_inputicon.scss
index 88aa70a..ce403b4 100644
--- a/theme-base/components/input/_inputicon.scss
+++ b/theme-base/components/input/_inputicon.scss
@@ -4,12 +4,14 @@
     width: 100%;
 }
 
-.p-icon-field-left > .p-input-icon:first-of-type {
+.p-icon-field-left > .p-input-icon {
     left: nth($inputPadding, 2);
     color: $inputIconColor;
+    z-index: 1;
 }
 
-.p-icon-field-right > .p-input-icon:last-of-type  {
+.p-icon-field-right > .p-input-icon  {
     right: nth($inputPadding, 2);
     color: $inputIconColor;
+    z-index: 1;
 }
\ No newline at end of file
diff --git a/theme-base/components/input/_inputtext.scss b/theme-base/components/input/_inputtext.scss
index 44b442b..14b0c98 100644
--- a/theme-base/components/input/_inputtext.scss
+++ b/theme-base/components/input/_inputtext.scss
@@ -60,6 +60,10 @@
     padding-left: nth($inputPadding, 2) * 2 + $primeIconFontSize;
 }
 
+.p-icon-field-left > .p-autocomplete .p-inputtext {
+    padding-left: nth($inputPadding, 2) * 2 + $primeIconFontSize;
+}
+
 .p-icon-field-left.p-float-label > label {
     left: nth($inputPadding, 2) * 2 + $primeIconFontSize;
 }
@@ -68,6 +72,10 @@
     padding-right: nth($inputPadding, 2) * 2 + $primeIconFontSize;
 }
 
+.p-icon-field-right > .p-autocomplete .p-inputtext {
+    padding-right: nth($inputPadding, 2) * 2 + $primeIconFontSize;
+}
+
 @include placeholder {
     color: $inputPlaceholderTextColor;
 }