diff --git a/.changeset/fix-input-icon-z-index.md b/.changeset/fix-input-icon-z-index.md
new file mode 100644
index 000000000..02a9946a1
--- /dev/null
+++ b/.changeset/fix-input-icon-z-index.md
@@ -0,0 +1,5 @@
+---
+"@tabler/core": patch
+---
+
+Fixed `.input-icon-addon` z-index issue with form validation feedback and added default height.
diff --git a/core/scss/ui/forms/_form-icon.scss b/core/scss/ui/forms/_form-icon.scss
index b63e6505f..4c605b4e2 100644
--- a/core/scss/ui/forms/_form-icon.scss
+++ b/core/scss/ui/forms/_form-icon.scss
@@ -20,10 +20,12 @@ Icon input
   top: 0;
   bottom: 0;
   left: 0;
+  z-index: 10;
   display: flex;
   align-items: center;
   justify-content: center;
   min-width: 2.5rem;
+  height: $input-height;
   color: var(--#{$prefix}icon-color);
   pointer-events: none;
   font-size: 1.2em;
diff --git a/preview/pages/form-layout.html b/preview/pages/form-layout.html
index 96a7005e3..411a64712 100644
--- a/preview/pages/form-layout.html
+++ b/preview/pages/form-layout.html
@@ -161,6 +161,43 @@ page-libs: [litepicker]
 				</div>
 			</div>
 
+			<div class="col-12">
+				<div class="card">
+					<div class="card-header">
+						<h3 class="card-title">
+							Form with Icons and Validation
+						</h3>
+					</div>
+					<div class="card-body">
+						<form class="space-y">
+							<div>
+								<div class="input-icon">
+									<span class="input-icon-addon">
+										{% include "ui/icon.html" icon="user" %}
+									</span>
+									<input type="text" value="" class="form-control is-invalid" placeholder="Username">
+									<div class="invalid-feedback">
+										This throws the icon out of bounds when input element contains `is-invalid` class.
+									</div>
+								</div>
+							</div>
+
+							<div>
+								<div class="input-icon">
+									<span class="input-icon-addon">
+										{% include "ui/icon.html" icon="mail" %}
+									</span>
+									<input type="email" value="" class="form-control is-valid" placeholder="Email">
+									<div class="valid-feedback">
+										This email looks good!
+									</div>
+								</div>
+							</div>
+						</form>
+					</div>
+				</div>
+			</div>
+
 			<div class="col-12">
 				{% include "cards/form/layout.html" horizontal=true title="Horizontal form" %}
 			</div>