diff --git a/src/component/input/input-base/style/_scheme.scss b/src/component/input/input-base/style/_scheme.scss
index 2ac7b44fa..cf979bec7 100644
--- a/src/component/input/input-base/style/_scheme.scss
+++ b/src/component/input/input-base/style/_scheme.scss
@@ -39,14 +39,26 @@
       }
     }
 
-    #{ns(fieldset--valid)} &,
-    &-group--valid & {
-      @include color.box-shadow(plain success, (legacy:$legacy), bottom-2-in);
+    &-wrap--addon {
+      > #{ns(input)}:not(:last-child) {
+        @include color.box-shadow(action-high blue-france, (legacy:$legacy), bottom-2-in);
+      }
     }
 
-    #{ns(fieldset--error)} &,
-    &-group--error & {
-      @include color.box-shadow(plain error, (legacy:$legacy), bottom-2-in);
+    #{ns(fieldset--valid)},
+    &-group--valid {
+      #{ns(input)}, 
+      #{ns(input-wrap--addon)} > #{ns(input)}:not(:last-child) {
+        @include color.box-shadow(plain success, (legacy:$legacy), bottom-2-in);
+      }
+    }
+
+    #{ns(fieldset--error)},
+    &-group--error {
+      #{ns(input)}, 
+      #{ns(input-wrap--addon)} > #{ns(input)}:not(:last-child) {
+        @include color.box-shadow(plain error, (legacy:$legacy), bottom-2-in);
+      }
     }
 
     &-group--error {
@@ -67,12 +79,4 @@
       }
     }
   }
-
-  #{ns(input-wrap--addon)} {
-    > *:not(:last-child) {
-      &#{ns(input)}:not(#{ns(input--valid)}):not(#{ns(input--error)}) {
-        @include color.box-shadow(action-high blue-france, (legacy:$legacy), bottom-2-in);
-      }
-    }
-  }
 }