diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-arya/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-arya/theme.css
index 488f5256ec..e7d79c3759 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-arya/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-arya/theme.css
@@ -3383,9 +3383,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -3394,6 +3391,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #383838;
 }
@@ -3447,6 +3447,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3817,9 +3825,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -3828,6 +3833,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.5rem 0.5rem;
   padding-right: 2.357rem;
@@ -4132,9 +4140,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -4143,6 +4148,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.5rem 0.5rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-amber/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-amber/theme.css
index e31c9d27fc..a2c99b794b 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-amber/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-amber/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #FFE082;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #4b4b4b;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #FFE082;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #FFE082;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-blue/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-blue/theme.css
index 503374c29e..04b86f4d6a 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-blue/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-blue/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #81D4FA;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #4b4b4b;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #81D4FA;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #81D4FA;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-green/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-green/theme.css
index 610bc015bb..321ae24827 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-green/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-green/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #C5E1A5;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #4b4b4b;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #C5E1A5;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #C5E1A5;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-pink/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-pink/theme.css
index ada497e7b9..3122177cd5 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-luna-pink/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-luna-pink/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #F48FB1;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #4b4b4b;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #F48FB1;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #e57373;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #F48FB1;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.1rem white;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #e57373;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-colored/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-colored/theme.css
index 37a3552f6b..ed802b2634 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-colored/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-colored/theme.css
@@ -3383,9 +3383,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #212121;
 }
@@ -3394,6 +3391,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #f4f4f4;
 }
@@ -3447,6 +3447,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3817,9 +3825,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #212121;
 }
@@ -3828,6 +3833,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4132,9 +4140,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #212121;
 }
@@ -4143,6 +4148,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-dark/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-dark/theme.css
index f5130be666..2e6b8f38e2 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-dark/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-dark/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #212121;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #f4f4f4;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #212121;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #212121;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-light/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-light/theme.css
index cd50e5343d..6e026437c6 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-nova-light/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-nova-light/theme.css
@@ -3386,9 +3386,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #212121;
 }
@@ -3397,6 +3394,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #f4f4f4;
 }
@@ -3450,6 +3450,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3823,9 +3831,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #212121;
 }
@@ -3834,6 +3839,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.429rem 0.429rem;
   padding-right: 2.357rem;
@@ -4138,9 +4146,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #a80000;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #212121;
 }
@@ -4149,6 +4154,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0.2rem #666666;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #a80000;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.429rem 0.429rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-saga/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-saga/theme.css
index 8fbb8f83ac..9ce779e146 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-saga/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-saga/theme.css
@@ -3383,9 +3383,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #f44336;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #2196F3;
 }
@@ -3394,6 +3391,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 0.2em #a6d5fa;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #f44336;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #f8f9fa;
 }
@@ -3447,6 +3447,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3817,9 +3825,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #f44336;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #2196F3;
 }
@@ -3828,6 +3833,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 0.2em #a6d5fa;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #f44336;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.5rem 0.5rem;
   padding-right: 2.357rem;
@@ -4132,9 +4140,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #f44336;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #2196F3;
 }
@@ -4143,6 +4148,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 0.2em #a6d5fa;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #f44336;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.5rem 0.5rem;
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces-vela/theme.css b/primefaces/src/main/resources/META-INF/resources/primefaces-vela/theme.css
index ebabe8eadf..be53964624 100644
--- a/primefaces/src/main/resources/META-INF/resources/primefaces-vela/theme.css
+++ b/primefaces/src/main/resources/META-INF/resources/primefaces-vela/theme.css
@@ -3383,9 +3383,6 @@ body .ui-inputfield {
   -webkit-appearance: none;
   appearance: none;
 }
-body .ui-inputfield.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-inputfield.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -3394,6 +3391,9 @@ body .ui-inputfield.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-inputfield.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-input-filled .ui-inputfield, body.ui-input-filled .ui-inputfield {
   background-color: #304562;
 }
@@ -3447,6 +3447,14 @@ body .ui-inputgroup > .ui-widget,
 body .ui-inputgroup > .ui-float-label > .ui-widget {
   border-radius: 0;
 }
+body .ui-inputgroup > .ui-widget.ui-state-focus,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus {
+  z-index: 1;
+}
+body .ui-inputgroup > .ui-widget.ui-state-focus ~ label,
+body .ui-inputgroup > .ui-float-label > .ui-widget.ui-state-focus ~ label {
+  z-index: 1;
+}
 body .ui-inputgroup .ui-inputgroup-addon-checkbox {
   padding: 0;
   position: relative;
@@ -3817,9 +3825,6 @@ body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon {
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectcheckboxmenu.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-selectcheckboxmenu.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -3828,6 +3833,9 @@ body .ui-selectcheckboxmenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-selectcheckboxmenu.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-selectcheckboxmenu .ui-selectcheckboxmenu-multiple-container.ui-inputfield {
   padding: 0.5rem 0.5rem;
   padding-right: 2.357rem;
@@ -4132,9 +4140,6 @@ body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon {
 body .ui-selectonemenu .ui-selectonemenu-trigger .ui-icon:before {
   content: "";
 }
-body .ui-selectonemenu.ui-state-error {
-  border-color: #ef9a9a;
-}
 body .ui-selectonemenu.ui-state-hover {
   border-color: #90CAF9;
 }
@@ -4143,6 +4148,9 @@ body .ui-selectonemenu.ui-state-focus {
   outline: 0 none;
   box-shadow: 0 0 0 1px #b1dafb;
 }
+body .ui-selectonemenu.ui-state-error {
+  border-color: #ef9a9a;
+}
 body .ui-fluid .ui-selectonemenu-label {
   width: calc(100% - 2.357rem);
   padding: 0.5rem 0.5rem;