From d2092a1b2e724ecc00ef73d9c274713618c705c9 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Fri, 13 Oct 2023 17:37:58 -0400
Subject: [PATCH 1/6] test(input-icon): add a11y; visual tests

---
 .../input-icon/input-icon.a11y.test.ts        | 84 +++++++++++++++++
 .../input-icon/input-icon.visual.test.ts      | 94 +++++++++++++++++++
 2 files changed, 178 insertions(+)
 create mode 100644 lib/components/input-icon/input-icon.a11y.test.ts
 create mode 100644 lib/components/input-icon/input-icon.visual.test.ts

diff --git a/lib/components/input-icon/input-icon.a11y.test.ts b/lib/components/input-icon/input-icon.a11y.test.ts
new file mode 100644
index 0000000000..fe7dd17928
--- /dev/null
+++ b/lib/components/input-icon/input-icon.a11y.test.ts
@@ -0,0 +1,84 @@
+import { html } from "@open-wc/testing";
+import { defaultOptions, runComponentTests } from "../../test/test-utils";
+import "../../index";
+
+const modifiers = [
+    {
+        name: "error",
+        parentClasses: "has-error",
+    },
+    {
+        name: "success",
+        parentClasses: "has-success",
+    },
+    {
+        name: "warning",
+        parentClasses: "has-warning",
+    },
+    {
+        name: "disabled",
+        parentClasses: "is-disabled",
+    },
+    {
+        name: "readonly",
+        parentClasses: "is-readonly",
+    },
+    {
+        name: "creditcard",
+        modifier: "creditcard",
+        inputClasses: "s-input__creditcard",
+    },
+    {
+        name: "search",
+        modifier: "search",
+        inputClasses: "s-input__search",
+    },
+];
+
+const getSvgPath = (name: string) => {
+    switch (name) {
+        case "creditcard":
+            return '<path d="M3 3h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2Zm0 6v4h12V9H3Zm0-3h12V5H3v1Z"></path>';
+        case "search":
+            return '<path d="m18 16.5-5.14-5.18h-.35a7 7 0 1 0-1.19 1.19v.35L16.5 18l1.5-1.5ZM12 7A5 5 0 1 1 2 7a5 5 0 0 1 10 0Z"></path>';
+        default:
+            return '<path d="M9.06 3C4 3 1 9 1 9s3 6 8.06 6C14 15 17 9 17 9s-3-6-7.94-6ZM9 13a4 4 0 1 1 0-8 4 4 0 0 1 0 8Zm0-2a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2Z"></path>'; // eye icon path
+    }
+};
+
+modifiers.forEach(({ name, parentClasses, modifier }) => {
+    describe("input-icon", () => {
+        runComponentTests({
+            type: "a11y",
+            baseClass: `s-input-icon`,
+            tag: "svg",
+            children: {
+                default: getSvgPath(name), // IconSearch
+            },
+            modifiers: {
+                standalone: modifier ? [`${modifier}`] : [],
+                global: parentClasses ? [`parent-${parentClasses}`] : [],
+            },
+            attributes: {
+                "aria-hidden": "true",
+                "width": "18",
+                "height": "18",
+                "viewBox": "0 0 18 18",
+            },
+            template: ({ component, testid }) => html`
+                <div
+                    data-testid="${testid}"
+                    class="d-flex fd-column g4 fc-black ps-relative wmx2 p8 ${parentClasses ??
+                    ""}"
+                >
+                    <div class="d-flex ps-relative svg-icon">${component}</div>
+                </div>
+            `,
+            options: {
+                ...defaultOptions,
+                includeNullModifier: false,
+            },
+            skippedTestids: [],
+        });
+    });
+});
diff --git a/lib/components/input-icon/input-icon.visual.test.ts b/lib/components/input-icon/input-icon.visual.test.ts
new file mode 100644
index 0000000000..b4c14f5586
--- /dev/null
+++ b/lib/components/input-icon/input-icon.visual.test.ts
@@ -0,0 +1,94 @@
+import { html } from "@open-wc/testing";
+import { defaultOptions, runComponentTests } from "../../test/test-utils";
+import "../../index";
+
+const modifiers = [
+    {
+        name: "error",
+        parentClasses: "has-error",
+    },
+    {
+        name: "success",
+        parentClasses: "has-success",
+    },
+    {
+        name: "warning",
+        parentClasses: "has-warning",
+    },
+    {
+        name: "disabled",
+        parentClasses: "is-disabled",
+    },
+    {
+        name: "readonly",
+        parentClasses: "is-readonly",
+    },
+    {
+        name: "creditcard",
+        modifier: "creditcard",
+        inputClasses: "s-input__creditcard",
+    },
+    {
+        name: "search",
+        modifier: "search",
+        inputClasses: "s-input__search",
+    },
+];
+
+const getSvgPath = (name: string) => {
+    switch (name) {
+        case "creditcard":
+            return '<path d="M3 3h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2Zm0 6v4h12V9H3Zm0-3h12V5H3v1Z"></path>';
+        case "search":
+            return '<path d="m18 16.5-5.14-5.18h-.35a7 7 0 1 0-1.19 1.19v.35L16.5 18l1.5-1.5ZM12 7A5 5 0 1 1 2 7a5 5 0 0 1 10 0Z"></path>';
+        default:
+            return '<path d="M9.06 3C4 3 1 9 1 9s3 6 8.06 6C14 15 17 9 17 9s-3-6-7.94-6ZM9 13a4 4 0 1 1 0-8 4 4 0 0 1 0 8Zm0-2a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2Z"></path>'; // eye icon path
+    }
+};
+
+modifiers.forEach(({ name, parentClasses, modifier, inputClasses }) => {
+    describe("input-icon", () => {
+        runComponentTests({
+            type: "visual",
+            baseClass: `s-input-icon`,
+            tag: "svg",
+            children: {
+                default: getSvgPath(name), // IconSearch
+            },
+            modifiers: {
+                standalone: modifier ? [`${modifier}`] : [],
+                global: parentClasses ? [`parent-${parentClasses}`] : [],
+            },
+            attributes: {
+                "aria-hidden": "true",
+                "width": "18",
+                "height": "18",
+                "viewBox": "0 0 18 18",
+            },
+            template: ({ component, testid }) => html`
+                <div
+                    data-testid="${testid}"
+                    class="d-flex fd-column g4 fc-black ps-relative wmx2 p8 ${parentClasses ??
+                    ""}"
+                >
+                    <label class="s-label v-visible-sr" for="ex-input"
+                        >Input</label
+                    >
+                    <div class="d-flex ps-relative svg-icon">
+                        <input
+                            id="ex-input"
+                            type="text"
+                            class="s-input ${inputClasses ?? ""}"
+                            placeholder="${name} input…"
+                        />
+                        ${component}
+                    </div>
+                </div>
+            `,
+            options: {
+                ...defaultOptions,
+                includeNullModifier: false,
+            },
+        });
+    });
+});

From 512c8d8c4658ab55970293e9476cf8442412d267 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Tue, 17 Oct 2023 14:02:24 -0400
Subject: [PATCH 2/6] Generate baseline visual regression images

---
 screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png | 3 +++
 .../Chromium/baseline/s-input-icon-dark-parent-has-error.png   | 3 +++
 .../Chromium/baseline/s-input-icon-dark-parent-has-success.png | 3 +++
 .../Chromium/baseline/s-input-icon-dark-parent-has-warning.png | 3 +++
 .../Chromium/baseline/s-input-icon-dark-parent-is-disabled.png | 3 +++
 .../Chromium/baseline/s-input-icon-dark-parent-is-readonly.png | 3 +++
 screenshots/Chromium/baseline/s-input-icon-dark-search.png     | 3 +++
 screenshots/Chromium/baseline/s-input-icon-dark.png            | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png     | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-error.png        | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-success.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-warning.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-disabled.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-readonly.png      | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-search.png         | 3 +++
 .../Chromium/baseline/s-input-icon-highcontrast-dark.png       | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png    | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-error.png       | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-success.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-warning.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-disabled.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-readonly.png     | 3 +++
 .../baseline/s-input-icon-highcontrast-light-search.png        | 3 +++
 .../Chromium/baseline/s-input-icon-highcontrast-light.png      | 3 +++
 .../Chromium/baseline/s-input-icon-light-creditcard.png        | 3 +++
 .../Chromium/baseline/s-input-icon-light-parent-has-error.png  | 3 +++
 .../baseline/s-input-icon-light-parent-has-success.png         | 3 +++
 .../baseline/s-input-icon-light-parent-has-warning.png         | 3 +++
 .../baseline/s-input-icon-light-parent-is-disabled.png         | 3 +++
 .../baseline/s-input-icon-light-parent-is-readonly.png         | 3 +++
 screenshots/Chromium/baseline/s-input-icon-light-search.png    | 3 +++
 screenshots/Chromium/baseline/s-input-icon-light.png           | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png  | 3 +++
 .../Firefox/baseline/s-input-icon-dark-parent-has-error.png    | 3 +++
 .../Firefox/baseline/s-input-icon-dark-parent-has-success.png  | 3 +++
 .../Firefox/baseline/s-input-icon-dark-parent-has-warning.png  | 3 +++
 .../Firefox/baseline/s-input-icon-dark-parent-is-disabled.png  | 3 +++
 .../Firefox/baseline/s-input-icon-dark-parent-is-readonly.png  | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark-search.png      | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark.png             | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png     | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-error.png        | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-success.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-warning.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-disabled.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-readonly.png      | 3 +++
 .../Firefox/baseline/s-input-icon-highcontrast-dark-search.png | 3 +++
 .../Firefox/baseline/s-input-icon-highcontrast-dark.png        | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png    | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-error.png       | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-success.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-warning.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-disabled.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-readonly.png     | 3 +++
 .../baseline/s-input-icon-highcontrast-light-search.png        | 3 +++
 .../Firefox/baseline/s-input-icon-highcontrast-light.png       | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light-creditcard.png | 3 +++
 .../Firefox/baseline/s-input-icon-light-parent-has-error.png   | 3 +++
 .../Firefox/baseline/s-input-icon-light-parent-has-success.png | 3 +++
 .../Firefox/baseline/s-input-icon-light-parent-has-warning.png | 3 +++
 .../Firefox/baseline/s-input-icon-light-parent-is-disabled.png | 3 +++
 .../Firefox/baseline/s-input-icon-light-parent-is-readonly.png | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light-search.png     | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light.png            | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png   | 3 +++
 .../Webkit/baseline/s-input-icon-dark-parent-has-error.png     | 3 +++
 .../Webkit/baseline/s-input-icon-dark-parent-has-success.png   | 3 +++
 .../Webkit/baseline/s-input-icon-dark-parent-has-warning.png   | 3 +++
 .../Webkit/baseline/s-input-icon-dark-parent-is-disabled.png   | 3 +++
 .../Webkit/baseline/s-input-icon-dark-parent-is-readonly.png   | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark-search.png       | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark.png              | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png     | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-error.png        | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-success.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-has-warning.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-disabled.png      | 3 +++
 .../s-input-icon-highcontrast-dark-parent-is-readonly.png      | 3 +++
 .../Webkit/baseline/s-input-icon-highcontrast-dark-search.png  | 3 +++
 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png    | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-error.png       | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-success.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-has-warning.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-disabled.png     | 3 +++
 .../s-input-icon-highcontrast-light-parent-is-readonly.png     | 3 +++
 .../Webkit/baseline/s-input-icon-highcontrast-light-search.png | 3 +++
 .../Webkit/baseline/s-input-icon-highcontrast-light.png        | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light-creditcard.png  | 3 +++
 .../Webkit/baseline/s-input-icon-light-parent-has-error.png    | 3 +++
 .../Webkit/baseline/s-input-icon-light-parent-has-success.png  | 3 +++
 .../Webkit/baseline/s-input-icon-light-parent-has-warning.png  | 3 +++
 .../Webkit/baseline/s-input-icon-light-parent-is-disabled.png  | 3 +++
 .../Webkit/baseline/s-input-icon-light-parent-is-readonly.png  | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light-search.png      | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light.png             | 3 +++
 96 files changed, 288 insertions(+)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-search.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-search.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light.png

diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
new file mode 100644
index 0000000000..2e0fbfd4fe
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f70445407be82c467afeaeb651afe1ae694e34d84e259e1fd38b508defb960f1
+size 2162
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
new file mode 100644
index 0000000000..219fbe828e
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c927108bd5f6a88a2c49cad17f451c8f65e331ac8696248ab4a7545ea959a7ec
+size 1961
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
new file mode 100644
index 0000000000..5e01dcadb6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbdf624cc52cc3173f91e1cebbbea9910a041d3cec1a4d2c1cf207cc965dd028
+size 2372
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
new file mode 100644
index 0000000000..d30a77cca6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92a8a8d386d4284b3d49a60baf6b81416369fec5923f5f886b772c19f0c52055
+size 2287
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..aee83187d8
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba755945f64f483f701a4f217e0e8114f58ebf9d56c42e06f916c6e999f81537
+size 2414
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..d75cf60975
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03d13f424e94929821bc346a6f0c287790b31b3e9a507f8f1ed42b8cfc6f508c
+size 2261
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
new file mode 100644
index 0000000000..05004a605b
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6921956c7bf14b8b1738d2d1da56ea543c01175c108ba3569e0d655ea07c2b2
+size 2352
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark.png b/screenshots/Chromium/baseline/s-input-icon-dark.png
new file mode 100644
index 0000000000..e0008d88db
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ca5cd4fa174b572e8efe34a0a8e1f17c01cc40d2c24d260d42e260bba35911d
+size 2302
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
new file mode 100644
index 0000000000..f1d836982d
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5aa4426df4600358912a6fc32df02c6a2bbeebd9a2445855ea9c005855e758d6
+size 2308
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
new file mode 100644
index 0000000000..b7ad9c6281
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15544318fa8e0f54c20bfc87cf7fe0c8e678bc24036b3932857022f348f2fc5c
+size 2033
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
new file mode 100644
index 0000000000..821f8c68b6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a3ca78d1b66cbcb28f822a1afe0edf9500610401e249bd4f3ec072dabe163ed
+size 2492
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
new file mode 100644
index 0000000000..99dd58ecbf
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef8ddddfc10ad83357b925bbcf04a8c884410fb339f3bd6a3bc734ebd52501e7
+size 2323
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..f4f3840792
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:571b8024e444c54a7404dce78a38170c71e0f786f61c67ac5d980086fbdd7d7f
+size 2535
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..e3123ce69e
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:930d241ad9d2ab9953b015b2cb182e3d521c4c5c68b344f90d14b7733b7f7b77
+size 2515
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
new file mode 100644
index 0000000000..31bd967875
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4c8bb9afbadc4d55e3c09f5ee3ced4bc461514dd9341e058e66189c9e021840
+size 2463
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
new file mode 100644
index 0000000000..1c9b7d391a
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eedbfa7e9514f975d36609b97e86ce407ee9f686cdc9190190ef0ffca36a54ff
+size 2404
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
new file mode 100644
index 0000000000..604383ace2
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63f790dbf334e4bc3d4ae218182b219c685ffd142a6291fc7818f54c1f90a80b
+size 2296
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
new file mode 100644
index 0000000000..8a7cb9cd43
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:579e71eeed796b4cea50b6814b2a5689675df9e011e9f6f27209c51ba8350b77
+size 2021
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
new file mode 100644
index 0000000000..2c70c21151
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0641777b6ee00bca630f95eafb8de10c10f1a63358852c7bde7c3e6e45b3d01e
+size 2535
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
new file mode 100644
index 0000000000..a689758d28
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aea21be1ac70a33164f3d185a7703757320e52856fc75413d4d3c0c326656605
+size 2363
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
new file mode 100644
index 0000000000..4f646f0cdf
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93458e3f1cac870f6b822c221ac3e605f28b09179ef765b639fa97e433e32909
+size 2505
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
new file mode 100644
index 0000000000..5167e451f6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84f50acb5ddeb313ac0f53d28c00354291eed0f46945509f39e5280df7b0255d
+size 2534
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
new file mode 100644
index 0000000000..7787526b81
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:207e87a5cc3a64e9bccdd232446a5d9c98ceb7f306d60dd6fb3545ed9a479dd8
+size 2414
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
new file mode 100644
index 0000000000..fdee204277
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5493cc5233d58ab883af728ea1bb6395b687655e11bb1f34869353556aa2e3cf
+size 2407
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
new file mode 100644
index 0000000000..180eb5ef94
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f097d5d1b58ddab948d04c8c0a98574da615565e487a9debb481123b07496fe0
+size 2055
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
new file mode 100644
index 0000000000..0725ec1691
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cf14b05dc8015e408139fb998427461cf6ca505297ee70fe45c40773762e9c0
+size 1905
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
new file mode 100644
index 0000000000..7136c59ed7
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31bd4966ca579961dadde305b2582bf64312be1ec7e90be0b56037ecf63bbb1c
+size 2339
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
new file mode 100644
index 0000000000..f8896d14e0
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a44a8458d09757ab680b7f73c62ac0b1378c9f019ef2720c697bcd72aea9ae3
+size 2192
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
new file mode 100644
index 0000000000..35b078f1b5
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a03636090d42a72924ae0a6e6d772436ff02a02ac70d5f42f3a62105c9a5da6
+size 2346
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
new file mode 100644
index 0000000000..14c0e09967
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f9bee40c01f851d05bb1dfefc4ec8eaa7b849eb3d968e8153e57e6d6f2df618
+size 2123
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-search.png b/screenshots/Chromium/baseline/s-input-icon-light-search.png
new file mode 100644
index 0000000000..1b943fcea4
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7add6721579441eb7368c9ed11f03d4259b4069b35f4961cbc2d615cee3e52e9
+size 2291
diff --git a/screenshots/Chromium/baseline/s-input-icon-light.png b/screenshots/Chromium/baseline/s-input-icon-light.png
new file mode 100644
index 0000000000..9781ea0727
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62b77806d2635730bac6e7df7a9be8868512eb6d69f7028b3a1bcca1095b361c
+size 2209
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
new file mode 100644
index 0000000000..9f4288baaf
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1852f7ff03fda357157e47eb6259c128370547825529b282704e627fa8d8d3a1
+size 2363
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
new file mode 100644
index 0000000000..8bcedb6890
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23f1eefee74c9969bc7e7716fe3850736fa8ce333b4d7842c4b16cc8b74d9040
+size 2122
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
new file mode 100644
index 0000000000..3680ca8fc3
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3638a91079cee2e6accd351b6b7e4c5393eb856c37825fe8681581be4e4fca30
+size 2447
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
new file mode 100644
index 0000000000..f939cc8f6f
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe834192d619cb9ce4f0dce22d896dbd47f82b29873d568467bc32edfa1e5109
+size 2410
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..7ad979a616
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8993b3fc03a9fbcd513d6879e6fa8aa30fe55fd6bb2dd17f8d84a1bb79c3b6a0
+size 2585
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..c5bf374e0c
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:488a888b2a4e80fc758b42a0ab693188424561d702dcd45801eb4fb2f7c8b40b
+size 2437
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
new file mode 100644
index 0000000000..241afbf1dd
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d608b39c950859574aaa88f02d2cf96ef86fae1c4cde55c74eed51910ccc5bea
+size 2402
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark.png b/screenshots/Firefox/baseline/s-input-icon-dark.png
new file mode 100644
index 0000000000..395115db8e
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46f441315a707e0cd0d3099306761a38574e08eaf339db83a25f172f7dcd7fe2
+size 2374
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
new file mode 100644
index 0000000000..4bfd4a9789
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36cfe6ae789e068c61685fc6ffebcc33bcf36ba0eeca91711bbdc7e15987579f
+size 2465
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
new file mode 100644
index 0000000000..e592b0ad3b
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c24a7e3217548c2c533f27f3d96d5bbbd947865580c2177bb20e46268a8c790f
+size 2128
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
new file mode 100644
index 0000000000..54956da2e6
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a45e8b4908d39818ab8431240de914cc46f2e7eca3179f3f3e9c2f9cf22d6dfd
+size 2529
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
new file mode 100644
index 0000000000..862cc81208
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13e4549ec8e0e48e00db9d996dd6454d9b1358483407cfcaa1c03f789ec541c6
+size 2484
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..0b7c538291
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:460ce4fa723ae13baa2e89dcd8c4a60884f96cfc490b1db00087988bd4828a1a
+size 2647
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..457c75785c
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2db370c87e5515d4427e7f9eb48998ac8be354d3e6a98b5b1d8937a1fae4a643
+size 2740
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
new file mode 100644
index 0000000000..0686087dd2
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:100478050435711585d4438aec70b13647780843a4e1da41abc5b7ef5c453444
+size 2469
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
new file mode 100644
index 0000000000..e978290b32
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39d9cab083768b57ee45636b57d18874ef7f91571be75b86dce9b0d3734a0258
+size 2440
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
new file mode 100644
index 0000000000..41956ebd22
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03ee2e5bd8810f85979ae5ffdbf7c2b94a7217b102478b2b3ea3d9986fd87199
+size 2445
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
new file mode 100644
index 0000000000..c104bb83e4
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9edde7d131eb718390f99e60c9ae4bc536bba3e47a741fd872eab0419a0b65bb
+size 2084
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
new file mode 100644
index 0000000000..b0da64a264
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6687244aabc3e36b031733af725d10671c694ae91b107fcda497807008547e62
+size 2535
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
new file mode 100644
index 0000000000..41faca855b
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e58b2321ed8911425088d0939786af0338ed1b1f222f92c94c067823d1af6933
+size 2496
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
new file mode 100644
index 0000000000..da4c91a81b
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a28d1626f4c66a36bac0aff343c3312d1266dad81529bbd0a134fe15a68762f
+size 2631
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
new file mode 100644
index 0000000000..4bfeaa66ed
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db1f9d852efe5705977730bd3767e012419af15acffedd401467c5972eb9d00a
+size 2726
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
new file mode 100644
index 0000000000..70d5b462fd
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d94a4c6f6bc1c1a4722da78ee6288b6095f4ddd73a57838bc89160428e9d48ef
+size 2456
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
new file mode 100644
index 0000000000..d4e4172820
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:798dfd3aed994b692b6081853129a571ebcb2af7d143087a43d984114558d065
+size 2405
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
new file mode 100644
index 0000000000..d770c1128f
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b284e92229c718dfb5911685a2b0930d2b51b59757d79380bfb238919d9d71ae
+size 2197
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
new file mode 100644
index 0000000000..07f61fa0b2
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f559b1a67a507dbe22eab8b61a7f67700794c42beba4545923349a36ee2ec07
+size 1969
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
new file mode 100644
index 0000000000..3d3361bbc7
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f21b1b0009f96e9b9ebad3fdac6616adce95762f7554c0ad5c639f396dc40b18
+size 2375
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
new file mode 100644
index 0000000000..8a1acf0593
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e31202b67b956630ca0ced00d236d83ef874f6b7f760113bbbcd593f46654c98
+size 2356
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
new file mode 100644
index 0000000000..abd511c8d4
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bdb96ac22953693e4a40c66ab9781ebfb307b35c5a2ff9ea6089cdfd713cec1
+size 2439
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
new file mode 100644
index 0000000000..85c29cc958
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bdc2a31b4bb5ff9cb13f0a9d7da488e14cc8fda9ca985786ab794b4337cebd5
+size 2345
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-search.png b/screenshots/Firefox/baseline/s-input-icon-light-search.png
new file mode 100644
index 0000000000..b731d06bc4
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63a24ab0d1cfe5e3cd8f1465e84eb0a13c76cbe40a1d3b1a5979ebe73b372f69
+size 2273
diff --git a/screenshots/Firefox/baseline/s-input-icon-light.png b/screenshots/Firefox/baseline/s-input-icon-light.png
new file mode 100644
index 0000000000..101bd4d364
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69100f239a131a36e447d6cf4b26ec3dd85ed186bb6cec664b4c32b5ae35b9b5
+size 2194
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
new file mode 100644
index 0000000000..7d143bc7be
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89f2ef1a6552b12b8d0b472c9c2358eef5b9d125cf61dc5be9ddef57f82b8012
+size 1866
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
new file mode 100644
index 0000000000..ba44edc9d4
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1764aa3b40e89e298d00d8d9c8b50224999ac4663e11143f95def1202610c3c7
+size 1913
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
new file mode 100644
index 0000000000..a9a2ea4e42
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43bc976d2eb5771b659817ec91dd50983b1a869db9fd204eded8cbdc411d179e
+size 1992
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
new file mode 100644
index 0000000000..4aff181939
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aea1801cb4082ee1a1d68c0b98f9a568b7c01bc790fb5341f8dffb4137e3ebff
+size 2147
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..4fa4b3ffaa
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a67bc2c5bdf999f29bb45bcb3aafc18c8c63d463b27c19441f4e437b21b0f7be
+size 2207
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..8610d890ae
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1104086ddc94b2376ae07ac2a391a206aa169386b6148e36f25e8b035957dcf8
+size 2081
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-search.png b/screenshots/Webkit/baseline/s-input-icon-dark-search.png
new file mode 100644
index 0000000000..43d14aa053
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2663f1d27cc830bfde723631e66594304625931b8106bc27ee35270f7bc1e58d
+size 2258
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark.png b/screenshots/Webkit/baseline/s-input-icon-dark.png
new file mode 100644
index 0000000000..92aaf54310
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d39821378aef89e0f3adcab840a4d4e93a45d2dd875a09b73345032fc5d8c03
+size 2258
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
new file mode 100644
index 0000000000..5f702ab33c
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69932802238585504e37ac372c6805bba10286546c4aa45516258c5049c3411b
+size 1820
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
new file mode 100644
index 0000000000..02e3e1cd59
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59f96584638ff642394d64f203014f91349fa2eb3e83a04cc93b3954e8788cec
+size 1899
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
new file mode 100644
index 0000000000..f27961742a
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1445049da1a664fffd7be79e5ccf8be8d7826f2b774a8c51a68f16ba3413f205
+size 1996
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
new file mode 100644
index 0000000000..0afe6529f6
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cee969352c9aa2998d92ba65873e4468e3a6666e65eaec5ab704887fa04392e6
+size 2081
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
new file mode 100644
index 0000000000..bcb7166496
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1d4ac6926595be2161dd9c1fb7ec4047cf7737b1e2ce24b0ceff2434d32a919
+size 2131
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
new file mode 100644
index 0000000000..e01f439daa
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aa12bb10b561e5730c52d2a5062c922cbd7a1ec7a0fdca35fc16473623415d1
+size 2253
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
new file mode 100644
index 0000000000..f155b94eb2
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac12e7b61ede0d37d000fcb24b118be33836386424218d6cc0a4936a855acd63
+size 2180
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
new file mode 100644
index 0000000000..70112fd6b7
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3278aa5e466a68c7430c92c99ae253699dd8ba0019d1ae9dd3121a29f894a5aa
+size 2118
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
new file mode 100644
index 0000000000..295c7bbcbc
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ba2a41b834a155ae3f8c1731c8154f360fa3962004d95e52a5578d67e5ae37a
+size 1940
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png
new file mode 100644
index 0000000000..f23f178659
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f9ff096d44b1068fe32a7672ccd0ef48e7596839bf0d9cbc961988875c85d58
+size 1969
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png
new file mode 100644
index 0000000000..e8ec7918f1
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b5c1c82cf1ef1fa00a909a23b6d07bc1974051ab6ae38045c31d7c39f6f22ad
+size 2090
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
new file mode 100644
index 0000000000..461bb0e7d8
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc97f4a58d2ef5965f64843a0de00e5ac0b8742d01d6bda23209d12080de3abc
+size 2225
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
new file mode 100644
index 0000000000..1264fc7214
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:827b24b38d465097cb85e2c7ef3ecf9dbd728ce92a6ef4157f43525accc9aec5
+size 2246
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
new file mode 100644
index 0000000000..4751d96e0b
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47e7cabdcdaf4e24d3d81a6d39a68ecd4035f165f48df3e34c6c2d5efbe0f6c4
+size 2287
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
new file mode 100644
index 0000000000..c73b48ffe1
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55848d839d3f568689dff0a198830405917ce0477bb0f14d7d2503156bc85a37
+size 2299
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
new file mode 100644
index 0000000000..08fa69070d
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30f705b7ef08bb30aa377a177d384f18f7d24e271f3fe1639c44d2f88cef2645
+size 2292
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
new file mode 100644
index 0000000000..b0920fabab
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9ebdcb0e5d8e9fd98363e0d1a0559917787a43ad7922f88ad36a74fdfab1502
+size 1764
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png
new file mode 100644
index 0000000000..c79b1faf70
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f668fd7b208db32a7ec4cddb77b5e7a78ccdf9e1a0dcbaae4ea1f5503edabd7
+size 1804
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png
new file mode 100644
index 0000000000..0507ac8064
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53ae2241f5d11ed94cb8a2b61785efca98fd0911b5299e2c2443a44051228d5c
+size 1975
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png
new file mode 100644
index 0000000000..ab0a4b9042
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:137a7c0f56fa25cf61f76f89bc60d714fbef52ef8b97e5e60972567ebd1b37b9
+size 2032
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png
new file mode 100644
index 0000000000..539bb1cf43
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52efbaa064d9944aeb1070015a4fce8e62e10831276ab7d903ad3907542715f7
+size 2088
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png
new file mode 100644
index 0000000000..4b0914a091
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49b78d147d03e11d35cbf222a8b09ead2416cf2575b2cc965f4cd88fd363879a
+size 1926
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-search.png b/screenshots/Webkit/baseline/s-input-icon-light-search.png
new file mode 100644
index 0000000000..05ddf17b34
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb62eb53a653cb328295a83533dd0de45f0df46aef827039dcb386cd570dbbeb
+size 2157
diff --git a/screenshots/Webkit/baseline/s-input-icon-light.png b/screenshots/Webkit/baseline/s-input-icon-light.png
new file mode 100644
index 0000000000..93954cc0c0
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7330e20c51ff1f7971f7ad71f1c021ede06ca974dbacdb8f99b1036dff6c507d
+size 2116

