diff --git a/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/Autocomplete.test.js.snap b/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/Autocomplete.test.js.snap
index 26eec921019..90ff4b41cb4 100644
--- a/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/Autocomplete.test.js.snap
+++ b/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/Autocomplete.test.js.snap
@@ -523,7 +523,7 @@ exports[`Autocomplete markup have to match snapshot 1`] = `
                 value="CC cc"
               >
                 <span
-                  className="dnb-input dnb-input--null dnb-form-component dnb-autocomplete__input dnb-input--icon-position-null dnb-input--has-icon dnb-input--icon-size-icon_size dnb-input--has-submit-element dnb-input__status--error"
+                  className="dnb-input dnb-form-component dnb-autocomplete__input dnb-input--icon-position-null dnb-input--has-icon dnb-input--icon-size-icon_size dnb-input--has-submit-element dnb-input__status--error"
                   data-has-content="true"
                   data-input-state="virgin"
                 >
diff --git a/packages/dnb-eufemia/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap b/packages/dnb-eufemia/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
index c810edf30b0..38c0eb93310 100644
--- a/packages/dnb-eufemia/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
+++ b/packages/dnb-eufemia/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
@@ -494,7 +494,7 @@ exports[`DatePicker component have to match snapshot 1`] = `
                   value="initval"
                 >
                   <span
-                    className="dnb-input dnb-input--text dnb-form-component dnb-input--has-submit-element dnb-input__status--error"
+                    className="dnb-input dnb-form-component dnb-input--text dnb-input--has-submit-element dnb-input__status--error"
                     data-has-content="false"
                     data-input-state="virgin"
                   >
diff --git a/packages/dnb-eufemia/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap b/packages/dnb-eufemia/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap
index 4cdb7989558..30041b32417 100644
--- a/packages/dnb-eufemia/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap
+++ b/packages/dnb-eufemia/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap
@@ -130,7 +130,7 @@ exports[`InputMasked component have to match type="text" snapshot 1`] = `
       value="test"
     >
       <span
-        className="dnb-input dnb-input--text dnb-form-component dnb-input-masked"
+        className="dnb-input dnb-form-component dnb-input-masked dnb-input--text"
         data-has-content="true"
         data-input-state="virgin"
       >
diff --git a/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/Input.test.js.snap b/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/Input.test.js.snap
index 06410904fba..335e7ed06c0 100644
--- a/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/Input.test.js.snap
+++ b/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/Input.test.js.snap
@@ -146,7 +146,7 @@ exports[`Input component have to match type="search" snapshot 1`] = `
   value="test"
 >
   <span
-    className="dnb-input dnb-input--search dnb-form-component dnb-input--has-submit-element"
+    className="dnb-input dnb-form-component dnb-input--search dnb-input--has-submit-element"
     data-has-content="true"
     data-input-state="virgin"
   >
@@ -649,7 +649,7 @@ exports[`Input component have to match type="text" snapshot 1`] = `
   value="test"
 >
   <span
-    className="dnb-input dnb-input--text dnb-form-component"
+    className="dnb-input dnb-form-component dnb-input--text"
     data-has-content="true"
     data-input-state="virgin"
   >
diff --git a/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/InputPassword.test.js.snap b/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/InputPassword.test.js.snap
index 50306b64e12..a2c11672f4e 100644
--- a/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/InputPassword.test.js.snap
+++ b/packages/dnb-eufemia/src/components/input/__tests__/__snapshots__/InputPassword.test.js.snap
@@ -160,7 +160,7 @@ exports[`InputPassword component have to match snapshot 1`] = `
     value="test"
   >
     <span
-      className="dnb-input dnb-input--password dnb-form-component dnb-input--password dnb-input--has-submit-element"
+      className="dnb-input dnb-form-component dnb-input--password dnb-input--password dnb-input--has-submit-element"
       data-has-content="true"
       data-input-state="virgin"
     >
diff --git a/packages/dnb-eufemia/src/components/skeleton/__tests__/__snapshots__/Skeleton.test.js.snap b/packages/dnb-eufemia/src/components/skeleton/__tests__/__snapshots__/Skeleton.test.js.snap
index 908f4c9239d..a67848a4ffc 100644
--- a/packages/dnb-eufemia/src/components/skeleton/__tests__/__snapshots__/Skeleton.test.js.snap
+++ b/packages/dnb-eufemia/src/components/skeleton/__tests__/__snapshots__/Skeleton.test.js.snap
@@ -121,7 +121,7 @@ exports[`Skeleton component have to match snapshot 1`] = `
             value="initval"
           >
             <span
-              className="dnb-input dnb-input--text dnb-form-component"
+              className="dnb-input dnb-form-component dnb-input--text"
               data-has-content="true"
               data-input-state="virgin"
             >