From d761edc27d8000d4d61eace3ff69cfa9a2c5ec70 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Wed, 25 Oct 2023 16:38:15 -0400
Subject: [PATCH 3/6] Update baseline images

---
 .../Chromium/baseline/s-input-icon-dark-creditcard.png        | 4 ++--
 .../Chromium/baseline/s-input-icon-dark-parent-has-error.png  | 4 ++--
 .../baseline/s-input-icon-dark-parent-has-success.png         | 4 ++--
 .../baseline/s-input-icon-dark-parent-has-warning.png         | 4 ++--
 .../baseline/s-input-icon-dark-parent-is-disabled.png         | 4 ++--
 .../baseline/s-input-icon-dark-parent-is-readonly.png         | 4 ++--
 screenshots/Chromium/baseline/s-input-icon-dark-search.png    | 4 ++--
 screenshots/Chromium/baseline/s-input-icon-dark.png           | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png    | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-error.png       | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-success.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-warning.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-is-disabled.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-is-readonly.png     | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-search.png        | 4 ++--
 .../Chromium/baseline/s-input-icon-highcontrast-dark.png      | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-creditcard.png   | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-error.png      | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-success.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-warning.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-is-disabled.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-is-readonly.png    | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-search.png       | 4 ++--
 .../Chromium/baseline/s-input-icon-highcontrast-light.png     | 4 ++--
 .../Chromium/baseline/s-input-icon-light-creditcard.png       | 4 ++--
 .../Chromium/baseline/s-input-icon-light-parent-has-error.png | 4 ++--
 .../baseline/s-input-icon-light-parent-has-success.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-has-warning.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-is-disabled.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-is-readonly.png        | 4 ++--
 screenshots/Chromium/baseline/s-input-icon-light-search.png   | 4 ++--
 screenshots/Chromium/baseline/s-input-icon-light.png          | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png | 4 ++--
 .../Firefox/baseline/s-input-icon-dark-parent-has-error.png   | 4 ++--
 .../Firefox/baseline/s-input-icon-dark-parent-has-success.png | 4 ++--
 .../Firefox/baseline/s-input-icon-dark-parent-has-warning.png | 4 ++--
 .../Firefox/baseline/s-input-icon-dark-parent-is-disabled.png | 4 ++--
 .../Firefox/baseline/s-input-icon-dark-parent-is-readonly.png | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-dark-search.png     | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-dark.png            | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png    | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-error.png       | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-success.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-warning.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-is-disabled.png     | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-is-readonly.png     | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-search.png        | 4 ++--
 .../Firefox/baseline/s-input-icon-highcontrast-dark.png       | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-creditcard.png   | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-error.png      | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-success.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-warning.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-is-disabled.png    | 4 ++--
 .../s-input-icon-highcontrast-light-parent-is-readonly.png    | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-search.png       | 4 ++--
 .../Firefox/baseline/s-input-icon-highcontrast-light.png      | 4 ++--
 .../Firefox/baseline/s-input-icon-light-creditcard.png        | 4 ++--
 .../Firefox/baseline/s-input-icon-light-parent-has-error.png  | 4 ++--
 .../baseline/s-input-icon-light-parent-has-success.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-has-warning.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-is-disabled.png        | 4 ++--
 .../baseline/s-input-icon-light-parent-is-readonly.png        | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-light-search.png    | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-light.png           | 4 ++--
 .../Webkit/baseline/s-input-icon-dark-parent-has-error.png    | 4 ++--
 .../Webkit/baseline/s-input-icon-dark-parent-has-success.png  | 4 ++--
 .../Webkit/baseline/s-input-icon-dark-parent-has-warning.png  | 4 ++--
 67 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
index 2e0fbfd4fe..9a933d157a 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f70445407be82c467afeaeb651afe1ae694e34d84e259e1fd38b508defb960f1
-size 2162
+oid sha256:7541f2ac3f2ad631de60d1256ed6ec30f6997a009a12706908f529e6cb623232
+size 2157
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
index 219fbe828e..ef84c1a0c6 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c927108bd5f6a88a2c49cad17f451c8f65e331ac8696248ab4a7545ea959a7ec
-size 1961
+oid sha256:c6325430ce97aa6294f3730a57030537ca1af2b04ec52465d7b5a2b0bdea636d
+size 2052
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
index 5e01dcadb6..d4830ceb11 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbdf624cc52cc3173f91e1cebbbea9910a041d3cec1a4d2c1cf207cc965dd028
-size 2372
+oid sha256:6c0747e561fbc6aaa547c8ada6a54a6d5aa383caf4688365673a8ecde48b0c18
+size 2421
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
index d30a77cca6..b30ed4a97a 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92a8a8d386d4284b3d49a60baf6b81416369fec5923f5f886b772c19f0c52055
-size 2287
+oid sha256:3bb40175071ead9cfb62408ade5100403f91a257bb890493c6db4fa66f8be0d2
+size 2331
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
index aee83187d8..4e485f4a1b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba755945f64f483f701a4f217e0e8114f58ebf9d56c42e06f916c6e999f81537
-size 2414
+oid sha256:bf52a5d1ee065f56c5ab905fbb972ece838bcba3dc0aef76738fbfa29c61e091
+size 2480
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
index d75cf60975..caefa1880f 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03d13f424e94929821bc346a6f0c287790b31b3e9a507f8f1ed42b8cfc6f508c
-size 2261
+oid sha256:264471231e86651e3b2abd18ff60e035e8207a221a5cbc5e0cde4559f7622ccb
+size 2311
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
index 05004a605b..cb3add44cf 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6921956c7bf14b8b1738d2d1da56ea543c01175c108ba3569e0d655ea07c2b2
-size 2352
+oid sha256:d9a2ad89dcb262204a688ba18550ee7bde4fa26e5946ef9c3f66d8c82a276514
+size 2457
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark.png b/screenshots/Chromium/baseline/s-input-icon-dark.png
index e0008d88db..2c25fab15d 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ca5cd4fa174b572e8efe34a0a8e1f17c01cc40d2c24d260d42e260bba35911d
-size 2302
+oid sha256:8d6eb7996b2081ef143c79514931ed56d5b78cd1870e44ad9aaac3354622d1fe
+size 2450
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
index f1d836982d..10ae4bf379 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aa4426df4600358912a6fc32df02c6a2bbeebd9a2445855ea9c005855e758d6
-size 2308
+oid sha256:c8e1f4ae2bf9831bad0fbd8b59b7e4af6bd329c658bb78af05259a78e1bbffd6
+size 2310
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
index b7ad9c6281..7a3fa90b85 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15544318fa8e0f54c20bfc87cf7fe0c8e678bc24036b3932857022f348f2fc5c
-size 2033
+oid sha256:353a9e44be78a434d0aae455ac0760df10cddba6c124ee66a5110a99c9b6b945
+size 2099
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
index 821f8c68b6..8326a73e4b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a3ca78d1b66cbcb28f822a1afe0edf9500610401e249bd4f3ec072dabe163ed
-size 2492
+oid sha256:5bca1f7d6622dd26e0f0509834d5b646dd2fd74be28b8673dae49ca80733f77c
+size 2582
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
index 99dd58ecbf..3e95f974aa 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef8ddddfc10ad83357b925bbcf04a8c884410fb339f3bd6a3bc734ebd52501e7
-size 2323
+oid sha256:91516121f75190b02a3a67ea5975c24e9ea6978581861afa1103f6d89a7d7b6d
+size 2397
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
index f4f3840792..4e4bcc6b4a 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:571b8024e444c54a7404dce78a38170c71e0f786f61c67ac5d980086fbdd7d7f
-size 2535
+oid sha256:197a4fb12080931cde5a19816ba94577570f8b7f76e4b835f6f43cdf396ace51
+size 2621
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
index e3123ce69e..b29aa89d63 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:930d241ad9d2ab9953b015b2cb182e3d521c4c5c68b344f90d14b7733b7f7b77
-size 2515
+oid sha256:a2a1c41e98c710addd2d7316c4e939d54844d59b806a80f3a630461fbc32c9fe
+size 2582
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
index 31bd967875..cdf1494643 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4c8bb9afbadc4d55e3c09f5ee3ced4bc461514dd9341e058e66189c9e021840
-size 2463
+oid sha256:f855ea417e03a2c30b11e9d06c5c2d6507c1226e77033a29541e744b066d9903
+size 2576
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
index 1c9b7d391a..220ef3b844 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eedbfa7e9514f975d36609b97e86ce407ee9f686cdc9190190ef0ffca36a54ff
-size 2404
+oid sha256:b7dd008f7801a0dcf80e67dd365e73672d21bcfc39868dc6afc5fdccbe90996a
+size 2516
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
index 604383ace2..11ebb29b1b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63f790dbf334e4bc3d4ae218182b219c685ffd142a6291fc7818f54c1f90a80b
-size 2296
+oid sha256:2e137b012bc9f89e6eeb2539e47949659f3048f8ace28555eae16a87940c2a30
+size 2302
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
index 8a7cb9cd43..f952c3ba95 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:579e71eeed796b4cea50b6814b2a5689675df9e011e9f6f27209c51ba8350b77
-size 2021
+oid sha256:0b77f0a354ec048072affcf119a3c01acbb6996b44aff6139e12265228147ca8
+size 2063
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
index 2c70c21151..b56d15501b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0641777b6ee00bca630f95eafb8de10c10f1a63358852c7bde7c3e6e45b3d01e
-size 2535
+oid sha256:781c70d8b449ddca690b0d604105668dd7178fcfe66ae513abf121cf8abbaf29
+size 2556
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
index a689758d28..f4b077fe6f 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aea21be1ac70a33164f3d185a7703757320e52856fc75413d4d3c0c326656605
-size 2363
+oid sha256:7b45453666844d1b695ac09fc8e74003db95f1842cf4ad5d40da69340cb49e31
+size 2394
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
index 4f646f0cdf..807ccd0743 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93458e3f1cac870f6b822c221ac3e605f28b09179ef765b639fa97e433e32909
-size 2505
+oid sha256:ceafb80de10b16ad581064fb9cac23a870f1e7213a5305ddb8511bef23d1f5d5
+size 2560
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
index 5167e451f6..7419ea530d 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84f50acb5ddeb313ac0f53d28c00354291eed0f46945509f39e5280df7b0255d
-size 2534
+oid sha256:d23d376fda9c2bf8cb11bd3d2f5d063bbe626e9bb2c240180af52acb7ca64c26
+size 2576
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
index 7787526b81..66433f1d14 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:207e87a5cc3a64e9bccdd232446a5d9c98ceb7f306d60dd6fb3545ed9a479dd8
-size 2414
+oid sha256:3803307bad6376fa91db516800d92159e7bd64e1a6bcaaa8eb7f7d4b6f1fc972
+size 2527
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
index fdee204277..4ec118870b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5493cc5233d58ab883af728ea1bb6395b687655e11bb1f34869353556aa2e3cf
-size 2407
+oid sha256:abcc214e05089f62e7fe4b8775348e9d33e73a02744c0d14676e8b04cf857d25
+size 2482
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
index 180eb5ef94..f7364cd4e3 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f097d5d1b58ddab948d04c8c0a98574da615565e487a9debb481123b07496fe0
-size 2055
+oid sha256:cdb2c2f0543d30af4b68aa7359dd91c8fefb8b39596592d52c877570c014b04d
+size 2050
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
index 0725ec1691..4c1a0d426c 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cf14b05dc8015e408139fb998427461cf6ca505297ee70fe45c40773762e9c0
-size 1905
+oid sha256:19215869d08391fb161f7c6577542a8ea7bd57395f95b94869318216509666f2
+size 1951
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
index 7136c59ed7..5beb41fefe 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31bd4966ca579961dadde305b2582bf64312be1ec7e90be0b56037ecf63bbb1c
-size 2339
+oid sha256:20617a4cc33b55868040df39f8ba9f43d92eed00c311ea7e8167392ccfe92d26
+size 2419
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
index f8896d14e0..5f5064f8af 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a44a8458d09757ab680b7f73c62ac0b1378c9f019ef2720c697bcd72aea9ae3
-size 2192
+oid sha256:14b440e62c3982cac82e5227bfd9a85e223dc63a862b979160bd358b87c7227e
+size 2217
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
index 35b078f1b5..9e8647c63d 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a03636090d42a72924ae0a6e6d772436ff02a02ac70d5f42f3a62105c9a5da6
-size 2346
+oid sha256:72ed6b758a4c7e5d12ff82f60aedcfbe6d8258faba2956e2dd164158cee6e174
+size 2389
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
index 14c0e09967..2529857baf 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f9bee40c01f851d05bb1dfefc4ec8eaa7b849eb3d968e8153e57e6d6f2df618
-size 2123
+oid sha256:57f1e32dc3e69eeb583d0e6f4aefd0f0b512bcee1ef2b3840bce2d8f03df4af0
+size 2153
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-search.png b/screenshots/Chromium/baseline/s-input-icon-light-search.png
index 1b943fcea4..13c1ff4511 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7add6721579441eb7368c9ed11f03d4259b4069b35f4961cbc2d615cee3e52e9
-size 2291
+oid sha256:2bf844e0966baec6907d8cdcedd6ed01740373d0e5386d6d19d2ab6094f5e8ff
+size 2405
diff --git a/screenshots/Chromium/baseline/s-input-icon-light.png b/screenshots/Chromium/baseline/s-input-icon-light.png
index 9781ea0727..d80dd2d319 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62b77806d2635730bac6e7df7a9be8868512eb6d69f7028b3a1bcca1095b361c
-size 2209
+oid sha256:43fc53b3083c92aacdcf3ec6abf50e6b29519dcde259cb25b2ff78c825e3031e
+size 2349
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
index 9f4288baaf..f769a31076 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1852f7ff03fda357157e47eb6259c128370547825529b282704e627fa8d8d3a1
-size 2363
+oid sha256:d4531ab556c87d4ade828504100ff64ddd3210599e3572cdf9c314b188c20440
+size 2427
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
index 8bcedb6890..0d44a951aa 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23f1eefee74c9969bc7e7716fe3850736fa8ce333b4d7842c4b16cc8b74d9040
-size 2122
+oid sha256:d4c6339e3ee278211de128126cf68620b53ebe4221eede1ce9569631f2d45a4d
+size 2241
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
index 3680ca8fc3..c1f00a2ba8 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3638a91079cee2e6accd351b6b7e4c5393eb856c37825fe8681581be4e4fca30
-size 2447
+oid sha256:6d947030ceb296080b715ebd47452029e155b644a0ddad2984cb22e5051bcea2
+size 2493
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
index f939cc8f6f..2327ba3928 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe834192d619cb9ce4f0dce22d896dbd47f82b29873d568467bc32edfa1e5109
-size 2410
+oid sha256:1217ad1c4fe752d3d558bf5e78b7107008754d32199c8f39b4989325497ab969
+size 2514
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
index 7ad979a616..7887b41aaf 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8993b3fc03a9fbcd513d6879e6fa8aa30fe55fd6bb2dd17f8d84a1bb79c3b6a0
-size 2585
+oid sha256:bc7061d1946bb04003939535b166e3bc42a7dc7fd7b583c1f545a2d5016f5cc2
+size 2665
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
index c5bf374e0c..1738c6e6c9 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:488a888b2a4e80fc758b42a0ab693188424561d702dcd45801eb4fb2f7c8b40b
-size 2437
+oid sha256:804ece896e7302beaf7e7667c03d08092c2b30fc967c63c670629e55466c312c
+size 2517
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
index 241afbf1dd..a09572308a 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d608b39c950859574aaa88f02d2cf96ef86fae1c4cde55c74eed51910ccc5bea
-size 2402
+oid sha256:4014ba9558239d60e95df49ea3ee6521556f3049e90adda47981e919c47ed4f2
+size 2479
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark.png b/screenshots/Firefox/baseline/s-input-icon-dark.png
index 395115db8e..0fd9179dd3 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46f441315a707e0cd0d3099306761a38574e08eaf339db83a25f172f7dcd7fe2
-size 2374
+oid sha256:c7d2728cf17517063234d97dcebd99a18e092649b52988edf31b76e950e7a575
+size 2436
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
index 4bfd4a9789..13cec645d9 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36cfe6ae789e068c61685fc6ffebcc33bcf36ba0eeca91711bbdc7e15987579f
-size 2465
+oid sha256:a61682981aeac5208f25599da14ae5d6630ad0e7e54f67a289a91821a68eecc3
+size 2556
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
index e592b0ad3b..e0c8f75327 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c24a7e3217548c2c533f27f3d96d5bbbd947865580c2177bb20e46268a8c790f
-size 2128
+oid sha256:c5573082e46ed96b2dfcb37fdf715a7787c763f3b11f1903be166f314df60ef9
+size 2258
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
index 54956da2e6..9a375b35e8 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a45e8b4908d39818ab8431240de914cc46f2e7eca3179f3f3e9c2f9cf22d6dfd
-size 2529
+oid sha256:f8fe1a3ee03907530304be5022d4734123163f567bfee31ce130df9a675d533b
+size 2628
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
index 862cc81208..9fbf893c9f 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13e4549ec8e0e48e00db9d996dd6454d9b1358483407cfcaa1c03f789ec541c6
-size 2484
+oid sha256:f6dcaaeb4c35b8d2d584cd5556ea06e535e6fdcafa14535b3cae96ae2ca4b147
+size 2584
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
index 0b7c538291..6f03689951 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:460ce4fa723ae13baa2e89dcd8c4a60884f96cfc490b1db00087988bd4828a1a
-size 2647
+oid sha256:06bddfe2a7cb53d0aebd4ed2543685610ab1cc49ace6afc5c9c5d745f6433d52
+size 2740
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
index 457c75785c..c9c625b85c 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2db370c87e5515d4427e7f9eb48998ac8be354d3e6a98b5b1d8937a1fae4a643
-size 2740
+oid sha256:523cdbfb63102921a57d66fb9af7e894a609d82cd8b745da355df9eff416ed3a
+size 2783
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
index 0686087dd2..efea6065db 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:100478050435711585d4438aec70b13647780843a4e1da41abc5b7ef5c453444
-size 2469
+oid sha256:9d08851b5b3bb5f7f724aca9e6778a670552e96f6de30995b32c1897661bb887
+size 2548
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
index e978290b32..0330771a08 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39d9cab083768b57ee45636b57d18874ef7f91571be75b86dce9b0d3734a0258
-size 2440
+oid sha256:230d56597c3962d0ca7e8c1208c2aee9678526b1c15bd19ee4c4eabc6e60a6f3
+size 2567
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
index 41956ebd22..365c7c962b 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03ee2e5bd8810f85979ae5ffdbf7c2b94a7217b102478b2b3ea3d9986fd87199
-size 2445
+oid sha256:ee1bf4eb0a2ed4c6b7bbdf70da712a49c5dba04f1eeba7d684298a905b98ca29
+size 2542
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
index c104bb83e4..a438cb9461 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9edde7d131eb718390f99e60c9ae4bc536bba3e47a741fd872eab0419a0b65bb
-size 2084
+oid sha256:9baee3cb2128d6cd5588d7b2b777634b45670cef594dd4b19faf85d84d8cabf5
+size 2195
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
index b0da64a264..4173e349da 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6687244aabc3e36b031733af725d10671c694ae91b107fcda497807008547e62
-size 2535
+oid sha256:9ce02b8edd13a61b63244aade1c572282efc327f7ce32dd8bf4df01c4ff4b87a
+size 2638
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
index 41faca855b..7cd35d3ae9 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e58b2321ed8911425088d0939786af0338ed1b1f222f92c94c067823d1af6933
-size 2496
+oid sha256:dd3403a68fecc51d0503f88c8e519293f7eaf710378a77ce48ef5c701bdabaf5
+size 2583
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
index da4c91a81b..8a61eeea6f 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a28d1626f4c66a36bac0aff343c3312d1266dad81529bbd0a134fe15a68762f
-size 2631
+oid sha256:aaac65de3a00da40bfc27af71d8608f7abadbd840d67e5256b7b00171b5a665b
+size 2713
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
index 4bfeaa66ed..afdd6108e2 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db1f9d852efe5705977730bd3767e012419af15acffedd401467c5972eb9d00a
-size 2726
+oid sha256:8867af37a1e2cf67016ad7c9690c6e836f921705bae9027c9841fc06b3ee02c5
+size 2785
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
index 70d5b462fd..5fc43e4ff8 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d94a4c6f6bc1c1a4722da78ee6288b6095f4ddd73a57838bc89160428e9d48ef
-size 2456
+oid sha256:e698079a8b46b1f75cb6dc96b55a8726bae569557df84404e83ddd16e3e9bed8
+size 2557
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
index d4e4172820..8c8ef55266 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:798dfd3aed994b692b6081853129a571ebcb2af7d143087a43d984114558d065
-size 2405
+oid sha256:bef5f6c2f7813b0ef4b9bc03dd5d74b64efd7f2b0c6279734e87c6e76c2e8726
+size 2542
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
index d770c1128f..42c38e846c 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b284e92229c718dfb5911685a2b0930d2b51b59757d79380bfb238919d9d71ae
-size 2197
+oid sha256:8f784778e1e8305d70485b05dd966e46d75f5bd37a1819f7791860a95f235ec4
+size 2253
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
index 07f61fa0b2..b00a767444 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f559b1a67a507dbe22eab8b61a7f67700794c42beba4545923349a36ee2ec07
-size 1969
+oid sha256:d96243f853061611298b8a4d08ae71b3b234233c6bfe5ea59b59b05c044afba6
+size 2105
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
index 3d3361bbc7..ff4c696a56 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f21b1b0009f96e9b9ebad3fdac6616adce95762f7554c0ad5c639f396dc40b18
-size 2375
+oid sha256:8ae29b00e2c3fd6216d1f0e1369d8a6fec89b1f8866ced02b40a5c0a04b4c490
+size 2492
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
index 8a1acf0593..98672ad2a4 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e31202b67b956630ca0ced00d236d83ef874f6b7f760113bbbcd593f46654c98
-size 2356
+oid sha256:135532f9cb4fb9100a1c0e7e445618a071632928abffd04f47e68f54ebe5869d
+size 2448
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
index abd511c8d4..6d550f6088 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bdb96ac22953693e4a40c66ab9781ebfb307b35c5a2ff9ea6089cdfd713cec1
-size 2439
+oid sha256:cd16702e19c2ab8f7785b7057f3827b003b55ccc49b661817315e8e0578d7197
+size 2472
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
index 85c29cc958..1f5eabaf4d 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bdc2a31b4bb5ff9cb13f0a9d7da488e14cc8fda9ca985786ab794b4337cebd5
-size 2345
+oid sha256:647db73768ad499f39ff84cd59aeeb6a06702ccc5919631e9cc0ccadd2b1c7a9
+size 2379
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-search.png b/screenshots/Firefox/baseline/s-input-icon-light-search.png
index b731d06bc4..bfae8d62f7 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63a24ab0d1cfe5e3cd8f1465e84eb0a13c76cbe40a1d3b1a5979ebe73b372f69
-size 2273
+oid sha256:2dcdf2e5045b91d7d9357443bc360cda2f6316e15c87e8f0ca7effa8cf9244f7
+size 2344
diff --git a/screenshots/Firefox/baseline/s-input-icon-light.png b/screenshots/Firefox/baseline/s-input-icon-light.png
index 101bd4d364..f79c141f2e 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69100f239a131a36e447d6cf4b26ec3dd85ed186bb6cec664b4c32b5ae35b9b5
-size 2194
+oid sha256:2fc43b8bd221de401a989a555ef5d36ff89bfcb7498c06ac6bc151a78b277b1a
+size 2254
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
index ba44edc9d4..5b48fa0f2b 100644
--- a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1764aa3b40e89e298d00d8d9c8b50224999ac4663e11143f95def1202610c3c7
-size 1913
+oid sha256:cfcd5017a692ad2a1e3158965ec15282bb7b72388200e72ae482f94babd77d3f
+size 1912
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
index a9a2ea4e42..b1c859b979 100644
--- a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43bc976d2eb5771b659817ec91dd50983b1a869db9fd204eded8cbdc411d179e
-size 1992
+oid sha256:aa5ff9413090318fe5f868b386ea6a9ab1072ad33c1a9f968493db49d4497069
+size 2011
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
index 4aff181939..1cb330ca8d 100644
--- a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aea1801cb4082ee1a1d68c0b98f9a568b7c01bc790fb5341f8dffb4137e3ebff
-size 2147
+oid sha256:8101b418bfd394203baed536c0ebca8cfef2da9c5170bb4673e760af57edb60a
+size 2143

From 640172d660fcc631b4efd09e36cb75f038c9bae8 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Wed, 7 Feb 2024 13:37:13 -0500
Subject: [PATCH 4/6] Update tests and baseline images

---
 lib/components/input-icon/input-icon.a11y.test.ts           | 6 ++----
 lib/components/input-icon/input-icon.visual.test.ts         | 6 ++----
 .../baseline/s-input-icon-dark-parent-has-error.png         | 4 ++--
 .../s-input-icon-highcontrast-dark-parent-has-error.png     | 4 ++--
 .../s-input-icon-highcontrast-light-parent-has-error.png    | 4 ++--
 .../baseline/s-input-icon-light-parent-has-success.png      | 4 ++--
 .../baseline/s-input-icon-light-parent-is-readonly.png      | 4 ++--
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/lib/components/input-icon/input-icon.a11y.test.ts b/lib/components/input-icon/input-icon.a11y.test.ts
index fe7dd17928..f2f2c2f005 100644
--- a/lib/components/input-icon/input-icon.a11y.test.ts
+++ b/lib/components/input-icon/input-icon.a11y.test.ts
@@ -1,5 +1,5 @@
 import { html } from "@open-wc/testing";
-import { defaultOptions, runComponentTests } from "../../test/test-utils";
+import { runA11yTests } from "../../test/a11y-test-utils";
 import "../../index";
 
 const modifiers = [
@@ -48,8 +48,7 @@ const getSvgPath = (name: string) => {
 
 modifiers.forEach(({ name, parentClasses, modifier }) => {
     describe("input-icon", () => {
-        runComponentTests({
-            type: "a11y",
+        runA11yTests({
             baseClass: `s-input-icon`,
             tag: "svg",
             children: {
@@ -75,7 +74,6 @@ modifiers.forEach(({ name, parentClasses, modifier }) => {
                 </div>
             `,
             options: {
-                ...defaultOptions,
                 includeNullModifier: false,
             },
             skippedTestids: [],
diff --git a/lib/components/input-icon/input-icon.visual.test.ts b/lib/components/input-icon/input-icon.visual.test.ts
index b4c14f5586..e500f973ed 100644
--- a/lib/components/input-icon/input-icon.visual.test.ts
+++ b/lib/components/input-icon/input-icon.visual.test.ts
@@ -1,5 +1,5 @@
 import { html } from "@open-wc/testing";
-import { defaultOptions, runComponentTests } from "../../test/test-utils";
+import { runVisualTests } from "../../test/visual-test-utils";
 import "../../index";
 
 const modifiers = [
@@ -48,8 +48,7 @@ const getSvgPath = (name: string) => {
 
 modifiers.forEach(({ name, parentClasses, modifier, inputClasses }) => {
     describe("input-icon", () => {
-        runComponentTests({
-            type: "visual",
+        runVisualTests({
             baseClass: `s-input-icon`,
             tag: "svg",
             children: {
@@ -86,7 +85,6 @@ modifiers.forEach(({ name, parentClasses, modifier, inputClasses }) => {
                 </div>
             `,
             options: {
-                ...defaultOptions,
                 includeNullModifier: false,
             },
         });
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
index ef84c1a0c6..cc2c0f92c9 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6325430ce97aa6294f3730a57030537ca1af2b04ec52465d7b5a2b0bdea636d
-size 2052
+oid sha256:0feee145765b48e637d49fd8a21fc0aeb911d33f924800faab56618254c91d07
+size 2059
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
index 7a3fa90b85..beeb5d6c19 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:353a9e44be78a434d0aae455ac0760df10cddba6c124ee66a5110a99c9b6b945
-size 2099
+oid sha256:18058057daa32ac75892187559d1516e64c2bb0c9f997aae970530fa4cb54885
+size 2107
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
index f952c3ba95..575776b28e 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b77f0a354ec048072affcf119a3c01acbb6996b44aff6139e12265228147ca8
-size 2063
+oid sha256:a2f44d48d3486011eaae384ae5fcb8576502c069e507f32a7ebe599ef94fcb6f
+size 2067
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
index 5beb41fefe..e11723790c 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20617a4cc33b55868040df39f8ba9f43d92eed00c311ea7e8167392ccfe92d26
-size 2419
+oid sha256:f72f1a54cc52b1991303170c0bd0287bc19b380cce884c6b7fad7f64cf6cd691
+size 2422
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
index 2529857baf..3847a197e8 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57f1e32dc3e69eeb583d0e6f4aefd0f0b512bcee1ef2b3840bce2d8f03df4af0
-size 2153
+oid sha256:e16ad51ec52168b283c3795309e48a1b997eca4cd9dbb1d55a687a62425b6792
+size 2163

From de34fa357354e524cf822c48960e8832c98cbca7 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Fri, 9 Feb 2024 13:36:39 -0500
Subject: [PATCH 5/6] Fix test; regenerate baseline images

---
 lib/components/input-icon/input-icon.a11y.test.ts           | 6 +++---
 lib/components/input-icon/input-icon.visual.test.ts         | 6 +++---
 .../baseline/s-input-icon-dark-creditcard-creditcard.png    | 3 +++
 .../Chromium/baseline/s-input-icon-dark-creditcard.png      | 4 ++--
 ...arent-is-disabled.png => s-input-icon-dark-disabled.png} | 0
 screenshots/Chromium/baseline/s-input-icon-dark-error.png   | 3 +++
 .../baseline/s-input-icon-dark-parent-has-error-error.png   | 3 +++
 .../baseline/s-input-icon-dark-parent-has-error.png         | 3 ---
 .../s-input-icon-dark-parent-has-success-success.png        | 3 +++
 .../s-input-icon-dark-parent-has-warning-warning.png        | 3 +++
 .../s-input-icon-dark-parent-is-disabled-disabled.png       | 3 +++
 .../s-input-icon-dark-parent-is-readonly-readonly.png       | 3 +++
 ...arent-is-readonly.png => s-input-icon-dark-readonly.png} | 0
 .../Chromium/baseline/s-input-icon-dark-search-search.png   | 3 +++
 screenshots/Chromium/baseline/s-input-icon-dark-search.png  | 4 ++--
 ...parent-has-success.png => s-input-icon-dark-success.png} | 0
 ...parent-has-warning.png => s-input-icon-dark-warning.png} | 0
 screenshots/Chromium/baseline/s-input-icon-dark.png         | 3 ---
 ...s-input-icon-highcontrast-dark-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png  | 4 ++--
 ...bled.png => s-input-icon-highcontrast-dark-disabled.png} | 0
 .../baseline/s-input-icon-highcontrast-dark-error.png       | 3 +++
 ...input-icon-highcontrast-dark-parent-has-error-error.png} | 0
 ...ut-icon-highcontrast-dark-parent-has-success-success.png | 3 +++
 ...ut-icon-highcontrast-dark-parent-has-warning-warning.png | 3 +++
 ...t-icon-highcontrast-dark-parent-is-disabled-disabled.png | 3 +++
 ...t-icon-highcontrast-dark-parent-is-readonly-readonly.png | 3 +++
 ...only.png => s-input-icon-highcontrast-dark-readonly.png} | 0
 .../s-input-icon-highcontrast-dark-search-search.png        | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-search.png      | 4 ++--
 ...ccess.png => s-input-icon-highcontrast-dark-success.png} | 0
 ...rning.png => s-input-icon-highcontrast-dark-warning.png} | 0
 .../Chromium/baseline/s-input-icon-highcontrast-dark.png    | 3 ---
 ...-input-icon-highcontrast-light-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png | 4 ++--
 ...led.png => s-input-icon-highcontrast-light-disabled.png} | 0
 .../baseline/s-input-icon-highcontrast-light-error.png      | 3 +++
 ...nput-icon-highcontrast-light-parent-has-error-error.png} | 0
 ...t-icon-highcontrast-light-parent-has-success-success.png | 3 +++
 ...-icon-highcontrast-light-parent-has-warning-warning.png} | 0
 ...-icon-highcontrast-light-parent-is-disabled-disabled.png | 3 +++
 ...icon-highcontrast-light-parent-is-readonly-readonly.png} | 0
 .../baseline/s-input-icon-highcontrast-light-readonly.png   | 3 +++
 .../s-input-icon-highcontrast-light-search-search.png       | 3 +++
 .../baseline/s-input-icon-highcontrast-light-search.png     | 4 ++--
 ...cess.png => s-input-icon-highcontrast-light-success.png} | 0
 .../baseline/s-input-icon-highcontrast-light-warning.png    | 3 +++
 .../Chromium/baseline/s-input-icon-highcontrast-light.png   | 3 ---
 .../baseline/s-input-icon-light-creditcard-creditcard.png   | 3 +++
 .../Chromium/baseline/s-input-icon-light-creditcard.png     | 4 ++--
 ...rent-is-disabled.png => s-input-icon-light-disabled.png} | 0
 ...ht-parent-has-error.png => s-input-icon-light-error.png} | 0
 .../baseline/s-input-icon-light-parent-has-error-error.png  | 3 +++
 .../s-input-icon-light-parent-has-success-success.png       | 3 +++
 .../baseline/s-input-icon-light-parent-has-success.png      | 3 ---
 ...ng => s-input-icon-light-parent-has-warning-warning.png} | 0
 .../s-input-icon-light-parent-is-disabled-disabled.png      | 3 +++
 .../s-input-icon-light-parent-is-readonly-readonly.png      | 3 +++
 .../baseline/s-input-icon-light-parent-is-readonly.png      | 3 ---
 .../Chromium/baseline/s-input-icon-light-readonly.png       | 3 +++
 .../Chromium/baseline/s-input-icon-light-search-search.png  | 3 +++
 screenshots/Chromium/baseline/s-input-icon-light-search.png | 4 ++--
 .../Chromium/baseline/s-input-icon-light-success.png        | 3 +++
 .../Chromium/baseline/s-input-icon-light-warning.png        | 3 +++
 screenshots/Chromium/baseline/s-input-icon-light.png        | 3 ---
 .../baseline/s-input-icon-dark-creditcard-creditcard.png    | 3 +++
 .../Firefox/baseline/s-input-icon-dark-creditcard.png       | 4 ++--
 ...arent-is-disabled.png => s-input-icon-dark-disabled.png} | 0
 ...ark-parent-has-error.png => s-input-icon-dark-error.png} | 0
 .../baseline/s-input-icon-dark-parent-has-error-error.png   | 3 +++
 ...png => s-input-icon-dark-parent-has-success-success.png} | 0
 ...png => s-input-icon-dark-parent-has-warning-warning.png} | 0
 .../s-input-icon-dark-parent-is-disabled-disabled.png       | 3 +++
 ...ng => s-input-icon-dark-parent-is-readonly-readonly.png} | 0
 screenshots/Firefox/baseline/s-input-icon-dark-readonly.png | 3 +++
 .../Firefox/baseline/s-input-icon-dark-search-search.png    | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark-search.png   | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-dark-success.png  | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark-warning.png  | 3 +++
 screenshots/Firefox/baseline/s-input-icon-dark.png          | 3 ---
 ...s-input-icon-highcontrast-dark-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png  | 4 ++--
 ...bled.png => s-input-icon-highcontrast-dark-disabled.png} | 0
 ...s-error.png => s-input-icon-highcontrast-dark-error.png} | 0
 ...-input-icon-highcontrast-dark-parent-has-error-error.png | 3 +++
 ...t-icon-highcontrast-dark-parent-has-success-success.png} | 0
 ...t-icon-highcontrast-dark-parent-has-warning-warning.png} | 0
 ...t-icon-highcontrast-dark-parent-is-disabled-disabled.png | 3 +++
 ...-icon-highcontrast-dark-parent-is-readonly-readonly.png} | 0
 .../baseline/s-input-icon-highcontrast-dark-readonly.png    | 3 +++
 .../s-input-icon-highcontrast-dark-search-search.png        | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-search.png      | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-success.png     | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-warning.png     | 3 +++
 .../Firefox/baseline/s-input-icon-highcontrast-dark.png     | 3 ---
 ...-input-icon-highcontrast-light-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png | 4 ++--
 ...led.png => s-input-icon-highcontrast-light-disabled.png} | 0
 ...-error.png => s-input-icon-highcontrast-light-error.png} | 0
 ...input-icon-highcontrast-light-parent-has-error-error.png | 3 +++
 ...-icon-highcontrast-light-parent-has-success-success.png} | 0
 ...-icon-highcontrast-light-parent-has-warning-warning.png} | 0
 ...-icon-highcontrast-light-parent-is-disabled-disabled.png | 3 +++
 ...icon-highcontrast-light-parent-is-readonly-readonly.png} | 0
 .../baseline/s-input-icon-highcontrast-light-readonly.png   | 3 +++
 .../s-input-icon-highcontrast-light-search-search.png       | 3 +++
 .../baseline/s-input-icon-highcontrast-light-search.png     | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-success.png    | 3 +++
 .../baseline/s-input-icon-highcontrast-light-warning.png    | 3 +++
 .../Firefox/baseline/s-input-icon-highcontrast-light.png    | 3 ---
 .../baseline/s-input-icon-light-creditcard-creditcard.png   | 3 +++
 .../Firefox/baseline/s-input-icon-light-creditcard.png      | 4 ++--
 ...rent-is-disabled.png => s-input-icon-light-disabled.png} | 0
 ...ht-parent-has-error.png => s-input-icon-light-error.png} | 0
 .../baseline/s-input-icon-light-parent-has-error-error.png  | 3 +++
 ...ng => s-input-icon-light-parent-has-success-success.png} | 0
 ...ng => s-input-icon-light-parent-has-warning-warning.png} | 0
 .../s-input-icon-light-parent-is-disabled-disabled.png      | 3 +++
 ...g => s-input-icon-light-parent-is-readonly-readonly.png} | 0
 .../Firefox/baseline/s-input-icon-light-readonly.png        | 3 +++
 .../Firefox/baseline/s-input-icon-light-search-search.png   | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light-search.png  | 4 ++--
 screenshots/Firefox/baseline/s-input-icon-light-success.png | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light-warning.png | 3 +++
 screenshots/Firefox/baseline/s-input-icon-light.png         | 3 ---
 .../baseline/s-input-icon-dark-creditcard-creditcard.png    | 3 +++
 .../Webkit/baseline/s-input-icon-dark-creditcard.png        | 4 ++--
 ...arent-is-disabled.png => s-input-icon-dark-disabled.png} | 0
 ...ark-parent-has-error.png => s-input-icon-dark-error.png} | 0
 .../baseline/s-input-icon-dark-parent-has-error-error.png   | 3 +++
 ...png => s-input-icon-dark-parent-has-success-success.png} | 0
 ...png => s-input-icon-dark-parent-has-warning-warning.png} | 0
 .../s-input-icon-dark-parent-is-disabled-disabled.png       | 3 +++
 ...ng => s-input-icon-dark-parent-is-readonly-readonly.png} | 0
 screenshots/Webkit/baseline/s-input-icon-dark-readonly.png  | 3 +++
 .../Webkit/baseline/s-input-icon-dark-search-search.png     | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark-search.png    | 2 +-
 screenshots/Webkit/baseline/s-input-icon-dark-success.png   | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark-warning.png   | 3 +++
 screenshots/Webkit/baseline/s-input-icon-dark.png           | 3 ---
 ...s-input-icon-highcontrast-dark-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-creditcard.png  | 4 ++--
 ...bled.png => s-input-icon-highcontrast-dark-disabled.png} | 0
 ...s-error.png => s-input-icon-highcontrast-dark-error.png} | 0
 ...-input-icon-highcontrast-dark-parent-has-error-error.png | 3 +++
 ...t-icon-highcontrast-dark-parent-has-success-success.png} | 0
 ...t-icon-highcontrast-dark-parent-has-warning-warning.png} | 0
 ...t-icon-highcontrast-dark-parent-is-disabled-disabled.png | 3 +++
 ...-icon-highcontrast-dark-parent-is-readonly-readonly.png} | 0
 .../baseline/s-input-icon-highcontrast-dark-readonly.png    | 3 +++
 .../s-input-icon-highcontrast-dark-search-search.png        | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-search.png      | 4 ++--
 .../baseline/s-input-icon-highcontrast-dark-success.png     | 3 +++
 .../baseline/s-input-icon-highcontrast-dark-warning.png     | 3 +++
 .../Webkit/baseline/s-input-icon-highcontrast-dark.png      | 3 ---
 ...-input-icon-highcontrast-light-creditcard-creditcard.png | 3 +++
 .../baseline/s-input-icon-highcontrast-light-creditcard.png | 4 ++--
 ...led.png => s-input-icon-highcontrast-light-disabled.png} | 0
 ...-error.png => s-input-icon-highcontrast-light-error.png} | 0
 ...input-icon-highcontrast-light-parent-has-error-error.png | 3 +++
 ...-icon-highcontrast-light-parent-has-success-success.png} | 0
 ...-icon-highcontrast-light-parent-has-warning-warning.png} | 0
 ...-icon-highcontrast-light-parent-is-disabled-disabled.png | 3 +++
 ...icon-highcontrast-light-parent-is-readonly-readonly.png} | 0
 .../baseline/s-input-icon-highcontrast-light-readonly.png   | 3 +++
 .../s-input-icon-highcontrast-light-search-search.png       | 3 +++
 .../baseline/s-input-icon-highcontrast-light-search.png     | 4 ++--
 .../baseline/s-input-icon-highcontrast-light-success.png    | 3 +++
 .../baseline/s-input-icon-highcontrast-light-warning.png    | 3 +++
 .../Webkit/baseline/s-input-icon-highcontrast-light.png     | 3 ---
 .../baseline/s-input-icon-light-creditcard-creditcard.png   | 3 +++
 .../Webkit/baseline/s-input-icon-light-creditcard.png       | 4 ++--
 ...rent-is-disabled.png => s-input-icon-light-disabled.png} | 0
 ...ht-parent-has-error.png => s-input-icon-light-error.png} | 0
 .../baseline/s-input-icon-light-parent-has-error-error.png  | 3 +++
 ...ng => s-input-icon-light-parent-has-success-success.png} | 0
 ...ng => s-input-icon-light-parent-has-warning-warning.png} | 0
 .../s-input-icon-light-parent-is-disabled-disabled.png      | 3 +++
 ...g => s-input-icon-light-parent-is-readonly-readonly.png} | 0
 screenshots/Webkit/baseline/s-input-icon-light-readonly.png | 3 +++
 .../Webkit/baseline/s-input-icon-light-search-search.png    | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light-search.png   | 4 ++--
 screenshots/Webkit/baseline/s-input-icon-light-success.png  | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light-warning.png  | 3 +++
 screenshots/Webkit/baseline/s-input-icon-light.png          | 3 ---
 185 files changed, 314 insertions(+), 98 deletions(-)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-creditcard-creditcard.png
 rename screenshots/Chromium/baseline/{s-input-icon-dark-parent-is-disabled.png => s-input-icon-dark-disabled.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error-error.png
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
 rename screenshots/Chromium/baseline/{s-input-icon-dark-parent-is-readonly.png => s-input-icon-dark-readonly.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-dark-search-search.png
 rename screenshots/Chromium/baseline/{s-input-icon-dark-parent-has-success.png => s-input-icon-dark-success.png} (100%)
 rename screenshots/Chromium/baseline/{s-input-icon-dark-parent-has-warning.png => s-input-icon-dark-warning.png} (100%)
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-dark-parent-is-disabled.png => s-input-icon-highcontrast-dark-disabled.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-error.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-dark-parent-has-error.png => s-input-icon-highcontrast-dark-parent-has-error-error.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-dark-parent-is-readonly.png => s-input-icon-highcontrast-dark-readonly.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search-search.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-dark-parent-has-success.png => s-input-icon-highcontrast-dark-success.png} (100%)
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-dark-parent-has-warning.png => s-input-icon-highcontrast-dark-warning.png} (100%)
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-light-parent-is-disabled.png => s-input-icon-highcontrast-light-disabled.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-error.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-light-parent-has-error.png => s-input-icon-highcontrast-light-parent-has-error-error.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-light-parent-has-warning.png => s-input-icon-highcontrast-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-light-parent-is-readonly.png => s-input-icon-highcontrast-light-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search-search.png
 rename screenshots/Chromium/baseline/{s-input-icon-highcontrast-light-parent-has-success.png => s-input-icon-highcontrast-light-success.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light-warning.png
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-creditcard-creditcard.png
 rename screenshots/Chromium/baseline/{s-input-icon-light-parent-is-disabled.png => s-input-icon-light-disabled.png} (100%)
 rename screenshots/Chromium/baseline/{s-input-icon-light-parent-has-error.png => s-input-icon-light-error.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-error-error.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-success-success.png
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
 rename screenshots/Chromium/baseline/{s-input-icon-light-parent-has-warning.png => s-input-icon-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled-disabled.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly-readonly.png
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-readonly.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-search-search.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-success.png
 create mode 100644 screenshots/Chromium/baseline/s-input-icon-light-warning.png
 delete mode 100644 screenshots/Chromium/baseline/s-input-icon-light.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-creditcard-creditcard.png
 rename screenshots/Firefox/baseline/{s-input-icon-dark-parent-is-disabled.png => s-input-icon-dark-disabled.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-dark-parent-has-error.png => s-input-icon-dark-error.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error-error.png
 rename screenshots/Firefox/baseline/{s-input-icon-dark-parent-has-success.png => s-input-icon-dark-parent-has-success-success.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-dark-parent-has-warning.png => s-input-icon-dark-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
 rename screenshots/Firefox/baseline/{s-input-icon-dark-parent-is-readonly.png => s-input-icon-dark-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-search-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-dark-warning.png
 delete mode 100644 screenshots/Firefox/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-dark-parent-is-disabled.png => s-input-icon-highcontrast-dark-disabled.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-dark-parent-has-error.png => s-input-icon-highcontrast-dark-error.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-dark-parent-has-success.png => s-input-icon-highcontrast-dark-parent-has-success-success.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-dark-parent-has-warning.png => s-input-icon-highcontrast-dark-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-dark-parent-is-readonly.png => s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-warning.png
 delete mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-light-parent-is-disabled.png => s-input-icon-highcontrast-light-disabled.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-light-parent-has-error.png => s-input-icon-highcontrast-light-error.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-light-parent-has-success.png => s-input-icon-highcontrast-light-parent-has-success-success.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-light-parent-has-warning.png => s-input-icon-highcontrast-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
 rename screenshots/Firefox/baseline/{s-input-icon-highcontrast-light-parent-is-readonly.png => s-input-icon-highcontrast-light-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light-warning.png
 delete mode 100644 screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-creditcard-creditcard.png
 rename screenshots/Firefox/baseline/{s-input-icon-light-parent-is-disabled.png => s-input-icon-light-disabled.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-light-parent-has-error.png => s-input-icon-light-error.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-has-error-error.png
 rename screenshots/Firefox/baseline/{s-input-icon-light-parent-has-success.png => s-input-icon-light-parent-has-success-success.png} (100%)
 rename screenshots/Firefox/baseline/{s-input-icon-light-parent-has-warning.png => s-input-icon-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled-disabled.png
 rename screenshots/Firefox/baseline/{s-input-icon-light-parent-is-readonly.png => s-input-icon-light-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-readonly.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-search-search.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-success.png
 create mode 100644 screenshots/Firefox/baseline/s-input-icon-light-warning.png
 delete mode 100644 screenshots/Firefox/baseline/s-input-icon-light.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-creditcard-creditcard.png
 rename screenshots/Webkit/baseline/{s-input-icon-dark-parent-is-disabled.png => s-input-icon-dark-disabled.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-dark-parent-has-error.png => s-input-icon-dark-error.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error-error.png
 rename screenshots/Webkit/baseline/{s-input-icon-dark-parent-has-success.png => s-input-icon-dark-parent-has-success-success.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-dark-parent-has-warning.png => s-input-icon-dark-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
 rename screenshots/Webkit/baseline/{s-input-icon-dark-parent-is-readonly.png => s-input-icon-dark-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-search-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-dark-warning.png
 delete mode 100644 screenshots/Webkit/baseline/s-input-icon-dark.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-dark-parent-is-disabled.png => s-input-icon-highcontrast-dark-disabled.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-dark-parent-has-error.png => s-input-icon-highcontrast-dark-error.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-dark-parent-has-success.png => s-input-icon-highcontrast-dark-parent-has-success-success.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-dark-parent-has-warning.png => s-input-icon-highcontrast-dark-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-dark-parent-is-readonly.png => s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-warning.png
 delete mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-light-parent-is-disabled.png => s-input-icon-highcontrast-light-disabled.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-light-parent-has-error.png => s-input-icon-highcontrast-light-error.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-light-parent-has-success.png => s-input-icon-highcontrast-light-parent-has-success-success.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-light-parent-has-warning.png => s-input-icon-highcontrast-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
 rename screenshots/Webkit/baseline/{s-input-icon-highcontrast-light-parent-is-readonly.png => s-input-icon-highcontrast-light-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light-warning.png
 delete mode 100644 screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-creditcard-creditcard.png
 rename screenshots/Webkit/baseline/{s-input-icon-light-parent-is-disabled.png => s-input-icon-light-disabled.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-light-parent-has-error.png => s-input-icon-light-error.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-has-error-error.png
 rename screenshots/Webkit/baseline/{s-input-icon-light-parent-has-success.png => s-input-icon-light-parent-has-success-success.png} (100%)
 rename screenshots/Webkit/baseline/{s-input-icon-light-parent-has-warning.png => s-input-icon-light-parent-has-warning-warning.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled-disabled.png
 rename screenshots/Webkit/baseline/{s-input-icon-light-parent-is-readonly.png => s-input-icon-light-parent-is-readonly-readonly.png} (100%)
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-readonly.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-search-search.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-success.png
 create mode 100644 screenshots/Webkit/baseline/s-input-icon-light-warning.png
 delete mode 100644 screenshots/Webkit/baseline/s-input-icon-light.png

diff --git a/lib/components/input-icon/input-icon.a11y.test.ts b/lib/components/input-icon/input-icon.a11y.test.ts
index f2f2c2f005..c7066babe2 100644
--- a/lib/components/input-icon/input-icon.a11y.test.ts
+++ b/lib/components/input-icon/input-icon.a11y.test.ts
@@ -46,13 +46,13 @@ const getSvgPath = (name: string) => {
     }
 };
 
-modifiers.forEach(({ name, parentClasses, modifier }) => {
-    describe("input-icon", () => {
+describe("input-icon", () => {
+    modifiers.forEach(({ name, parentClasses, modifier }) => {
         runA11yTests({
             baseClass: `s-input-icon`,
             tag: "svg",
             children: {
-                default: getSvgPath(name), // IconSearch
+                [name]: getSvgPath(name), // IconSearch
             },
             modifiers: {
                 standalone: modifier ? [`${modifier}`] : [],
diff --git a/lib/components/input-icon/input-icon.visual.test.ts b/lib/components/input-icon/input-icon.visual.test.ts
index e500f973ed..153f4f1ea8 100644
--- a/lib/components/input-icon/input-icon.visual.test.ts
+++ b/lib/components/input-icon/input-icon.visual.test.ts
@@ -46,13 +46,13 @@ const getSvgPath = (name: string) => {
     }
 };
 
-modifiers.forEach(({ name, parentClasses, modifier, inputClasses }) => {
-    describe("input-icon", () => {
+describe("input-icon", () => {
+    modifiers.forEach(({ name, parentClasses, modifier, inputClasses }) => {
         runVisualTests({
             baseClass: `s-input-icon`,
             tag: "svg",
             children: {
-                default: getSvgPath(name), // IconSearch
+                [name]: getSvgPath(name), // IconSearch
             },
             modifiers: {
                 standalone: modifier ? [`${modifier}`] : [],
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..460dea79c1
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b202ef43506944fb7c45a6f2f810025abbfab9dd5d18a47a30a2914d3d32335c
+size 2165
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
index 9a933d157a..2ac7127769 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7541f2ac3f2ad631de60d1256ed6ec30f6997a009a12706908f529e6cb623232
-size 2157
+oid sha256:0624d8501a1b4bc95c7083e81fb325fbfab7ab585c163d9a0128e55a00d3b142
+size 2140
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-dark-disabled.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled.png
rename to screenshots/Chromium/baseline/s-input-icon-dark-disabled.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-error.png
new file mode 100644
index 0000000000..ef84c1a0c6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6325430ce97aa6294f3730a57030537ca1af2b04ec52465d7b5a2b0bdea636d
+size 2052
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error-error.png
new file mode 100644
index 0000000000..ef84c1a0c6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6325430ce97aa6294f3730a57030537ca1af2b04ec52465d7b5a2b0bdea636d
+size 2052
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
deleted file mode 100644
index cc2c0f92c9..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-error.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0feee145765b48e637d49fd8a21fc0aeb911d33f924800faab56618254c91d07
-size 2059
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success-success.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success-success.png
new file mode 100644
index 0000000000..6152cd9d64
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c5cb3814e915b9b020f62e43d951f2d0c169b1cedf25997a52d3aed49714e94
+size 2426
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning-warning.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning-warning.png
new file mode 100644
index 0000000000..e4f68b7c6b
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d08d5637d10bb24891e1a3a7e366676b48c2c2c50110976e2422cd39119886c0
+size 2333
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled-disabled.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..f957ec1a1a
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0873f5cc5624fddf46672a4c3fd1f31a8fa87f1a55bdb40f47ed283605d002a2
+size 2490
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly-readonly.png b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
new file mode 100644
index 0000000000..39e20647a6
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0045c346ec827a9dee2fef74bf43174e4c6c38b8698d2cc5dd421922fce77cf0
+size 2312
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-dark-readonly.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-dark-parent-is-readonly.png
rename to screenshots/Chromium/baseline/s-input-icon-dark-readonly.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-search-search.png b/screenshots/Chromium/baseline/s-input-icon-dark-search-search.png
new file mode 100644
index 0000000000..1bf4f23f43
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39f73ae620af2bc0e770adacd217b60b5220df59e4febd4ba49d3ec43b4aea3c
+size 2468
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
index cb3add44cf..2c25fab15d 100644
--- a/screenshots/Chromium/baseline/s-input-icon-dark-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9a2ad89dcb262204a688ba18550ee7bde4fa26e5946ef9c3f66d8c82a276514
-size 2457
+oid sha256:8d6eb7996b2081ef143c79514931ed56d5b78cd1870e44ad9aaac3354622d1fe
+size 2450
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-dark-success.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-dark-parent-has-success.png
rename to screenshots/Chromium/baseline/s-input-icon-dark-success.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-dark-warning.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-dark-parent-has-warning.png
rename to screenshots/Chromium/baseline/s-input-icon-dark-warning.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-dark.png b/screenshots/Chromium/baseline/s-input-icon-dark.png
deleted file mode 100644
index 2c25fab15d..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d6eb7996b2081ef143c79514931ed56d5b78cd1870e44ad9aaac3354622d1fe
-size 2450
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..f1bc1bc9c2
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51c2a0aae1bc532bf0a0ddf07f35bc238f8feb8dd705cc3e620cfcb2286672b3
+size 2308
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
index 10ae4bf379..82505292e1 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8e1f4ae2bf9831bad0fbd8b59b7e4af6bd329c658bb78af05259a78e1bbffd6
-size 2310
+oid sha256:28e50dc649004b8e6dd8df7d967d82bfca014f9b5da86a86c8b4e894122d02ff
+size 2313
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-disabled.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-disabled.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-error.png
new file mode 100644
index 0000000000..7a3fa90b85
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:353a9e44be78a434d0aae455ac0760df10cddba6c124ee66a5110a99c9b6b945
+size 2099
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
new file mode 100644
index 0000000000..f7a1319d98
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20f49ceca8793443cb9aece2914f853197006edb6eff952b891514111988e714
+size 2587
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
new file mode 100644
index 0000000000..b819230355
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e119718f2f39e2b08371da43f74480b0dcb954d4bc939ce06b6bc58438f4f3e8
+size 2391
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..21526da173
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f53e6329948c5ed09e12989a87915fb26a17ebacf1250ab3d41b72cec19b8355
+size 2621
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
new file mode 100644
index 0000000000..aeb2f0f805
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7848d13b7dcffe78a09f8e7525f11d39f7993d9ad418e3b25e2151dbac70239b
+size 2588
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-readonly.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-readonly.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search-search.png
new file mode 100644
index 0000000000..bae9904372
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60bcc41c5b7bfe6023c9d33538598d6112a14dba1588837f93b847f006f0b07f
+size 2573
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
index cdf1494643..220ef3b844 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f855ea417e03a2c30b11e9d06c5c2d6507c1226e77033a29541e744b066d9903
-size 2576
+oid sha256:b7dd008f7801a0dcf80e67dd365e73672d21bcfc39868dc6afc5fdccbe90996a
+size 2516
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-success.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-success.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-warning.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-dark-warning.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
deleted file mode 100644
index 220ef3b844..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7dd008f7801a0dcf80e67dd365e73672d21bcfc39868dc6afc5fdccbe90996a
-size 2516
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..11ebb29b1b
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e137b012bc9f89e6eeb2539e47949659f3048f8ace28555eae16a87940c2a30
+size 2302
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
index 11ebb29b1b..6035656eb3 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e137b012bc9f89e6eeb2539e47949659f3048f8ace28555eae16a87940c2a30
-size 2302
+oid sha256:296fab1166c0e0ae62dcc766de1734f3bd1ea273d823036381183831ee1b2319
+size 2328
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-disabled.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-light-disabled.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-error.png
new file mode 100644
index 0000000000..f952c3ba95
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b77f0a354ec048072affcf119a3c01acbb6996b44aff6139e12265228147ca8
+size 2063
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
new file mode 100644
index 0000000000..a9f289bc61
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28e8cc07e3a7aad612ea541070b560dca3c38a277663490e15a114b8602c4037
+size 2553
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..807ccd0743
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ceafb80de10b16ad581064fb9cac23a870f1e7213a5305ddb8511bef23d1f5d5
+size 2560
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-readonly.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-readonly.png
new file mode 100644
index 0000000000..7419ea530d
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d23d376fda9c2bf8cb11bd3d2f5d063bbe626e9bb2c240180af52acb7ca64c26
+size 2576
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search-search.png
new file mode 100644
index 0000000000..66433f1d14
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3803307bad6376fa91db516800d92159e7bd64e1a6bcaaa8eb7f7d4b6f1fc972
+size 2527
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
index 66433f1d14..4ec118870b 100644
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3803307bad6376fa91db516800d92159e7bd64e1a6bcaaa8eb7f7d4b6f1fc972
-size 2527
+oid sha256:abcc214e05089f62e7fe4b8775348e9d33e73a02744c0d14676e8b04cf857d25
+size 2482
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-success.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-highcontrast-light-parent-has-success.png
rename to screenshots/Chromium/baseline/s-input-icon-highcontrast-light-success.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-warning.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-warning.png
new file mode 100644
index 0000000000..f4b077fe6f
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b45453666844d1b695ac09fc8e74003db95f1842cf4ad5d40da69340cb49e31
+size 2394
diff --git a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png b/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
deleted file mode 100644
index 4ec118870b..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-highcontrast-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abcc214e05089f62e7fe4b8775348e9d33e73a02744c0d14676e8b04cf857d25
-size 2482
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-creditcard-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..f7364cd4e3
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cdb2c2f0543d30af4b68aa7359dd91c8fefb8b39596592d52c877570c014b04d
+size 2050
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
index f7364cd4e3..55669f4e9d 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdb2c2f0543d30af4b68aa7359dd91c8fefb8b39596592d52c877570c014b04d
-size 2050
+oid sha256:f4ed08b5552675d38feff8ebda21dfa1cd1be112e4a09cb6e0799e3d11eb3367
+size 2013
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Chromium/baseline/s-input-icon-light-disabled.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled.png
rename to screenshots/Chromium/baseline/s-input-icon-light-disabled.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Chromium/baseline/s-input-icon-light-error.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-light-parent-has-error.png
rename to screenshots/Chromium/baseline/s-input-icon-light-error.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error-error.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error-error.png
new file mode 100644
index 0000000000..4c1a0d426c
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19215869d08391fb161f7c6577542a8ea7bd57395f95b94869318216509666f2
+size 1951
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success-success.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success-success.png
new file mode 100644
index 0000000000..5beb41fefe
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20617a4cc33b55868040df39f8ba9f43d92eed00c311ea7e8167392ccfe92d26
+size 2419
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
deleted file mode 100644
index e11723790c..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-success.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f72f1a54cc52b1991303170c0bd0287bc19b380cce884c6b7fad7f64cf6cd691
-size 2422
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning.png
rename to screenshots/Chromium/baseline/s-input-icon-light-parent-has-warning-warning.png
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled-disabled.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..9e8647c63d
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72ed6b758a4c7e5d12ff82f60aedcfbe6d8258faba2956e2dd164158cee6e174
+size 2389
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly-readonly.png
new file mode 100644
index 0000000000..2529857baf
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57f1e32dc3e69eeb583d0e6f4aefd0f0b512bcee1ef2b3840bce2d8f03df4af0
+size 2153
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
deleted file mode 100644
index 3847a197e8..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-light-parent-is-readonly.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e16ad51ec52168b283c3795309e48a1b997eca4cd9dbb1d55a687a62425b6792
-size 2163
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-readonly.png b/screenshots/Chromium/baseline/s-input-icon-light-readonly.png
new file mode 100644
index 0000000000..2529857baf
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57f1e32dc3e69eeb583d0e6f4aefd0f0b512bcee1ef2b3840bce2d8f03df4af0
+size 2153
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-search-search.png b/screenshots/Chromium/baseline/s-input-icon-light-search-search.png
new file mode 100644
index 0000000000..13c1ff4511
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bf844e0966baec6907d8cdcedd6ed01740373d0e5386d6d19d2ab6094f5e8ff
+size 2405
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-search.png b/screenshots/Chromium/baseline/s-input-icon-light-search.png
index 13c1ff4511..d80dd2d319 100644
--- a/screenshots/Chromium/baseline/s-input-icon-light-search.png
+++ b/screenshots/Chromium/baseline/s-input-icon-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bf844e0966baec6907d8cdcedd6ed01740373d0e5386d6d19d2ab6094f5e8ff
-size 2405
+oid sha256:43fc53b3083c92aacdcf3ec6abf50e6b29519dcde259cb25b2ff78c825e3031e
+size 2349
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-success.png b/screenshots/Chromium/baseline/s-input-icon-light-success.png
new file mode 100644
index 0000000000..5beb41fefe
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20617a4cc33b55868040df39f8ba9f43d92eed00c311ea7e8167392ccfe92d26
+size 2419
diff --git a/screenshots/Chromium/baseline/s-input-icon-light-warning.png b/screenshots/Chromium/baseline/s-input-icon-light-warning.png
new file mode 100644
index 0000000000..5f5064f8af
--- /dev/null
+++ b/screenshots/Chromium/baseline/s-input-icon-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14b440e62c3982cac82e5227bfd9a85e223dc63a862b979160bd358b87c7227e
+size 2217
diff --git a/screenshots/Chromium/baseline/s-input-icon-light.png b/screenshots/Chromium/baseline/s-input-icon-light.png
deleted file mode 100644
index d80dd2d319..0000000000
--- a/screenshots/Chromium/baseline/s-input-icon-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43fc53b3083c92aacdcf3ec6abf50e6b29519dcde259cb25b2ff78c825e3031e
-size 2349
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..f769a31076
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4531ab556c87d4ade828504100ff64ddd3210599e3572cdf9c314b188c20440
+size 2427
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
index f769a31076..e7f13ee256 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4531ab556c87d4ade828504100ff64ddd3210599e3572cdf9c314b188c20440
-size 2427
+oid sha256:77c3a1d5e7a4e9fcaec865ba801b9ed4dcb09b3518906aba0598b3454ee2d8f0
+size 2400
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-dark-disabled.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled.png
rename to screenshots/Firefox/baseline/s-input-icon-dark-disabled.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-dark-error.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error.png
rename to screenshots/Firefox/baseline/s-input-icon-dark-error.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error-error.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error-error.png
new file mode 100644
index 0000000000..0d44a951aa
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4c6339e3ee278211de128126cf68620b53ebe4221eede1ce9569631f2d45a4d
+size 2241
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success-success.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success.png
rename to screenshots/Firefox/baseline/s-input-icon-dark-parent-has-success-success.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning.png
rename to screenshots/Firefox/baseline/s-input-icon-dark-parent-has-warning-warning.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled-disabled.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..7887b41aaf
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc7061d1946bb04003939535b166e3bc42a7dc7fd7b583c1f545a2d5016f5cc2
+size 2665
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly.png
rename to screenshots/Firefox/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-readonly.png b/screenshots/Firefox/baseline/s-input-icon-dark-readonly.png
new file mode 100644
index 0000000000..1738c6e6c9
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:804ece896e7302beaf7e7667c03d08092c2b30fc967c63c670629e55466c312c
+size 2517
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-search-search.png b/screenshots/Firefox/baseline/s-input-icon-dark-search-search.png
new file mode 100644
index 0000000000..a09572308a
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4014ba9558239d60e95df49ea3ee6521556f3049e90adda47981e919c47ed4f2
+size 2479
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
index a09572308a..0fd9179dd3 100644
--- a/screenshots/Firefox/baseline/s-input-icon-dark-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4014ba9558239d60e95df49ea3ee6521556f3049e90adda47981e919c47ed4f2
-size 2479
+oid sha256:c7d2728cf17517063234d97dcebd99a18e092649b52988edf31b76e950e7a575
+size 2436
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-success.png b/screenshots/Firefox/baseline/s-input-icon-dark-success.png
new file mode 100644
index 0000000000..c1f00a2ba8
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d947030ceb296080b715ebd47452029e155b644a0ddad2984cb22e5051bcea2
+size 2493
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark-warning.png b/screenshots/Firefox/baseline/s-input-icon-dark-warning.png
new file mode 100644
index 0000000000..2327ba3928
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-dark-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1217ad1c4fe752d3d558bf5e78b7107008754d32199c8f39b4989325497ab969
+size 2514
diff --git a/screenshots/Firefox/baseline/s-input-icon-dark.png b/screenshots/Firefox/baseline/s-input-icon-dark.png
deleted file mode 100644
index 0fd9179dd3..0000000000
--- a/screenshots/Firefox/baseline/s-input-icon-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7d2728cf17517063234d97dcebd99a18e092649b52988edf31b76e950e7a575
-size 2436
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..13cec645d9
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a61682981aeac5208f25599da14ae5d6630ad0e7e54f67a289a91821a68eecc3
+size 2556
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
index 13cec645d9..fe66d00961 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a61682981aeac5208f25599da14ae5d6630ad0e7e54f67a289a91821a68eecc3
-size 2556
+oid sha256:571aaadaf1e9c1c9d28b445edb353efc312152e5ca4ea3d3d1cdec0e664a1d4d
+size 2563
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-disabled.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-disabled.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-error.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-error.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
new file mode 100644
index 0000000000..e0c8f75327
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5573082e46ed96b2dfcb37fdf715a7787c763f3b11f1903be166f314df60ef9
+size 2258
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..6f03689951
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06bddfe2a7cb53d0aebd4ed2543685610ab1cc49ace6afc5c9c5d745f6433d52
+size 2740
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-readonly.png
new file mode 100644
index 0000000000..c9c625b85c
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:523cdbfb63102921a57d66fb9af7e894a609d82cd8b745da355df9eff416ed3a
+size 2783
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search-search.png
new file mode 100644
index 0000000000..efea6065db
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d08851b5b3bb5f7f724aca9e6778a670552e96f6de30995b32c1897661bb887
+size 2548
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
index efea6065db..0330771a08 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d08851b5b3bb5f7f724aca9e6778a670552e96f6de30995b32c1897661bb887
-size 2548
+oid sha256:230d56597c3962d0ca7e8c1208c2aee9678526b1c15bd19ee4c4eabc6e60a6f3
+size 2567
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-success.png
new file mode 100644
index 0000000000..9a375b35e8
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8fe1a3ee03907530304be5022d4734123163f567bfee31ce130df9a675d533b
+size 2628
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-warning.png
new file mode 100644
index 0000000000..9fbf893c9f
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6dcaaeb4c35b8d2d584cd5556ea06e535e6fdcafa14535b3cae96ae2ca4b147
+size 2584
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
deleted file mode 100644
index 0330771a08..0000000000
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:230d56597c3962d0ca7e8c1208c2aee9678526b1c15bd19ee4c4eabc6e60a6f3
-size 2567
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..365c7c962b
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee1bf4eb0a2ed4c6b7bbdf70da712a49c5dba04f1eeba7d684298a905b98ca29
+size 2542
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
index 365c7c962b..0bd0db8c71 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee1bf4eb0a2ed4c6b7bbdf70da712a49c5dba04f1eeba7d684298a905b98ca29
-size 2542
+oid sha256:c1998f5826c54d0a3174b6dc0b4fb56298fd469e0db4c79b7eeff6b2f5e56022
+size 2557
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-disabled.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-light-disabled.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-error.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-light-error.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
new file mode 100644
index 0000000000..a438cb9461
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9baee3cb2128d6cd5588d7b2b777634b45670cef594dd4b19faf85d84d8cabf5
+size 2195
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..8a61eeea6f
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaac65de3a00da40bfc27af71d8608f7abadbd840d67e5256b7b00171b5a665b
+size 2713
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
rename to screenshots/Firefox/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-readonly.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-readonly.png
new file mode 100644
index 0000000000..afdd6108e2
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8867af37a1e2cf67016ad7c9690c6e836f921705bae9027c9841fc06b3ee02c5
+size 2785
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search-search.png
new file mode 100644
index 0000000000..5fc43e4ff8
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e698079a8b46b1f75cb6dc96b55a8726bae569557df84404e83ddd16e3e9bed8
+size 2557
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
index 5fc43e4ff8..8c8ef55266 100644
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e698079a8b46b1f75cb6dc96b55a8726bae569557df84404e83ddd16e3e9bed8
-size 2557
+oid sha256:bef5f6c2f7813b0ef4b9bc03dd5d74b64efd7f2b0c6279734e87c6e76c2e8726
+size 2542
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-success.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-success.png
new file mode 100644
index 0000000000..4173e349da
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ce02b8edd13a61b63244aade1c572282efc327f7ce32dd8bf4df01c4ff4b87a
+size 2638
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-warning.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-warning.png
new file mode 100644
index 0000000000..7cd35d3ae9
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd3403a68fecc51d0503f88c8e519293f7eaf710378a77ce48ef5c701bdabaf5
+size 2583
diff --git a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png b/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
deleted file mode 100644
index 8c8ef55266..0000000000
--- a/screenshots/Firefox/baseline/s-input-icon-highcontrast-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bef5f6c2f7813b0ef4b9bc03dd5d74b64efd7f2b0c6279734e87c6e76c2e8726
-size 2542
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-creditcard-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..42c38e846c
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f784778e1e8305d70485b05dd966e46d75f5bd37a1819f7791860a95f235ec4
+size 2253
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
index 42c38e846c..a45d43edad 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f784778e1e8305d70485b05dd966e46d75f5bd37a1819f7791860a95f235ec4
-size 2253
+oid sha256:b558b08ec80e09ce4aeccf1f8c40407e6d309494a90c0c1700f214b4f26f1480
+size 2228
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Firefox/baseline/s-input-icon-light-disabled.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled.png
rename to screenshots/Firefox/baseline/s-input-icon-light-disabled.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Firefox/baseline/s-input-icon-light-error.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-light-parent-has-error.png
rename to screenshots/Firefox/baseline/s-input-icon-light-error.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error-error.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error-error.png
new file mode 100644
index 0000000000..b00a767444
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d96243f853061611298b8a4d08ae71b3b234233c6bfe5ea59b59b05c044afba6
+size 2105
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-success-success.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-light-parent-has-success.png
rename to screenshots/Firefox/baseline/s-input-icon-light-parent-has-success-success.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning.png
rename to screenshots/Firefox/baseline/s-input-icon-light-parent-has-warning-warning.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled-disabled.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..6d550f6088
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd16702e19c2ab8f7785b7057f3827b003b55ccc49b661817315e8e0578d7197
+size 2472
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly.png
rename to screenshots/Firefox/baseline/s-input-icon-light-parent-is-readonly-readonly.png
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-readonly.png b/screenshots/Firefox/baseline/s-input-icon-light-readonly.png
new file mode 100644
index 0000000000..1f5eabaf4d
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:647db73768ad499f39ff84cd59aeeb6a06702ccc5919631e9cc0ccadd2b1c7a9
+size 2379
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-search-search.png b/screenshots/Firefox/baseline/s-input-icon-light-search-search.png
new file mode 100644
index 0000000000..bfae8d62f7
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2dcdf2e5045b91d7d9357443bc360cda2f6316e15c87e8f0ca7effa8cf9244f7
+size 2344
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-search.png b/screenshots/Firefox/baseline/s-input-icon-light-search.png
index bfae8d62f7..f79c141f2e 100644
--- a/screenshots/Firefox/baseline/s-input-icon-light-search.png
+++ b/screenshots/Firefox/baseline/s-input-icon-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dcdf2e5045b91d7d9357443bc360cda2f6316e15c87e8f0ca7effa8cf9244f7
-size 2344
+oid sha256:2fc43b8bd221de401a989a555ef5d36ff89bfcb7498c06ac6bc151a78b277b1a
+size 2254
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-success.png b/screenshots/Firefox/baseline/s-input-icon-light-success.png
new file mode 100644
index 0000000000..ff4c696a56
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ae29b00e2c3fd6216d1f0e1369d8a6fec89b1f8866ced02b40a5c0a04b4c490
+size 2492
diff --git a/screenshots/Firefox/baseline/s-input-icon-light-warning.png b/screenshots/Firefox/baseline/s-input-icon-light-warning.png
new file mode 100644
index 0000000000..98672ad2a4
--- /dev/null
+++ b/screenshots/Firefox/baseline/s-input-icon-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:135532f9cb4fb9100a1c0e7e445618a071632928abffd04f47e68f54ebe5869d
+size 2448
diff --git a/screenshots/Firefox/baseline/s-input-icon-light.png b/screenshots/Firefox/baseline/s-input-icon-light.png
deleted file mode 100644
index f79c141f2e..0000000000
--- a/screenshots/Firefox/baseline/s-input-icon-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fc43b8bd221de401a989a555ef5d36ff89bfcb7498c06ac6bc151a78b277b1a
-size 2254
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-creditcard-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..7d143bc7be
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89f2ef1a6552b12b8d0b472c9c2358eef5b9d125cf61dc5be9ddef57f82b8012
+size 1866
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
index 7d143bc7be..92b1a5eace 100644
--- a/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89f2ef1a6552b12b8d0b472c9c2358eef5b9d125cf61dc5be9ddef57f82b8012
-size 1866
+oid sha256:62d52e29745a30084f98fa58ac5c794f558a7ae1df1a7f0546e47cb1088d05af
+size 1842
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-dark-disabled.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled.png
rename to screenshots/Webkit/baseline/s-input-icon-dark-disabled.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-dark-error.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error.png
rename to screenshots/Webkit/baseline/s-input-icon-dark-error.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error-error.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error-error.png
new file mode 100644
index 0000000000..5b48fa0f2b
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfcd5017a692ad2a1e3158965ec15282bb7b72388200e72ae482f94babd77d3f
+size 1912
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success-success.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success.png
rename to screenshots/Webkit/baseline/s-input-icon-dark-parent-has-success-success.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning.png
rename to screenshots/Webkit/baseline/s-input-icon-dark-parent-has-warning-warning.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled-disabled.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..4fa4b3ffaa
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a67bc2c5bdf999f29bb45bcb3aafc18c8c63d463b27c19441f4e437b21b0f7be
+size 2207
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly.png
rename to screenshots/Webkit/baseline/s-input-icon-dark-parent-is-readonly-readonly.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-readonly.png b/screenshots/Webkit/baseline/s-input-icon-dark-readonly.png
new file mode 100644
index 0000000000..8610d890ae
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1104086ddc94b2376ae07ac2a391a206aa169386b6148e36f25e8b035957dcf8
+size 2081
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-search-search.png b/screenshots/Webkit/baseline/s-input-icon-dark-search-search.png
new file mode 100644
index 0000000000..43d14aa053
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2663f1d27cc830bfde723631e66594304625931b8106bc27ee35270f7bc1e58d
+size 2258
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-search.png b/screenshots/Webkit/baseline/s-input-icon-dark-search.png
index 43d14aa053..92aaf54310 100644
--- a/screenshots/Webkit/baseline/s-input-icon-dark-search.png
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2663f1d27cc830bfde723631e66594304625931b8106bc27ee35270f7bc1e58d
+oid sha256:8d39821378aef89e0f3adcab840a4d4e93a45d2dd875a09b73345032fc5d8c03
 size 2258
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-success.png b/screenshots/Webkit/baseline/s-input-icon-dark-success.png
new file mode 100644
index 0000000000..b1c859b979
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa5ff9413090318fe5f868b386ea6a9ab1072ad33c1a9f968493db49d4497069
+size 2011
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark-warning.png b/screenshots/Webkit/baseline/s-input-icon-dark-warning.png
new file mode 100644
index 0000000000..1cb330ca8d
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-dark-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8101b418bfd394203baed536c0ebca8cfef2da9c5170bb4673e760af57edb60a
+size 2143
diff --git a/screenshots/Webkit/baseline/s-input-icon-dark.png b/screenshots/Webkit/baseline/s-input-icon-dark.png
deleted file mode 100644
index 92aaf54310..0000000000
--- a/screenshots/Webkit/baseline/s-input-icon-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d39821378aef89e0f3adcab840a4d4e93a45d2dd875a09b73345032fc5d8c03
-size 2258
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
new file mode 100644
index 0000000000..5f702ab33c
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69932802238585504e37ac372c6805bba10286546c4aa45516258c5049c3411b
+size 1820
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
index 5f702ab33c..70360b2a25 100644
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69932802238585504e37ac372c6805bba10286546c4aa45516258c5049c3411b
-size 1820
+oid sha256:1c4989a30e5bf7ecd307a33eaec0b74ec963a5b2fdcf8d0caed528b6e90d8c3c
+size 1764
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-disabled.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-disabled.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-error.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-error.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
new file mode 100644
index 0000000000..02e3e1cd59
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59f96584638ff642394d64f203014f91349fa2eb3e83a04cc93b3954e8788cec
+size 1899
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-success-success.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-has-warning-warning.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..bcb7166496
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1d4ac6926595be2161dd9c1fb7ec4047cf7737b1e2ce24b0ceff2434d32a919
+size 2131
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-parent-is-readonly-readonly.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-readonly.png
new file mode 100644
index 0000000000..e01f439daa
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aa12bb10b561e5730c52d2a5062c922cbd7a1ec7a0fdca35fc16473623415d1
+size 2253
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search-search.png
new file mode 100644
index 0000000000..f155b94eb2
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac12e7b61ede0d37d000fcb24b118be33836386424218d6cc0a4936a855acd63
+size 2180
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
index f155b94eb2..70112fd6b7 100644
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac12e7b61ede0d37d000fcb24b118be33836386424218d6cc0a4936a855acd63
-size 2180
+oid sha256:3278aa5e466a68c7430c92c99ae253699dd8ba0019d1ae9dd3121a29f894a5aa
+size 2118
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-success.png
new file mode 100644
index 0000000000..f27961742a
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1445049da1a664fffd7be79e5ccf8be8d7826f2b774a8c51a68f16ba3413f205
+size 1996
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-warning.png
new file mode 100644
index 0000000000..0afe6529f6
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cee969352c9aa2998d92ba65873e4468e3a6666e65eaec5ab704887fa04392e6
+size 2081
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
deleted file mode 100644
index 70112fd6b7..0000000000
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3278aa5e466a68c7430c92c99ae253699dd8ba0019d1ae9dd3121a29f894a5aa
-size 2118
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..295c7bbcbc
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ba2a41b834a155ae3f8c1731c8154f360fa3962004d95e52a5578d67e5ae37a
+size 1940
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
index 295c7bbcbc..40e460f3d4 100644
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ba2a41b834a155ae3f8c1731c8154f360fa3962004d95e52a5578d67e5ae37a
-size 1940
+oid sha256:68c4448ef7a3e7e29c21bea95be047a3f06996e002e808109a90c703be9e575b
+size 1936
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-disabled.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-light-disabled.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-error.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-light-error.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
new file mode 100644
index 0000000000..f23f178659
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f9ff096d44b1068fe32a7672ccd0ef48e7596839bf0d9cbc961988875c85d58
+size 1969
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-success-success.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-has-warning-warning.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..1264fc7214
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:827b24b38d465097cb85e2c7ef3ecf9dbd728ce92a6ef4157f43525accc9aec5
+size 2246
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly.png
rename to screenshots/Webkit/baseline/s-input-icon-highcontrast-light-parent-is-readonly-readonly.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-readonly.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-readonly.png
new file mode 100644
index 0000000000..4751d96e0b
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47e7cabdcdaf4e24d3d81a6d39a68ecd4035f165f48df3e34c6c2d5efbe0f6c4
+size 2287
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search-search.png
new file mode 100644
index 0000000000..c73b48ffe1
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55848d839d3f568689dff0a198830405917ce0477bb0f14d7d2503156bc85a37
+size 2299
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
index c73b48ffe1..08fa69070d 100644
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55848d839d3f568689dff0a198830405917ce0477bb0f14d7d2503156bc85a37
-size 2299
+oid sha256:30f705b7ef08bb30aa377a177d384f18f7d24e271f3fe1639c44d2f88cef2645
+size 2292
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-success.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-success.png
new file mode 100644
index 0000000000..e8ec7918f1
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b5c1c82cf1ef1fa00a909a23b6d07bc1974051ab6ae38045c31d7c39f6f22ad
+size 2090
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-warning.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-warning.png
new file mode 100644
index 0000000000..461bb0e7d8
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc97f4a58d2ef5965f64843a0de00e5ac0b8742d01d6bda23209d12080de3abc
+size 2225
diff --git a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png b/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
deleted file mode 100644
index 08fa69070d..0000000000
--- a/screenshots/Webkit/baseline/s-input-icon-highcontrast-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30f705b7ef08bb30aa377a177d384f18f7d24e271f3fe1639c44d2f88cef2645
-size 2292
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-creditcard-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-light-creditcard-creditcard.png
new file mode 100644
index 0000000000..b0920fabab
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-creditcard-creditcard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9ebdcb0e5d8e9fd98363e0d1a0559917787a43ad7922f88ad36a74fdfab1502
+size 1764
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png b/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
index b0920fabab..574546db14 100644
--- a/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
+++ b/screenshots/Webkit/baseline/s-input-icon-light-creditcard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9ebdcb0e5d8e9fd98363e0d1a0559917787a43ad7922f88ad36a74fdfab1502
-size 1764
+oid sha256:fdd0aa67e021a882dd6e100a021297a1822ecdcdf5c1cf39752d5e7425145e5c
+size 1710
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png b/screenshots/Webkit/baseline/s-input-icon-light-disabled.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled.png
rename to screenshots/Webkit/baseline/s-input-icon-light-disabled.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png b/screenshots/Webkit/baseline/s-input-icon-light-error.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-light-parent-has-error.png
rename to screenshots/Webkit/baseline/s-input-icon-light-error.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error-error.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error-error.png
new file mode 100644
index 0000000000..c79b1faf70
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-error-error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f668fd7b208db32a7ec4cddb77b5e7a78ccdf9e1a0dcbaae4ea1f5503edabd7
+size 1804
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-success-success.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-light-parent-has-success.png
rename to screenshots/Webkit/baseline/s-input-icon-light-parent-has-success-success.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning-warning.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning.png
rename to screenshots/Webkit/baseline/s-input-icon-light-parent-has-warning-warning.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled-disabled.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled-disabled.png
new file mode 100644
index 0000000000..539bb1cf43
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-disabled-disabled.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52efbaa064d9944aeb1070015a4fce8e62e10831276ab7d903ad3907542715f7
+size 2088
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png b/screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly-readonly.png
similarity index 100%
rename from screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly.png
rename to screenshots/Webkit/baseline/s-input-icon-light-parent-is-readonly-readonly.png
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-readonly.png b/screenshots/Webkit/baseline/s-input-icon-light-readonly.png
new file mode 100644
index 0000000000..4b0914a091
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-readonly.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49b78d147d03e11d35cbf222a8b09ead2416cf2575b2cc965f4cd88fd363879a
+size 1926
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-search-search.png b/screenshots/Webkit/baseline/s-input-icon-light-search-search.png
new file mode 100644
index 0000000000..05ddf17b34
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-search-search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb62eb53a653cb328295a83533dd0de45f0df46aef827039dcb386cd570dbbeb
+size 2157
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-search.png b/screenshots/Webkit/baseline/s-input-icon-light-search.png
index 05ddf17b34..93954cc0c0 100644
--- a/screenshots/Webkit/baseline/s-input-icon-light-search.png
+++ b/screenshots/Webkit/baseline/s-input-icon-light-search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb62eb53a653cb328295a83533dd0de45f0df46aef827039dcb386cd570dbbeb
-size 2157
+oid sha256:7330e20c51ff1f7971f7ad71f1c021ede06ca974dbacdb8f99b1036dff6c507d
+size 2116
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-success.png b/screenshots/Webkit/baseline/s-input-icon-light-success.png
new file mode 100644
index 0000000000..0507ac8064
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-success.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53ae2241f5d11ed94cb8a2b61785efca98fd0911b5299e2c2443a44051228d5c
+size 1975
diff --git a/screenshots/Webkit/baseline/s-input-icon-light-warning.png b/screenshots/Webkit/baseline/s-input-icon-light-warning.png
new file mode 100644
index 0000000000..ab0a4b9042
--- /dev/null
+++ b/screenshots/Webkit/baseline/s-input-icon-light-warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:137a7c0f56fa25cf61f76f89bc60d714fbef52ef8b97e5e60972567ebd1b37b9
+size 2032
diff --git a/screenshots/Webkit/baseline/s-input-icon-light.png b/screenshots/Webkit/baseline/s-input-icon-light.png
deleted file mode 100644
index 93954cc0c0..0000000000
--- a/screenshots/Webkit/baseline/s-input-icon-light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7330e20c51ff1f7971f7ad71f1c021ede06ca974dbacdb8f99b1036dff6c507d
-size 2116

From 5efaa7748715e90033467040d60da9dde3ac9aa2 Mon Sep 17 00:00:00 2001
From: Dan Cormier <dcormier@stackoverflow.com>
Date: Fri, 9 Feb 2024 13:46:04 -0500
Subject: [PATCH 6/6] Remove a little cruft from accessibility test

---
 lib/components/input-icon/input-icon.a11y.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/components/input-icon/input-icon.a11y.test.ts b/lib/components/input-icon/input-icon.a11y.test.ts
index c7066babe2..009c849a83 100644
--- a/lib/components/input-icon/input-icon.a11y.test.ts
+++ b/lib/components/input-icon/input-icon.a11y.test.ts
@@ -76,7 +76,6 @@ describe("input-icon", () => {
             options: {
                 includeNullModifier: false,
             },
-            skippedTestids: [],
         });
     });
 });