diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58899a146..8a74e1226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-ios-design-system-toolbox/compare/0.15.0...develop)
 
+### Fixed
+
+- [Library] Adjust typography modifier to be coform with line height token by adding line spacing and paddings (Orange-OpenSource/ouds-ios#594)
+- [Library] Set border as inner stroke (Orange-OpenSource/ouds-ios#680)
+
 ### Changed
 
 - [Tool] Update `SwiftFormat/CLI` pod from v0.56.1 to v0.56.2
diff --git a/DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj b/DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj
index fa0a3bee3..f09b42c23 100644
--- a/DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj
+++ b/DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj
@@ -2156,7 +2156,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Orange-OpenSource/ouds-ios";
 			requirement = {
-				branch = develop;
+				branch = "594-bug-typography-interline-is-wrong";
 				kind = branch;
 			};
 		};
diff --git a/DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved
index da49453e3..42d3bbc91 100644
--- a/DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Orange-OpenSource/ouds-ios",
       "state" : {
-        "branch" : "develop",
-        "revision" : "606eeb65451b481d09724f6750d919b206f9713f"
+        "branch" : "594-bug-typography-interline-is-wrong",
+        "revision" : "fe30636fd83a6bc152707ec6482c2ef9c5d37e55"
       }
     },
     {
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/OUDSRadioButtonUITests.swift b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/OUDSRadioButtonUITests.swift
index aa83abb24..9a8bb3830 100644
--- a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/OUDSRadioButtonUITests.swift
+++ b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/OUDSRadioButtonUITests.swift
@@ -137,6 +137,7 @@ final class OUDSRadioUITests: XCTestCase {
         [
             RadioTest.Layout.indicatorOnly(isError: isError),
 
+            RadioTest.Layout.default(longLabelText: true, labelText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", additionalLabelText: nil, helperText: nil, icon: nil, isError: isError, hasDivider: false, isReadOnly: isReadOnly),
             RadioTest.Layout.default(labelText: "Takoyaki", additionalLabelText: nil, helperText: nil, icon: nil, isError: isError, hasDivider: false, isReadOnly: isReadOnly),
             RadioTest.Layout.default(labelText: "Takoyaki", additionalLabelText: nil, helperText: nil, icon: nil, isError: isError, hasDivider: true, isReadOnly: isReadOnly),
             RadioTest.Layout.default(labelText: "Patatas", additionalLabelText: nil, helperText: "Bravas", icon: nil, isError: isError, hasDivider: false, isReadOnly: isReadOnly),
@@ -180,7 +181,8 @@ private struct RadioTest: View {
 
     enum Layout { // ControlItemLabel.LayoutData is not accessible, need to fake it here
         case indicatorOnly(isError: Bool)
-        case `default`(labelText: String,
+        case `default`(longLabelText: Bool = false,
+                       labelText: String,
                        additionalLabelText: String?,
                        helperText: String?,
                        icon: Image?,
@@ -200,8 +202,8 @@ private struct RadioTest: View {
             switch self {
             case let .indicatorOnly(isError):
                 "layout-indicatorOnly-\(isError ? "error" : "")"
-            case let .default(_, additionalLabelText, helperText, icon, isError, hasDivider, isReadOnly):
-                "layout-default-label-\(additionalLabelText != nil ? "withAdditional-" : "-")\(helperText != nil ? "withHelper" : "")-\(icon != nil ? "withIcon" : "")-\(isError ? "error" : "")-\(isReadOnly ? "readOnly-" : "-")\(hasDivider ? "divider" : "")"
+            case let .default(longLabelText, _, additionalLabelText, helperText, icon, isError, hasDivider, isReadOnly):
+                "layout-default-\(longLabelText ? "longLabel-" : "label-")\(additionalLabelText != nil ? "withAdditional-" : "-")\(helperText != nil ? "withHelper" : "")-\(icon != nil ? "withIcon" : "")-\(isError ? "error" : "")-\(isReadOnly ? "readOnly-" : "-")\(hasDivider ? "divider" : "")"
             case let .reversed(_, additionalLabelText, helperText, icon, isError, hasDivider, isReadOnly):
                 "layout-inverse-label-\(additionalLabelText != nil ? "withAdditional-" : "-")\(helperText != nil ? "withHelper" : "")-\(icon != nil ? "withIcon" : "")-\(isError ? "error" : "")-\(isReadOnly ? "readOnly" : "")-\(hasDivider ? "divider" : "")"
             }
@@ -225,7 +227,7 @@ private struct RadioTest: View {
                       accessibilityLabel: "Bazinga!",
                       isError: isError)
                 .disabled(isDisabled)
-        case let .default(labelText, additionalLabelText, helperText, icon, isError, hasDivider, isReadOnly):
+        case let .default(_, labelText, additionalLabelText, helperText, icon, isError, hasDivider, isReadOnly):
             OUDSRadioItem(isOn: .constant(indicatorState),
                           label: labelText,
                           additionalLabel: additionalLabelText,
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default.png
index e4da1bbcd..b1c340164 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default_Disabled.png
index 97babcf5b..c2de2ee8a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Icon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default.png
index aa9273773..213f1e332 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default_Disabled.png
index 729efce7f..f393d5feb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default.png
index c179ce466..f2d211661 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png
index 43f27df49..ceca67160 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default.png
index f08dda7b8..c0fb2c808 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png
index 625373b2a..c66bb1047 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default.png
index 8627cd593..03f387100 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default_Disabled.png
index ee0c6e3d8..f1f763138 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default.png
index 13df06107..77194e310 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default_Disabled.png
index 0c186912f..22cf84cbd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default.png
index 7c4bc931d..f34f7b09e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default_Disabled.png
index 2b76fc712..c608bdeb4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.ColoredSurface_Text_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default.png
index 11d22c65f..84ccaad73 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default_Disabled.png
index d9f8525b2..71ea65d69 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Icon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default.png
index 5b35b45da..0c018778c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default_Disabled.png
index 58aa52c84..544e0f883 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default.png
index 856d6467b..ef475bcb6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default_Disabled.png
index a5e58ae6a..8c6f2b2a2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default.png
index 89ec8f3ef..c51c3eccd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default_Disabled.png
index 58878bf32..82e922066 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Negative_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default.png
index 50a09eb72..cdf410b8c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default_Disabled.png
index 58878bf32..82e922066 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.TextAndIcon_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default.png
index 916d19f79..e236f4ea3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default_Disabled.png
index c4770f18a..3129a4578 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default.png
index 98b2c3532..19876de7f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default_Disabled.png
index 82e74a427..9876e511d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default.png
index 64c1f1bcb..7b94982f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default_Disabled.png
index 4dffe9908..aa919eb3b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Negative_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default.png
index e93005d59..18479464a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default_Disabled.png
index 4dffe9908..aa919eb3b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Dark.Text_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default.png
index 80237dc97..4d5233239 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default_Disabled.png
index 05a9f3674..19b6694e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Icon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default.png
index c89d61275..8f24d75f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default_Disabled.png
index ba9de74b0..3482eda17 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default.png
index 69886e510..89c728bc7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png
index 2f4d98843..772621237 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default.png
index c25d55767..31c1aef78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png
index a30c73832..fc01ca7b3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_TextAndIcon_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default.png
index adc977aba..7375f0e11 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default_Disabled.png
index 04c2ac05d..37a2ac9ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default.png
index 175dc16a9..f1c264dc4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default_Disabled.png
index 52fd1ecd5..86eb2d816 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default.png
index f48ecf2af..c235b6780 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default_Disabled.png
index 27cd6189e..568e163da 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.ColoredSurface_Text_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default.png
index f60259428..f6a1da436 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default_Disabled.png
index 8b96f7c11..44dbaa6c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Icon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default.png
index a644b8c64..2e48df247 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default_Disabled.png
index 1ec60a5aa..ba49899f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default.png
index 4017c817f..5ea2961b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default_Disabled.png
index 3eac6ac86..36ddb7951 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default.png
index aeb75e56e..c845e6f02 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default_Disabled.png
index 9459cc466..e5a7439e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Negative_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default.png
index c25d55767..31c1aef78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default_Disabled.png
index 9459cc466..e5a7439e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.TextAndIcon_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default.png
index 7146d64be..d6ca7c1b9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default_Disabled.png
index 8682eedeb..d7df65e05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Default_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default.png
index 946c0104b..0b4b88b9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default_Disabled.png
index ba16e2828..0cbc85d39 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Minimal_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default.png
index 73e8f8db0..38902d755 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default_Disabled.png
index df5cf8731..c01ba74e6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Negative_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default.png
index f48ecf2af..c235b6780 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default_Disabled.png
index df5cf8731..c01ba74e6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSButtonUITests/test_OrangeTheme_Light.Text_Strong_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate_.png
index b783313d5..a5c0b0715 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate__Disabled.png
index 1d6fc395d..e2d232f5f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected_.png
index 1f951afdb..3cda1ca09 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected__Disabled.png
index afef13e28..f05f30a85 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected_.png
index e89519f51..2727a5b9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected__Disabled.png
index c442462d2..f9d77797e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate_.png
index 46809a0b6..1c42c4a50 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate__Disabled.png
index bbb9e4dc0..e78dd8cc3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected_.png
index 50aa97695..09b9b7b5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected__Disabled.png
index 4db39c0f9..85e9de17a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected_.png
index dfcb05c88..7a973e5e7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected__Disabled.png
index a3af64877..9eb689062 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Indeterminate_.png
index 7cb72af20..98f09967b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Selected_.png
index 42384728c..dba676377 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Unselected_.png
index b9174620e..99a2348ea 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Indeterminate_.png
index a6336acfa..be61ed88b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Selected_.png
index 185fea94a..8b251cc25 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Unselected_.png
index 1d2df0039..c5bdfee69 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Indeterminate_.png
index 68cc609f2..f4c1124ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Selected_.png
index d6c731c70..a7240392e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Unselected_.png
index d5e6476c5..af7011e17 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Indeterminate_.png
index 10b864131..74cf7e4fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Selected_.png
index 095332159..5183e5bc4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Unselected_.png
index 1815162a2..362145547 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate_.png
index b3e7f6ab0..e3e083a2c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate__Disabled.png
index f07c36a7c..143dd16cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected_.png
index 93682e9b3..e5a75d21a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected__Disabled.png
index 2c5474d9b..1da97e781 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected_.png
index 49920f1ce..8eb64aa6a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected__Disabled.png
index 01d2cbc84..e4e4a5d78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate_.png
index 4a067e28e..b73b2b642 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png
index 86fbef94f..e438452f3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected_.png
index 1c02b6c0e..0b38ec7e1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected__Disabled.png
index 8dffa6a98..d79a0c4f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected_.png
index 8ee3d9cc5..6344fc6fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected__Disabled.png
index e570785a0..61dc70d05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Indeterminate_.png
index a7ab2ec87..bb17441f8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Selected_.png
index a599e1913..6626ebd78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Unselected_.png
index ac5bfa575..af406be4c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Indeterminate_.png
index 842988df0..29713b4b0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Selected_.png
index 2b54a1590..d8261ff93 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Unselected_.png
index c3af8f555..f0fd117dd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Indeterminate_.png
index 964db8d6d..a11fe3781 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Selected_.png
index a85371bb3..819ff98d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Unselected_.png
index f790e8e13..ccdf952cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png
index 5342407fb..d4ecd4d11 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Selected_.png
index 2a11da878..64355f088 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Unselected_.png
index 4f81c6769..27496bd57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate_.png
index 0276432b4..6281f4e7b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png
index f22cf2652..a5c609bab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected_.png
index f6737ae18..0bf82ec2c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png
index d76a013b2..f1e6b848a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected_.png
index 9902084a6..fb9795464 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png
index de4c7ccc5..38fe072c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png
index a1fd01b52..3b30b4055 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png
index 8e854ac87..ffcc68780 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected_.png
index c82525ac6..a98f0a5e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png
index 400cd76ca..d08ea6d48 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected_.png
index 0dfc2d8e1..670b25bd4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png
index 6e88b68cb..927f23107 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png
index 4b00b0978..da9b05ec9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Selected_.png
index 8fc97ba19..6b321aed0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Unselected_.png
index ada5c7ed3..302e3ea55 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png
index af2129881..b8fcf25f3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png
index 1c7c48be0..08e129f5b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png
index 2d02bc5e2..1215ed6e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png
index 8db665b9b..4d4e1ac36 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png
index 827b61676..a0e2138b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png
index cab1f6f43..965eeb4b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png
index 9128aeb5f..c72abde47 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png
index a02747500..77722ad0b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png
index 0d38ff76c..b8544472d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate_.png
index 63a1078c0..24635e12b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate__Disabled.png
index 75cf4e5be..8e51abd90 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected_.png
index 73298cd1d..c65b57a4a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected__Disabled.png
index 4b7d73f97..923cde44c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected_.png
index 6fa2905ae..c94083c13 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected__Disabled.png
index a7ad7ecb8..9b70aea43 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate_.png
index 5c75d5f77..b403460cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png
index e0a0f9a5f..aef55e049 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected_.png
index 25bd047bb..259de4c18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected__Disabled.png
index faf34c240..e27fb217e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected_.png
index 1aac9b544..8e8fd1d05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected__Disabled.png
index 611f9ea9f..4666e7325 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Indeterminate_.png
index 107773750..936d4da8b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Selected_.png
index 67875de5f..d7151b8e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Unselected_.png
index 435a15977..eec20b2d8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Indeterminate_.png
index f65cb7758..0db40dc01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Selected_.png
index 637ba645a..9343c5d25 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Unselected_.png
index fd31cc476..d2b2d5fa6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Indeterminate_.png
index 48242ac1e..a8f80cf23 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Selected_.png
index a25898eea..08c8eba76 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Unselected_.png
index 36c2f3ef9..4d5911189 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png
index 1ad5fb050..492331064 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Selected_.png
index 6bd45586c..faaa91bcb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Unselected_.png
index 84c6bd869..d0fd27030 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate_.png
index 1713cbeeb..a4bac65c7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate__Disabled.png
index 9cf2c9a65..79d05ec05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected_.png
index 2a06c801c..ddea4d40f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected__Disabled.png
index 6885a95ab..11c5e7003 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected_.png
index 8926f707c..7fbd835c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected__Disabled.png
index 1c201e686..87e38627d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Indeterminate_.png
index 4ddfd3fb8..f058252e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Selected_.png
index 86832bdf2..20f807550 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Unselected_.png
index ca051748c..c3b88c35e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate_.png
index 54104dfe6..7b9ea7517 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate__Disabled.png
index f69f351a2..50f1bc602 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected_.png
index 01e99f461..3f83f451b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected__Disabled.png
index e0bd289bf..aa0307636 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected_.png
index 44433a42a..922c4ba74 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected__Disabled.png
index 0dc9fdb4e..ddaa51188 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate_.png
index 9daf17a15..681957794 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate__Disabled.png
index aa62be6de..7bd0f0d04 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected_.png
index 05bdc33d9..7c28fad7d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected__Disabled.png
index d2bfc6cf7..7cf018eb8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected_.png
index 8f9e43a2d..4f154b310 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected__Disabled.png
index d8619a4cd..341d04722 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Indeterminate_.png
index de8e1f1fb..9f5ffc990 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Selected_.png
index 19b8e05c9..cc7e9e0c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Unselected_.png
index 3b83f51c8..3c3a8c59e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Indeterminate_.png
index 8b715174a..bffcc8f63 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Selected_.png
index b512454bc..25cf575a9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Unselected_.png
index 60639b5af..35000262d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Indeterminate_.png
index f24036072..6f04251ba 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Selected_.png
index f5193ff80..ab8fefa7e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Unselected_.png
index 3791e033a..d237f28ce 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Indeterminate_.png
index 1ec0fc6cf..11e237ebd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Selected_.png
index 2fea62514..9b7025e54 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Unselected_.png
index 88f768d5e..5fcd6e3a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate_.png
index 92e229aee..976e6f78f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png
index 3d147166f..2103458aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected_.png
index c934b81da..26302665a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected__Disabled.png
index 2882afb64..5eed3122c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected_.png
index e30a7781a..929807379 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected__Disabled.png
index e29bef98b..8a9e69f4e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate_.png
index 4851d33f2..ad4f0b614 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png
index 90d263ae4..363d36de7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected_.png
index 2494221d6..ace4cb257 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected__Disabled.png
index b7ae2e2f5..742cbc38b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected_.png
index d2a479985..0454b08fd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png
index d8c4137b0..b08adc803 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Indeterminate_.png
index 68b9f7dd5..d0281018c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Selected_.png
index 23c5177a4..bdbeabb8a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Unselected_.png
index 417e9265f..5ee56d1b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png
index 319c6a06a..0f00f2c96 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Selected_.png
index 701583953..4c3cadb44 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Unselected_.png
index ebf60a56d..86d9f5327 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png
index 7c4566804..12471939c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Selected_.png
index f9041bddd..4e43558b0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Unselected_.png
index 033c8bd2d..711be85fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png
index d343c9a31..d8df03978 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png
index 34d272531..33bbaacfd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png
index cd8969b9c..1f03b3087 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png
index 21cfccb94..34526504e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png
index 87369579a..b70e955ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected_.png
index 4bdbdd37e..a9b025fba 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png
index 44b483cd4..cbe13b07a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected_.png
index 1c544263a..18339b766 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png
index 68237eb46..f7bab2725 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png
index 75b423f53..25efe522c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png
index 233e54d4a..b5ecf86f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png
index 5f64e0983..33ad00f3e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png
index bc8e9c75e..a9bf62479 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png
index 55b0d96f3..dc3cbee48 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png
index c9a8367e1..4ed4cacb3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png
index a25c53ee7..ad884f577 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png
index 26d23f62d..fcc9a0444 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png
index 8a6713898..527837a00 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png
index ea0b3a19a..32b32c8c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png
index e6eab8ddd..c39704d55 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png
index 6930257b2..b91127a12 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png
index b7b305ee9..2e5130175 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png
index 924596e4e..2f12374bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png
index 9ff107309..359935753 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png
index 15e888231..665f18674 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png
index c54d287fc..3453171c5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png
index 7592b53ee..22da97592 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate_.png
index 5ad3da097..5f4359d1e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png
index 890a6ce1c..eebf3092a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected_.png
index 79df2ab0d..8d52fc5ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected__Disabled.png
index c7c1e6d62..05bde8a83 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected_.png
index 7772abd70..03e953a40 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected__Disabled.png
index 20ea55deb..6bfb82bb5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate_.png
index 82cdfcf47..6f3c68f63 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png
index 7b69dba3f..debce0d75 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected_.png
index bcaa948ec..acaa32e50 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected__Disabled.png
index f8d4ad879..e3a89964a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected_.png
index aa3579f46..abcd07833 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png
index fe177bdf1..261374f31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Indeterminate_.png
index 1ba9175c1..f3578ca50 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Selected_.png
index a278b6975..a963eed4e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Unselected_.png
index 77481a114..0a4c2bb35 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png
index 3bafd8882..b5e344225 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Selected_.png
index ff22eca9a..2c5ee3de7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Unselected_.png
index 8f9b10dc3..436266652 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png
index daeaec8b1..7d0f4eda0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Selected_.png
index 5b91420f3..3a7dc9962 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Unselected_.png
index e1b86e410..55047b34e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png
index aefa47553..589ee0e27 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png
index ad0d3dc00..1dc113652 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png
index 594e2538a..2a21f2e6a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate_.png
index 369b51a97..a336e54aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate__Disabled.png
index b6a8469fb..45b002033 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected_.png
index 05bcb3dcd..b273cf927 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected__Disabled.png
index d54a672f4..4a3b3c401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected_.png
index 3d0bab6b2..0305fb679 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected__Disabled.png
index ee29e6df8..c0bae6875 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate_.png
index 8b229836e..09d1c3581 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate__Disabled.png
index 31a6e59af..1258ef2a0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected_.png
index da6e1c076..24e520430 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected__Disabled.png
index 6c95e9136..4ae048f5c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected_.png
index 23758bfd2..d3e98fba2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected__Disabled.png
index 7cf9094f7..501ba65e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Indeterminate_.png
index c4bece8f3..8c1f7e0b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Selected_.png
index 0e39bb7d0..2ad51d58c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Unselected_.png
index 991586dbd..5de63b8e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Indeterminate_.png
index 214320376..9fd7947d4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Selected_.png
index 9ec62b003..7ef561447 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Unselected_.png
index a81dc0574..6d1739371 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Indeterminate_.png
index a9a752d40..6763f997c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Selected_.png
index 72cd5e851..9736192fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Unselected_.png
index 4a7fcb19b..3bd4fb470 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Indeterminate_.png
index 4eb115f86..bccc40ef9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Selected_.png
index 7539c9af2..e48cf37b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Unselected_.png
index ec4068e75..c675f493c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate_.png
index f311bf74a..bd3b1853e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate__Disabled.png
index cbc754cfc..ce5d9b59d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected_.png
index 911015f66..def79a15f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected__Disabled.png
index 0c9fafccc..883c6c93a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected_.png
index 448ffaeb6..aff6af5c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected__Disabled.png
index 59209c9a6..3033cc908 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate_.png
index a899e4138..72ca84b3f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png
index bff7a4bec..434e34868 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected_.png
index bd5f5f983..79a2e781b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected__Disabled.png
index a64a07715..cec72be99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected_.png
index 27e0e0f3a..df1ecd409 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected__Disabled.png
index fc7f50f1d..6edca71c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Indeterminate_.png
index 09de89290..fb4931691 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Selected_.png
index ed59d6a90..2c187ebd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Unselected_.png
index 280fb216c..c2b2cfd0e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Indeterminate_.png
index 51b792239..0e448f1e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Selected_.png
index 479f38636..c1feb6482 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Unselected_.png
index dfc736803..f9ab2ff28 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Indeterminate_.png
index 14353e537..34b705224 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Selected_.png
index 3e4c966c9..f0049a189 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Unselected_.png
index 28005ae44..fd66e95cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png
index 4d9545fe2..bd2e6ba2f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Selected_.png
index 103af7690..9f9320c26 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Unselected_.png
index 0d7f0bb73..d934be371 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate_.png
index 9fb910ac7..fde25b290 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png
index 23263d6de..1107415a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected_.png
index 633b964a2..898dc908d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png
index d8e4c2e1c..389c725c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected_.png
index c141b9d19..ac72bcf07 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png
index 3034ffdda..ee6d08210 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png
index ec8a4ce36..3a079f516 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png
index a5b75578a..ce8a353d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected_.png
index d00111730..0c0daa45f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png
index 35ef947c1..894ea54ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected_.png
index 4b10ff311..97cf214c6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png
index e6a8ef047..ed2bb5f99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png
index dac46c316..2a34bd626 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Selected_.png
index 3429a7230..3008b0896 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Unselected_.png
index de4be512d..cb3b430a7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png
index 162d15a20..1b009f9ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png
index 557d01c6f..5a89ecc0e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png
index 5bdd3a761..cd15aa5ba 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png
index ce8937f3d..99e922cd2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png
index 9437a90ad..c7ce3bad2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png
index 465cdab51..ed50f9bb3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png
index 4b773c4ca..f997d8be0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png
index 968f15427..43ba84077 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png
index 2d3052fce..514d99f73 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate_.png
index 4bcf87ced..f3aa2c2ca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate__Disabled.png
index 3eef244a1..921ec9f89 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected_.png
index 87ad8cc9d..f4c4cab64 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected__Disabled.png
index b0d81e470..844c8c646 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected_.png
index 0558f1bab..e3dc12dca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected__Disabled.png
index fc9f227ea..9bcf17718 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate_.png
index 855ae8436..b20bb691f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png
index c5ff8258b..af2b22cf5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected_.png
index 998bd3930..51459cc5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected__Disabled.png
index 1f5c9d76a..e05720ab0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected_.png
index 79b985649..22ffcc4f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected__Disabled.png
index 374de7e29..4352e3ad9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Indeterminate_.png
index 1b3efd4c5..2c160d6a6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Selected_.png
index d3b872bcd..d1e14d91e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Unselected_.png
index 9360131e6..a5cf94a88 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Indeterminate_.png
index 7e8fd739c..84c67cab9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Selected_.png
index 3b369088e..2b92be701 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Unselected_.png
index a4b9d45f8..324943f4d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Indeterminate_.png
index f67463b31..c427d0186 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Selected_.png
index 771a3a2b3..e257c9bd5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Unselected_.png
index b5218ad4a..81250ce5d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png
index f24890aed..2270046e7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Selected_.png
index 65919a576..90b560411 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Unselected_.png
index ad59840eb..b561f6524 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate_.png
index 74d83316d..ae95a4588 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate__Disabled.png
index f4a7486d1..737bba097 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected_.png
index bf3b88281..0e50602a0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected__Disabled.png
index 5892f9fb7..179d18a49 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected_.png
index 6efe5df5e..227449374 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected__Disabled.png
index 0b1aaa1db..99ca7b9ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Indeterminate_.png
index 8efdb14ae..b35d5001a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Selected_.png
index a213260f2..0cc230650 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Unselected_.png
index b8c14d0be..56fe7da88 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate_.png
index 440e62a46..3a70309f3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate__Disabled.png
index 3a85d550d..ef941ff8e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected_.png
index e2badcd96..b5f98dac9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected__Disabled.png
index 3ddebb0c2..76edb7300 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected_.png
index 11d657c8a..945aac152 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected__Disabled.png
index a41aefcce..38071792a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate_.png
index 771dd0ea3..0371ca951 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate__Disabled.png
index 536e192d1..555b01157 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected_.png
index 4c4f5c11b..41147657b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected__Disabled.png
index 159d50941..71960c816 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected_.png
index e369256cc..5845dd5f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected__Disabled.png
index 9c8508c21..9f8cb3f00 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Indeterminate_.png
index b8e69aa5c..233597392 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Selected_.png
index 6a2f799e2..ffb27a7c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Unselected_.png
index aa1be2db1..f91dc088f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Indeterminate_.png
index 7133ca634..da6117240 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Selected_.png
index a3868c375..cc4de8bcf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Unselected_.png
index d0b8d4022..094e25dc7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Indeterminate_.png
index 628178a7a..0f66e97a6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Selected_.png
index 183580eb0..ec15feba7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Unselected_.png
index ca361af1b..d8442cc03 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Indeterminate_.png
index 815504e9e..3e755940a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Selected_.png
index f80b75441..0027e6169 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Unselected_.png
index f2b3593d5..2a0bec3b8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate_.png
index 0b720233a..c61b225b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png
index c13d2f193..e3defafa5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected_.png
index fada233aa..295113268 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected__Disabled.png
index e725371a6..0b6d935fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected_.png
index 0018de442..ce3a6f5ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected__Disabled.png
index ce2e31aa1..1e118ff7d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate_.png
index 6ba3fd399..aac5edff6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png
index 0e00cc12e..90ed72c64 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected_.png
index 7f141b462..5717b8c39 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected__Disabled.png
index 012fb6944..997e28610 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected_.png
index 4263218b4..4c674909b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png
index 6c1933ac1..e69a6395c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Indeterminate_.png
index 15ecb9e35..bfc42b7d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Selected_.png
index 145384bc7..b354211c6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Unselected_.png
index b7171bf22..72e087e5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png
index 9873b1227..50f91e5bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Selected_.png
index 5208f79b0..f3a3c57c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Unselected_.png
index b253e7160..bd2bf3204 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png
index 9238e3468..971032d07 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Selected_.png
index fa6e03e34..6c39fb612 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Unselected_.png
index 48b84214d..a3318016e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png
index 4a17e182c..aaae3be6d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png
index 11d927fb8..c3d2b09cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png
index 915c41b75..8d63c5c80 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png
index a7f3ca42e..aa1af9638 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png
index c93bcbd4e..2d2230d52 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected_.png
index ea048d6e6..d7bfe262c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png
index 8abe19cef..7cc633d92 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected_.png
index 72fd26cd9..32c11a94e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png
index 48d1f9970..e09d40a47 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png
index c7a7d16de..723fdd630 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png
index 6b4249735..54964c0ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png
index bb3c6ec16..66671dd89 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png
index d4d96f68e..6de847873 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png
index 36c26afea..346b0e699 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png
index 80cccca0a..81a1014bb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png
index 1285c534d..14542655a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png
index cb7efdd01..fa1ecc996 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png
index 731f8e56c..c3b6c0c02 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png
index 2dc2c928a..65fbaa58d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png
index 90fee1aa1..ce853c375 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png
index 6abd7fa55..eedd16b2a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png
index f3e0bf823..7c394500c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png
index 642451d65..5b3d80590 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png
index 033414c86..e5490c547 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png
index ee70d7328..6d659a6f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png
index f9ce24442..092eef288 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png
index 4a85ac2bb..0fb0885cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate_.png
index c2f4bf086..700d7a6af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png
index 29123d337..35d30d6b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected_.png
index 178c7dafd..ceb7d5afe 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected__Disabled.png
index 390134b1f..23f156787 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected_.png
index a9bfde928..b25b0ca92 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected__Disabled.png
index c5d7ffcac..3b2deef51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate_.png
index f74eda1d4..63d2bfa06 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png
index 5ddbe1743..fa1d036d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Indeterminate__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected_.png
index 292eb1ac6..c368408fa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected__Disabled.png
index 76837d837..6ab55cf07 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Selected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected_.png
index ea9112ea8..d756d2220 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png
index f4521d278..d2d8741df 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_Unselected__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Indeterminate_.png
index 76c5e4076..b3fe21825 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Selected_.png
index 31c7798d4..95abe36ca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Unselected_.png
index 786dd87e4..f6e87cd1c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png
index 14ebaacfc..cb61152e8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Selected_.png
index 022d4ff10..90c6dd6be 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Unselected_.png
index 8d021b1b9..31ef07389 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png
index ec81512d7..1ce9729e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Selected_.png
index d14a14b64..a0bc31af4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Unselected_.png
index e1928298d..e2f380d0a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png
index 95c35a771..ed103d72f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Indeterminate_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png
index 7e91e0bd1..18abc9f3c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Selected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png
index f10c23b13..3458b9471 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSCheckboxUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_Unselected_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default.png
index 142919ed3..6a20ff441 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default_Disabled.png
index 5b0842cb3..85828b922 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small.png
index 972269bfb..09ee1cf5f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small_Disabled.png
index fdf58d8ff..40c6cf347 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IconAndText_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default.png
index 7badf4d24..79321cd0b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default_Disabled.png
index 7debd3c33..37a3e7ae7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small.png
index 0a225fbb9..7b010a22f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small_Disabled.png
index abec2396a..d70ebe4b0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorBack_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default.png
index ce602adbc..d14dd7b83 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default_Disabled.png
index 4db392d01..8af0af499 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small.png
index 8d9e19c0a..a1b5ab6de 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small_Disabled.png
index 56fa5dab3..c5f3203d5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_IndicatorNext_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default.png
index 44a6edca2..98df3fcbc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default_Disabled.png
index 14158522d..060b23a1b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small.png
index f85ddc584..242b68441 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small_Disabled.png
index 45f68d059..cf666b35b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.ColoredSurface_TextOnly_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default.png
index 2dd4787f3..3af5cbfa6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default_Disabled.png
index 801f138b8..fdcdb041b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small.png
index 61057a075..c904b76cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small_Disabled.png
index fdae293c2..2143a855d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IconAndText_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default.png
index 19cd958bc..d9594df38 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default_Disabled.png
index f66419310..84e9ff976 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small.png
index bb52a2def..758cba079 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small_Disabled.png
index 7f849f03d..1bc60f956 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorBack_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default.png
index e57574461..b961fdd64 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default_Disabled.png
index 198529b4d..35170eaf6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small.png
index 39114c8de..6067104c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small_Disabled.png
index 983ea5c5a..d8cf1ac68 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.IndicatorNext_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default.png
index d210d943f..01bfa7752 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default_Disabled.png
index d60af5040..a8733b2bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small.png
index 8c869e2a6..6eb9c409b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small_Disabled.png
index 985636e71..f93181684 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Dark.TextOnly_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default.png
index 8fd20bbec..371bc903b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default_Disabled.png
index 05d7a2133..716412079 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small.png
index 8b31a923e..58d37af20 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small_Disabled.png
index 9a2f966fe..ef698cd52 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IconAndText_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default.png
index 8ef50bf0a..95475bfbd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default_Disabled.png
index 9348c674b..70a873d2d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small.png
index 7947cef86..e841d16c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small_Disabled.png
index 722bdb371..3d95b65d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorBack_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default.png
index 6021a1bfc..96670584a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default_Disabled.png
index a99253951..1be3aff79 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small.png
index bfd0214fb..bd90784ce 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small_Disabled.png
index 3c4f51f17..320e13647 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_IndicatorNext_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default.png
index 25061da73..25f6bb13b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default_Disabled.png
index 64c6471fc..7763e341a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small.png
index 9c4887449..9044229b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small_Disabled.png
index 2ef8737f7..08cbeed07 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.ColoredSurface_TextOnly_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default.png
index 4a2bd9810..ea294e8cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default_Disabled.png
index 71f8d510d..1ee099b1a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small.png
index bce79ed1d..dc4802a76 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small_Disabled.png
index c891412be..542d1cfd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IconAndText_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default.png
index 767ff1ba5..eaf7143e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default_Disabled.png
index ab16c7dc5..7bd0a34b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small.png
index cb14f2235..c7798cb2d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small_Disabled.png
index 66e9fe4dd..f28612b21 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorBack_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default.png
index efbccfa37..87290239a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default_Disabled.png
index a1d048e8f..917bd647b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small.png
index 912fcc52a..baf014ed6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small_Disabled.png
index 2f1abe785..92550debc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.IndicatorNext_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default.png
index d4981a788..74a2594e8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default_Disabled.png
index d0053590d..d63d0c7f1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Default_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small.png
index 47b3c576f..ad4581c33 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small_Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small_Disabled.png
index 6fd4920a4..29cb85316 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small_Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSLinkUITests/test_OrangeTheme_Light.TextOnly_Small_Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png
index 7c9f9ac9c..7adf88ed9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png
index 29dbc682c..8008a0122 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png
index 89146aeb6..741417b51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png
index b7705b32b..94156d28e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png
index ea55b8e65..daac57caa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png
index edd9953c3..91c7dd8d8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png
index 89146aeb6..741417b51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png
index b7705b32b..94156d28e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png
index 2bc8d84e4..1b7c0b412 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png
index c713a2e9a..0d50c6db6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png
index 5c46081f2..5457035bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png
index c713a2e9a..0d50c6db6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png
index fd256d580..80879ab65 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png
index 03f658302..cbeff744b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png
index c4bb8a6c8..5607124ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png
index 03f658302..cbeff744b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off_.png
index d870c3493..8e1bb7e24 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off__Disabled.png
index a03b5b041..72da0974a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on_.png
index fcb0f7cd1..db5b897c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on__Disabled.png
index 96990d65e..2f38365bb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off_.png
index 3564c9624..e46e7178b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off__Disabled.png
index 561ac5e1d..5c5ab6e64 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on_.png
index fcb0f7cd1..db5b897c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on__Disabled.png
index 96990d65e..2f38365bb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_off_.png
index 40c276faf..04f4fc868 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_on_.png
index cb1648b15..444e1899e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_off_.png
index b02a7af6a..cf903bf28 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_on_.png
index cb1648b15..444e1899e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_off_.png
index 49dbcf564..a9edf4028 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_on_.png
index 75280fcaa..bc5b4578f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_off_.png
index 1ff9cd22e..048fce334 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_on_.png
index 75280fcaa..bc5b4578f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off_.png
index 89d310cb8..88c242d2a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off__Disabled.png
index 852d6d87d..27566e208 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on_.png
index b8c755005..033972798 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on__Disabled.png
index bd6e9f428..4c48f1382 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off_.png
index 57d0c9c5d..1e417cd08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png
index 2160d2e6b..9c3577b49 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on_.png
index b8c755005..033972798 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png
index bd6e9f428..4c48f1382 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_off_.png
index 6b274f68c..4eecfde52 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_on_.png
index 59d908f81..1fcf30495 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_off_.png
index 176e9e5c9..fbfc69112 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_on_.png
index 59d908f81..1fcf30495 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png
index e04c1060b..b24f9e4d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png
index 5dc62c910..87a228dc7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png
index 8cbdece5c..8a91f71ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png
index 5dc62c910..87a228dc7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png
index 6e519a0d4..1f954fd1c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png
index 1e0aaaa0c..ffdd2ca49 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png
index 367eff0b6..b7ed35401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png
index df92a4113..652167f57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png
index 549a3f707..e4c16b16b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png
index 9c81dd964..7c6fac401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png
index 367eff0b6..b7ed35401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png
index df92a4113..652167f57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png
index 6336240f1..8409d812f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png
index b9e8aaba8..3850c07d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png
index 2c9bb0044..e819f4c8d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png
index b9e8aaba8..3850c07d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png
index ed0026cf9..9c3a5d98f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png
index 44558ef75..cdcdfde46 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png
index 522d00c2d..a2c3a550c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png
index 44558ef75..cdcdfde46 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png
index 303327236..ac07ea9ff 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png
index a18c2ebeb..75e734111 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png
index 03ceb7755..a1104f401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png
index 062a88114..9cc53f772 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png
index 1bb16c353..15fe10414 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png
index 9db3338f7..71d1b3493 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png
index 03ceb7755..a1104f401 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png
index 062a88114..9cc53f772 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png
index a30a4ca86..4f1b9a906 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png
index 57085e454..1a30f9f1a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png
index 64aae92ef..e460c69bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png
index 57085e454..1a30f9f1a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png
index fbd2f0dac..d56c2f6c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png
index 1704535fa..259a9b299 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png
index 38ad81488..245f5d23e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png
index 1704535fa..259a9b299 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png
index 4081605f6..e0d54e307 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png
index 314ede820..dde5f583e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png
index bc0e1f177..1a8680118 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png
index 15721ea37..f2937b586 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png
index 8644e30d0..6592c3d9e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png
index 81480a60a..2eae0357d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png
index bc0e1f177..1a8680118 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png
index 15721ea37..f2937b586 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png
index 19a53d4c0..3e45c9fed 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png
index 492e58d8a..cb164d8da 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png
index 3420c28ce..c2bceef57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png
index 492e58d8a..cb164d8da 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png
index a013eac46..1b93557b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png
index a04524204..8f538690c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png
index 001eb91b0..cfc24fe3e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png
index a04524204..8f538690c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png
index 0a088695f..07cfa5ac1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png
index d758b990a..2b0a6a2da 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png
index 598d09aa6..62b840776 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png
index aa4fe9527..e18089b32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png
index 78679b8e6..56a729334 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png
index 82dd391b9..7ede6e24b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png
index 598d09aa6..62b840776 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png
index aa4fe9527..e18089b32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png
index e48874324..1df004263 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png
index 02d41bd9e..aeae8b7af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png
index 16d24bf31..16e438f54 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png
index 02d41bd9e..aeae8b7af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png
index 0ee822c88..dadf944f3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png
index a81c919e6..987fe9432 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png
index a41c1cd63..a30fef7b5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png
index a81c919e6..987fe9432 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off_.png
new file mode 100644
index 000000000..18c17a940
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off__Disabled.png
new file mode 100644
index 000000000..5b3e766a0
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on_.png
new file mode 100644
index 000000000..60995798b
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on__Disabled.png
new file mode 100644
index 000000000..f4d7a09ae
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_off_.png
new file mode 100644
index 000000000..284523d25
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_on_.png
new file mode 100644
index 000000000..3a83d2c08
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_off_.png
new file mode 100644
index 000000000..8f5c727f5
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_on_.png
new file mode 100644
index 000000000..0a65f3507
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-default-longLabel-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off_.png
index f187c981a..940693611 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off__Disabled.png
index 154b1ec73..c4e666c48 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on_.png
index 027082cb0..1cd3453b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on__Disabled.png
index 053076d0d..a142f3824 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_off_.png
index f07db55c8..79be10264 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_on_.png
index e9b8750c5..1d56c4d53 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-indicatorOnly-error_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png
index 3759e88a6..b5726491d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png
index 557724dc3..de8985326 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png
index c7399bfb4..370a75986 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png
index 34f07a5d0..11038969f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png
index e304b2ca0..ff812d911 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png
index cf5f7473f..47e1bc285 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png
index c7399bfb4..370a75986 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png
index 34f07a5d0..11038969f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png
index 55a530f78..3cb0c50bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png
index 0e73ba239..8fc577d7c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png
index bbbe9c7c9..8ce18f8ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png
index 0e73ba239..8fc577d7c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png
index 2069057b7..c5a504164 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png
index 21d2dd9dc..ab94802ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png
index bce100edb..163c282ea 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png
index 21d2dd9dc..ab94802ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off_.png
index a6bee59d3..68ec0907d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off__Disabled.png
index d90844532..c064eafce 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on_.png
index 390f5a930..d623c3e58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on__Disabled.png
index 0ec48b8db..f41e74d58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off_.png
index 33e503811..7eb7cf37b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off__Disabled.png
index f9e1fc09a..d52dfcf58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on_.png
index 390f5a930..d623c3e58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on__Disabled.png
index 0ec48b8db..f41e74d58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_off_.png
index fb66b065c..e946b70d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_on_.png
index 4e81683c0..6c1386fa4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_off_.png
index 3659d2cf8..5e96845d2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_on_.png
index 4e81683c0..6c1386fa4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_off_.png
index 2cc5f7d3e..9d4c4578e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_on_.png
index 17317069f..1e3d95822 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_off_.png
index 5d19944b3..c72b3ace7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_on_.png
index 17317069f..1e3d95822 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off_.png
index 66613acad..bb516f7e7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png
index af3519370..efa1fb9fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on_.png
index 9c1652b1e..a25a92253 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png
index 0231c4b15..499b9a999 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off_.png
index 4d8d8ff0a..a81bc5996 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png
index eb919a6f2..c73701f8b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on_.png
index 9c1652b1e..a25a92253 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png
index 0231c4b15..499b9a999 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_off_.png
index 559bc6b51..3f92a01a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_on_.png
index ca14afedb..4bec6b56d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png
index 4816f666d..136a9565a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png
index ca14afedb..4bec6b56d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png
index b67c143f5..f89468129 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png
index d4eead446..ea258e6f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png
index 545985a6e..5dbd9005e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png
index d4eead446..ea258e6f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png
index 001c5d460..3f2e90713 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png
index c9fd2434d..c90b3e67b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png
index 28a4ae0d2..586236f7c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png
index 88bbdb7a0..d44f69e01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png
index 96fd79497..8dcdbeee3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png
index 15bfa7da2..c7b2775ae 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png
index 28a4ae0d2..586236f7c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png
index 88bbdb7a0..d44f69e01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png
index 33d69699b..b3a14a7e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png
index a17074730..a0aad2548 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png
index f7d6a044b..0fcaab007 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png
index a17074730..a0aad2548 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png
index 1a92eba14..26b29ccb2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png
index 969926a6b..1614d4dfd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png
index 6bda426b8..d1800988e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png
index 969926a6b..1614d4dfd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png
index 9da597eaf..06ad87fc5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png
index f0eea7c21..76136502c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png
index a1d54cd92..1f5257d3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png
index ca469f096..34cf8b4fd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png
index 6974b2176..e92b86d9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png
index 2de75dd49..4373a20b9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png
index a1d54cd92..1f5257d3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png
index ca469f096..34cf8b4fd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png
index 9a14f54b3..3b0b7affa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png
index dd58745a3..dad8509d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png
index a64786ce8..c90149fa7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png
index dd58745a3..dad8509d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png
index d01a103a9..8a3e4bbc1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png
index 64914d0ca..c49e9fc4e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png
index 9946f6c5a..ca3ca2f92 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png
index 64914d0ca..c49e9fc4e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png
index c0b08334a..584aad3bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png
index 3d03e29dc..b2bad677e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png
index 9cf824d08..3345f9ca2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png
index 8ea5d792b..0bc1060a6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png
index 40104f1bd..515835546 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png
index b4afafc17..c7ab501ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png
index 9cf824d08..3345f9ca2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png
index 8ea5d792b..0bc1060a6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png
index d03dff650..ce6880592 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png
index ebd223fc0..a92e090c5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png
index 8d15bfddc..357f93d9b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png
index ebd223fc0..a92e090c5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png
index 76ed4a936..bedfd87d9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png
index 24fdc4af1..c3a297dd5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png
index 318c30c86..dfdc5f7af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png
index 24fdc4af1..c3a297dd5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png
index 110633152..47f12d6ed 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png
index 1495c360f..c245c1a3f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png
index 4091bca0d..14df60670 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png
index 2cd4b0cfe..47f442bd7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png
index 86a2dd867..09a35091b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png
index 02a3200f9..4851264c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png
index 4091bca0d..14df60670 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png
index 2cd4b0cfe..47f442bd7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png
index 99faee5c0..8fed0f9ba 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png
index 28c828605..c909866ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png
index 6bf1b1e24..825308cf3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png
index 28c828605..c909866ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png
index ece042563..f9b4537d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png
index cdd7c65d2..57a212f81 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png
index 213469bdd..26f3e6ab3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png
index cdd7c65d2..57a212f81 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png
index 75701fb1e..845251e43 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png
index 1db213233..c5c0cb903 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png
index 0e7419ad8..4159a2a7a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png
index ea1cd7cf5..428d062cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png
index b5e1104c9..3f3eb6bf6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png
index 56861c6dc..07c3f0c58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png
index 0e7419ad8..4159a2a7a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png
index ea1cd7cf5..428d062cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png
index f82c9fb4d..52b87167a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png
index a5395f65f..65c697ff6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png
index bdec29859..3ff9984d3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png
index a5395f65f..65c697ff6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png
index 8e28cc747..f34b619a4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png
index f2a9edd94..1785f56e1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png
index aca15c775..bbf1196bf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png
index f2a9edd94..1785f56e1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off_.png
index ec23b5ea8..f08f49333 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off__Disabled.png
index e80d4bf1b..ccc2afa17 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on_.png
index d11994946..419d5184f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on__Disabled.png
index 989bb2cc2..1ca2a15b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off_.png
index 40d4e186c..d46d4174f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off__Disabled.png
index d7cb507f2..3092329c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on_.png
index d11994946..419d5184f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on__Disabled.png
index 989bb2cc2..1ca2a15b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_off_.png
index 3edd14dde..2c0a208fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_on_.png
index 542ae342e..a30fd254d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_off_.png
index 158d02259..12b7dea44 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_on_.png
index 542ae342e..a30fd254d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_off_.png
index 7cbd7c662..3609cab26 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_on_.png
index f536bb3e5..f605f593c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_off_.png
index 8f1a563bd..5ebb2a503 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_on_.png
index f536bb3e5..f605f593c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off_.png
index bd457d5d3..076554b1d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off__Disabled.png
index b9eba3447..1ee27989f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on_.png
index 4057fa7bf..6f5f6769a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on__Disabled.png
index 0b8eac196..989a7564d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off_.png
index ba0d86312..a0c325086 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png
index 039bae9ea..f82b67f2b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on_.png
index 4057fa7bf..6f5f6769a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png
index 0b8eac196..989a7564d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_off_.png
index e695cc3ad..089428287 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_on_.png
index 50c15f00e..f0866341f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_off_.png
index 9a3af806b..2f71d357e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_on_.png
index 50c15f00e..f0866341f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png
index 25e053951..87686e92b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png
index 9cad218b9..3c5080b5f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png
index cc321800a..8a087ff49 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png
index 9cad218b9..3c5080b5f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png
index 8c52cff67..c261a0d2b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png
index 54aeacb61..2d29f0ab5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png
index 1605fbcfc..6560fee8f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png
index 5ab6f7678..c8fc72c8e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png
index f2656675f..300964245 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png
index fd3683b28..e8b7752f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png
index 1605fbcfc..6560fee8f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png
index 5ab6f7678..c8fc72c8e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png
index 502ef4875..de045bc97 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png
index 8bb5721bb..d2c9b95ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png
index 06c92327c..23b7f6897 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png
index 8bb5721bb..d2c9b95ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png
index df34ac8e4..604f69f0e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png
index 67536f452..ecdfe468b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png
index 0d221306c..16aaae9e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png
index 67536f452..ecdfe468b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png
index ff01cf7dc..b4dda866b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png
index 682bc3fb8..f71fb48c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png
index 3d32d5705..e8200f7ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png
index 7508cbb88..9e11398f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png
index b614a0aa4..2f31ffd8a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png
index 654c941b3..b50d4a335 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png
index 3d32d5705..e8200f7ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png
index 7508cbb88..9e11398f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png
index 20d289c11..a4ed9d65d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png
index e073fe792..7a37bf2c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png
index 0295d6ea0..02c31b267 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png
index e073fe792..7a37bf2c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png
index e75f16677..ee734370d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png
index 39bf20dc3..e9fa62b15 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png
index 424707756..21837b6ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png
index 39bf20dc3..e9fa62b15 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png
index 1ea620b47..8cf5126b7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png
index fdced8046..2bbc255be 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png
index c99bbe393..67c6d326b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png
index 11672e5e7..00c67c01a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png
index fa2ec16f1..de6d2eae4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png
index 62cc9ff1a..5b264b91f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png
index c99bbe393..67c6d326b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png
index 11672e5e7..00c67c01a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png
index 1c5af2d2d..d4286cc83 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png
index e84efad5c..dd178437b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png
index d458b4d68..683a45820 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png
index e84efad5c..dd178437b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png
index f8e339aaa..f37d610c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png
index 1fc3ff8f6..d14986582 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png
index d15ba8849..aa130b9ad 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png
index 1fc3ff8f6..d14986582 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png
index 220d9853b..b4b43f042 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png
index 04e1a34cf..a4fb2ec85 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png
index 96585ad39..2e84605cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png
index 18332ec26..4e192ef4c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png
index e1d9ee394..a8a40570d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png
index e0a4cb7e8..9946c204a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png
index 96585ad39..2e84605cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png
index 18332ec26..4e192ef4c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png
index 8938b26fd..68bde07aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png
index 2aa4341e8..122d0c10f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png
index 8378b32f7..78169e5d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png
index 2aa4341e8..122d0c10f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png
index 4c12cb22d..b6af1139d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png
index 7aa493c0f..8ab3af094 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png
index 2461150fe..4830ef227 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png
index 7aa493c0f..8ab3af094 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off_.png
new file mode 100644
index 000000000..fdef991a5
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off__Disabled.png
new file mode 100644
index 000000000..95e60a86e
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on_.png
new file mode 100644
index 000000000..095c3d11c
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on__Disabled.png
new file mode 100644
index 000000000..3714d6f6e
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_off_.png
new file mode 100644
index 000000000..e69915a32
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_on_.png
new file mode 100644
index 000000000..cffad6ac0
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_off_.png
new file mode 100644
index 000000000..ed5e3e8ab
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_on_.png
new file mode 100644
index 000000000..4081cfd1b
Binary files /dev/null and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-default-longLabel-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off_.png
index 2437ecc5f..0f017f8e8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off__Disabled.png
index fcdd36917..36aaa4695 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on_.png
index fb5facd08..1fd36007d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on__Disabled.png
index 17095d0f0..6bfdf50d5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_off_.png
index 5442b1353..28ee5492b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_on_.png
index 3209cff4e..2ba5ebc25 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-indicatorOnly-error_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png
index f69609a9d..d43357485 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png
index 069e2573a..7a6b0e264 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png
index 94422e412..7a675766a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png
index 88b78fa5d..a8c583bc3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png
index 7b78ff673..b134eb994 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png
index 907c783b6..e5ed50964 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png
index 94422e412..7a675766a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png
index 88b78fa5d..a8c583bc3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png
index f2c98ad02..c524d9a71 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png
index db197d583..608b44cb2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png
index 5bf9371fc..5dc7155f1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png
index db197d583..608b44cb2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png
index aebdde347..983435464 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png
index 002df4e86..7d1fbb226 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png
index b4e827096..888a83a33 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png
index 002df4e86..7d1fbb226 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off_.png
index 0bf4699a6..6542f6369 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off__Disabled.png
index c5fb048a6..eb23b91f1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on_.png
index a5017ea96..6621832bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on__Disabled.png
index 88ab567ac..c11520088 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off_.png
index 2c9315488..f06565c2d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off__Disabled.png
index d987b4472..abe571beb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on_.png
index a5017ea96..6621832bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on__Disabled.png
index 88ab567ac..c11520088 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_off_.png
index 9e0e1e010..2f51fd4eb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_on_.png
index 75a4de3ea..445c4ab6b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_off_.png
index 4fd8b523b..bc132bf18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_on_.png
index 75a4de3ea..445c4ab6b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_off_.png
index 0e5afdf05..a947e6093 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_on_.png
index c8b0cad79..a312bd711 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_off_.png
index 0b63beec3..63e0af61e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_on_.png
index c8b0cad79..a312bd711 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off_.png
index 0a961c9c7..6ecf5ded2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png
index b7a229c65..259033592 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on_.png
index 5a64d4a4f..15714547d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png
index 429403979..71c72ed32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off_.png
index 3ab202ceb..33f098419 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png
index 7792b83e0..c4b0c6682 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on_.png
index 5a64d4a4f..15714547d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png
index 429403979..71c72ed32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_off_.png
index e58033dcf..6a47e7e87 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_on_.png
index ac2ed9ba9..07f9f54f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png
index 74adc555c..87479b758 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png
index ac2ed9ba9..07f9f54f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png
index a304d7a98..b792d5c66 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png
index bae75c0f5..0c52900c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png
index 534bcfaec..a09089645 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png
index bae75c0f5..0c52900c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png
index c4a147e15..c1fd86c19 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png
index 0dd603572..075558097 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png
index d3e9d600c..10777dcf9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png
index 3392de985..1d359c18b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png
index 962eb1a58..8a0fa94e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png
index 36cc96227..4b6d1472c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png
index d3e9d600c..10777dcf9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png
index 3392de985..1d359c18b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png
index 3071453e4..89f978e79 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png
index dfaa98626..9944f895d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png
index 17cf7c5ca..932e99e39 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png
index dfaa98626..9944f895d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png
index c6e1475eb..2fe67d8b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png
index e32961f62..54faf4cf2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png
index a209dbd74..6488e28c5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png
index e32961f62..54faf4cf2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withAdditional-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png
index 04e264966..578906bed 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png
index 17f10f933..b6601ea08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png
index f9d665e81..f7d272ede 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png
index 5244cdb94..15aa25b5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png
index 3105f9c40..40b2509d9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png
index 51c379e8e..8033494ce 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png
index f9d665e81..f7d272ede 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png
index 5244cdb94..15aa25b5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png
index d0e4d5260..2608c1b31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png
index f73dbd02e..39795ce4d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png
index 994250629..adaa37950 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png
index f73dbd02e..39795ce4d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png
index 3f349d82d..5dfd3d252 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png
index 1e0bed5c3..404eee06e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png
index 5b3b89e85..b05e1a507 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png
index 1e0bed5c3..404eee06e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png
index fe710caf8..bac681462 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png
index ed1a3fd1c..661bfbec9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png
index 65c3524e3..415d85757 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png
index ab683abaa..e25b6d83d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png
index d8c1248bf..fcd1d7e5c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png
index 0bc208fce..be25d817f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png
index 65c3524e3..415d85757 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png
index ab683abaa..e25b6d83d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png
index 07169c761..37fcd8bc4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png
index 3d6ba4146..c32124c31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png
index d5bf90860..5ba19d99a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png
index 3d6ba4146..c32124c31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png
index 036c032bd..21b93aa3e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png
index 83b4d57e7..c9641660b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png
index 6ed4d8819..2618c444a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png
index 83b4d57e7..c9641660b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png
index 20ee9f926..67c404312 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png
index a7a708be3..956fa2073 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png
index e0381ddbe..b8e95a126 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png
index bfbe9c212..a6736f6af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png
index 919685152..9c9cc5767 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png
index 21d5ee28c..e6464462c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png
index e0381ddbe..b8e95a126 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png
index bfbe9c212..a6736f6af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png
index 19f53c9dd..fda5f270e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png
index ed5db0ada..55dd7a83e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png
index 44ed7b16a..1fff87711 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png
index ed5db0ada..55dd7a83e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png
index 94543452e..32e2b3cb5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png
index cffcecd4c..500e3661a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png
index 36d24714a..7ac7e2335 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png
index cffcecd4c..500e3661a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSRadioButtonUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png
index 2bbc8008c..ca7e11be3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png
index e2ff3d6ce..71e5725b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png
index 65fc8fa10..2965cbb94 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png
index 8e0fb49bc..fbf1b5bd4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png
index 71577f24f..68720f174 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png
index 081e3f43c..f1aaa97bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png
index 1a539d9d3..ceccda9ff 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png
index ffb614dcb..0a78690e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png
index c2faa14b6..efcc584eb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png
index 72a7c3bd7..ec3111bcf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png
index 6aeb570c4..036db1701 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png
index 1fecfd818..804746fa8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png
index 879ec59dd..34a159683 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png
index fba37a3d5..7d1adcac6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png
index 1898d7a1e..f347863ad 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png
index 61981dfb6..189f24eaf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png
index 43e9d6d2f..bde5ba407 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png
index 4a46769df..ec86b3ef5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png
index 03c3a001b..046136d2c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png
index 857407a31..63fb11edd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png
index 6eadfa599..7177b1f4b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png
index f32a44ccd..1fc54b96a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png
index 93e380d9b..ba700f327 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png
index bf5cadff4..a9a3c54f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png
index a245078b6..c20ba1526 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png
index a008ad26a..08c54f9d3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png
index ccab1dfbb..0645115f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png
index 8a4829e61..31e82040c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png
index 421a02b0c..0fad3753b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png
index 6f5d73559..72be4627d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png
index b9ab8ce2a..6176c88d2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png
index 03a7bc025..68af2b864 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png
index f33de7000..c58a5ad5e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png
index bfb1cf9bf..39c2bb9b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png
index 5c534f314..f04a7d9fa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png
index a5eb89da6..ee114edc1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png
index f6296aec8..dc4bca834 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png
index cf3ccd82b..dd18e5ea8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png
index b70cb55ea..e04c3fe77 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png
index bfb94747e..6e98dd2c6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png
index c87188a29..4713948b5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png
index 09ee9457e..5c204d67c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png
index f7052c4de..9ce6c328b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png
index 9f0aba4bc..5d723674d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png
index 9b4d43e7c..7453e3acd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png
index 5261bcd13..7d058b2e7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png
index 303d4f718..966d93cab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png
index 09e7c6e28..0dd9ada78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png
index 1da1dc32a..91b25255a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png
index 4bdac5187..4a5d5301a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png
index e73ab6149..35f7ec522 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png
index b385a6ea5..87cf2ec04 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png
index f2e9c2688..299a1cf8a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png
index f71bd4d35..2a508736f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png
index 3be54ed51..dda48c3bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png
index d5ce37573..ccb4c6687 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png
index 24f87814a..1c33a8726 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png
index 68a897c26..0d73c6af9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png
index a6dcdbecd..7e389462a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png
index d6f42a969..ea873ed43 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png
index b65992abf..a501cf35e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png
index b3e391c32..5afcff867 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png
index d99b4f0f4..301ac5297 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png
index b2501b024..45016928c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-default-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png
index d89b973c9..9aac2b36c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png
index 6d44b81b1..07b553db9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png
index af4624148..46e0494e6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png
index b7c527088..21cdf8e7b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png
index cf1962689..b5837e78a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png
index d7259770c..a01e928d8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png
index 1fdcc9a20..dbacda6b4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png
index 763f712cb..f4fc1f681 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png
index c8265a1d6..104578b14 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png
index 63da2d786..006fa1f26 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png
index 97c7123ff..c13c4775e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png
index 8abd57c74..cd8ac367c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png
index 44f3eb79e..b229c2c5a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png
index 51295b490..73d83d729 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png
index 3b6e48a47..4bb323817 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png
index 1779dc6aa..5312b10b1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png
index c75ef33d9..b79643a88 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png
index 1cb2e389e..c4f0133b5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png
index 9abd1bafe..999ca1e40 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png
index 447a315a0..44f8e4616 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png
index 406946ab0..9f1cc48f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png
index beeaab9ec..7baaa79e7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png
index bedbac8e6..5e0be7a97 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png
index 4f528e72e..f4abfbed9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png
index 0a24000f4..dae967fca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png
index c64e658d5..ca5e16d4f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png
index 2f7d349a1..7da0cb461 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png
index b73ab3f20..b8b078884 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png
index 1ec931203..0785b0de4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png
index 94fc78a63..d52f87a9b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png
index 9e5d2e488..38b6956b1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png
index dd1599885..6597d22f2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png
index 1c6c4cb93..45a24add6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png
index e13c1f10b..012bf9e0b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png
index 064fbca72..ed11735c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png
index fdf50e24f..39f681a50 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png
index c16728934..ce785a03f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png
index a947c1034..9ae715086 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png
index f74574e3a..b95931937 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png
index caec1964f..7b1ebab59 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png
index 116310e5c..ccba926e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png
index b4d64b6ab..4bca12c8c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png
index 16f444171..45366f1ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png
index da052f8ab..1347c4b87 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png
index b0905033a..4f50e7ba6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png
index a401b97a7..863d97fb3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png
index d6fd440aa..2718fd977 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png
index db128e84b..70f8472e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png
index 109dd0f44..ddf59b59f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png
index f8e2dee12..ce2965930 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png
index 3f312d657..5ee2598d9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png
index a9d773a48..0e12bea08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png
index 2738e0f9d..ae7ecc83c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png
index bf7760fd1..0eba29f44 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png
index 4400475c7..25bb8cdb1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png
index 356e5ed00..f9b7dbf36 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png
index 8228b7064..458718342 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png
index 8ecb0d0ca..e3f72c72d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png
index 9086c7f1a..dc112345d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png
index 689fe1bd7..25dc32b32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png
index 2bb3f0cdc..d5dba8514 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png
index 6f628a511..2c4f9617f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png
index 1779b9930..d42801eef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png
index 87296527e..5a26ad3a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Dark.Layout-inverse-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png
index 841b28b98..04d249c08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png
index 1d23c3864..a1ef31f09 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png
index 737222890..0ac7bc2c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png
index fcfbaef80..9675fe3ee 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png
index bf0ea9e4c..d68495b6b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png
index c509969a5..bc02f9481 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png
index 8df19531b..99a98286a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png
index 5a3b8ef2b..5bc38b816 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png
index 62db34d5d..39f7ece05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png
index 8f200588b..cf3e68403 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png
index dddc3773a..497c625ff 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png
index 79e7c1d94..558961c2a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png
index a017b2553..a01a0a13c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png
index 5e2ac36d7..9dd1b6464 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png
index 763426f07..c155b7626 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png
index 925721767..fba26c67f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png
index 7fcf49035..5cf3b684a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png
index 933d79ace..c3de9b04d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png
index 99d458bcd..524557284 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png
index fc3fbe1ce..47b8e7ea1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png
index 577305514..745ba47d2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png
index f925165b0..4b3a3c9f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png
index a4c430d0c..389738505 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png
index ea11c6316..95d93c2f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png
index ecb595789..561f937a0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png
index 3439135f1..8b1dd3d90 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png
index f634acc6d..ab71ade84 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png
index d02591210..8dabf6513 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png
index ade90a77d..a577fae70 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png
index 1b091d1ee..d54c689e8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png
index fdffbf175..74c79f088 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png
index 80c6dedfb..5ddf3410b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png
index 578197cff..917a7f652 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png
index 66911beae..416eff594 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png
index 696badfe1..d465eb3c8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png
index 4b487d84e..ada541678 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png
index 03b4f9d42..3db6ee9cf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png
index 1a3a48e7d..22cc78d08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png
index 40f251167..b58a6a8da 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png
index 13fe0a168..2acca892a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png
index 91e741af3..dbef06560 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png
index 4f075d6d3..5527d0940 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png
index 323876ca0..ec6174c2e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png
index c525f576d..2e880c30f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png
index b41d3a206..ed7e4886a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png
index 26a179b3a..307a36ab6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png
index a9370b875..9000f0a4b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png
index 3793ca9f9..e905b3e86 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png
index cf5979639..d1e26d340 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png
index f56ffc1cb..ff83031fe 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png
index 288d7d376..e470ee9cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png
index 6cc6a9911..0d6967ebf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png
index c2969c8f9..0a343331e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png
index 30ef3dca4..6c545d463 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png
index 5ca3c1127..19ba66220 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png
index be4240eaf..ed3abf006 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png
index 6f2f6bc55..9ac3cf1c5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png
index b18e3a3cb..1ed3c679d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png
index 7cfcd41a5..6cfd7ccca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png
index ccca80df5..cfee8d5d4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png
index 499ca99ce..bc464b524 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png
index d9d0babf7..334c2d96b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png
index 4d948f3b0..07c989eaa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png
index 3e84e3687..86f3014af 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-default-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png
index 6aaec1a46..985a5b41b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png
index b509ee973..ddba5c0d3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png
index e7eb99c1c..346230cef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png
index 13211572a..b64541aed 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png
index c225babba..ff2ca424c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png
index 92166c103..f6163d51c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png
index 2f95867d1..c90253caf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png
index 17c6ff744..182837376 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png
index 86d1bf401..1868a602e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png
index 46db31e4d..aee41e022 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png
index ee0ae8cff..bdf3538cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png
index 1d618bc72..639bf7e7e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png
index 69fbc8d67..62d684b8b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png
index b47c1309b..3997640b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png
index c725f9ff8..7b60c2476 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png
index 7c46c12a5..c7b021742 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png
index 04a5737e3..f91e69ccf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png
index eeb06dc12..eaab21055 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png
index 98f4f14c1..a58cf5b11 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png
index 68d85194f..377c1564b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png
index 535ebfcba..258a5e1e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png
index 6ce7e5e0c..3a34a81f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png
index 17c97c1e5..0afa27677 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png
index a4c619b4c..8e9e171c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png
index 4e90c8dfb..381108167 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png
index ed3b27581..4eb6345ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png
index fb980bc27..b0b222a81 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png
index 506dcd227..1172ff0c9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png
index 793edbda5..c18e499c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png
index e8d64dc53..496510aa5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png
index b41908ccf..919660a84 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png
index 7ef7a9eee..6ef1ebbbf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png
index 3c7dbf2e9..d3d094de0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png
index ad286a816..aa9065b31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png
index 0724573ea..384bf26f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png
index d68b7ff1a..9cf7cfdd2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png
index a4c292962..11f56317e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png
index bf1a5712b..02ee3f2fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png
index 3a3f9d824..001efa769 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png
index 6f9131d85..70a6c6044 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png
index 3667de0fc..433276d7c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png
index 011657564..e9dbc7216 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png
index 869ba574c..f85ccd035 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png
index 8d2a6747e..43583bd71 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png
index 823b3cf39..ba284b89e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png
index bee0eb451..a2560ec51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png
index b3482badb..51afab0a5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png
index 217cbe600..46a8a22e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withHelper-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png
index 154d7d880..21f094264 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png
index e6abea1aa..25e2d7d18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png
index 8aad14219..30e5f0d45 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png
index 0a1ab9fb6..1117c0ae2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png
index c56f6ee72..d00e7c55c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png
index 426a62e5f..c14ee0680 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_off__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png
index 3a8449fc2..66e167590 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png
index f006ee22d..3ea51c512 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-divider_on__Disabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png
index 2801cba5f..e2f14d87c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png
index cc9935042..36db97c19 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png
index e7423f491..cb1fca83c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png
index 53d88590c..a3bb34dba 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-error-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png
index 0e9fa3d02..fe31befb4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png
index 4e46f3086..4a41e9191 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png
index b53794159..c3a78b822 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_off_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png
index 8daf0831f..be1cee1c2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Components/__Snapshots__/OUDSSwitchUITests/test_OrangeTheme_Light.Layout-inverse-label-withIcon-readOnly-divider_on_.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusDefault.png
index 892b32719..624e79536 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusMedium.png
index 6142b968a..004ebfbc8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusNone.png
index c7affdba0..131fab5ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusPill.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusPill.png
index 9cf8256df..5b32ad4db 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusPill.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusPill.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusShort.png
index 3c4c3d8e1..af6d325f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusTall.png
index 39975719c..55c5ac944 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderRadiusTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDefault.png
index 94c8f20b3..128b4e1cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDrag.png
index 4aba817f7..23dcc15ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderStyleDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthDefault.png
index ac645cc6a..b273d986b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocus.png
index b53b28dc3..1f5ce7701 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocusInset.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocusInset.png
index a23452fb3..08fa19d3b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocusInset.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthFocusInset.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthMedium.png
index 4d695597d..1424d6f5c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthNone.png
index ec74ea590..2f9b1d23a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThick.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThick.png
index 6056b14d9..16d76c014 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThick.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThick.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThicker.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThicker.png
index ee0cdabde..bd583a985 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThicker.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThicker.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThin.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThin.png
index 099923500..353a3fa86 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThin.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Dark.borderWidthThin.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusDefault.png
index 84409ec74..e30323bc1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusMedium.png
index e8d010dd4..347e4ddc1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusNone.png
index 1c800f283..f08d7955d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusPill.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusPill.png
index 00e1f841f..18780ecf7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusPill.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusPill.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusShort.png
index 425b125c6..79c091c58 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusTall.png
index 6094a9eec..19f367508 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderRadiusTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDefault.png
index 018877c86..8fc7b60d5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDrag.png
index c70c12cb4..de1f331db 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderStyleDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthDefault.png
index de8fcb6b3..13b4044c3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocus.png
index 1bef16f4c..c018f3b06 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocusInset.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocusInset.png
index e4128822f..8619f640e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocusInset.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthFocusInset.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthMedium.png
index 6c124b63c..d6063d267 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthNone.png
index f96154fec..e0e6a71fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThick.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThick.png
index 4a24da737..375012825 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThick.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThick.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThicker.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThicker.png
index fa59941ae..ebd5ed59e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThicker.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThicker.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThin.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThin.png
index e6cace0d8..cfd1185f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThin.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensBorderUITests/test_OrangeTheme_Light.borderWidthThin.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionDisabled.png
index 31dff4123..d49d39f8b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionEnabled.png
index fcb83c02e..5f39c3456 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionFocus.png
index 3669a771e..a903aa1a8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHighlighted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHighlighted.png
index 6802ca70c..1ae6b5a8f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHighlighted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHighlighted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHover.png
index ed523b980..c4b4f356e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionLoading.png
index 4e3144d8f..1afff19eb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeEnabled.png
index 58fe5af95..2aa020c60 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeFocus.png
index aa23aa72e..14c11c54f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeHover.png
index ef7d5d81f..729908f41 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeLoading.png
index 6fc2e78f5..f41b41ab5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativeLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativePressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativePressed.png
index 674672002..882d32af5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativePressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionNegativePressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionPressed.png
index e208e5ace..daf21f26c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSelected.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSelected.png
index 149b2400b..24b9401a8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSelected.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSelected.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportEnabled.png
index 1cab720c5..fe5eed915 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportFocus.png
index 9e645cce2..ab6c6c399 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportHover.png
index 50967c166..18c1ff3ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportLoading.png
index 07977db7d..e5911301d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportPressed.png
index 32756ed2f..7e6ca02cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionSupportPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionVisited.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionVisited.png
index 2f6537a10..0f875ec7b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionVisited.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorActionVisited.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysBlack.png
index 066c7d499..1703e310e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnBlack.png
index ab6119269..17ba98a57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnWhite.png
index 85cb4dd7a..3c745e1cd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysOnWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysWhite.png
index 09ce2c883..c7264d948 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorAlwaysWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgEmphasized.png
index a5cddbf37..9c094b9d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgPrimary.png
index a46bf1878..6b8f1b23f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgSecondary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgSecondary.png
index de77deec4..b5cc652bb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgSecondary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgSecondary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgTertiary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgTertiary.png
index 731f051a5..59eb53c22 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgTertiary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBgTertiary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderBrandPrimary.png
index d782eebe7..2c26d44bf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderDefault.png
index 7b20018fc..7303dd52b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderEmphasized.png
index 0f96e8f39..9f675aed2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocus.png
index eb08e9815..102b27293 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocusInset.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocusInset.png
index 1e06f2642..ad7c23a64 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocusInset.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderFocusInset.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderMuted.png
index dd3bc104a..8fa2c4a5d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderOnBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderOnBrandPrimary.png
index 6fb378b75..08ef9ae2a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderOnBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorBorderOnBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorder.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorder.png
index b8c6c2afa..a1c898de1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorder.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorder.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorderContrast.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorderContrast.png
index 74028ed38..9b52cd257 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorderContrast.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartBorderContrast.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier1.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier1.png
index 2d8e54a48..3169775aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier1.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier1.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier10.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier10.png
index c13a0c428..f49f2baf0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier10.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier10.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier2.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier2.png
index 0b9c3d66a..af745d019 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier2.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier2.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier3.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier3.png
index bc2cd97a2..95bd18b61 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier3.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier3.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier4.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier4.png
index ed0a4d7c8..0021ed6ed 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier4.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier4.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier5.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier5.png
index e750c56eb..3bf5d3e65 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier5.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier5.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier6.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier6.png
index dc96c2530..3faeecbe7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier6.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier6.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier7.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier7.png
index 0cd67c97c..0b5f0c25c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier7.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier7.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier8.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier8.png
index c1b5c731d..95604a9eb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier8.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier8.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier9.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier9.png
index a7e2afbcd..d71d257fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier9.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartCategoricalTier9.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalInfo.png
index 89a1f52a6..2f7ccf2b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalNegative.png
index 13951fad0..3769b1ad6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalPositive.png
index 39573e343..179c6329f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalWarning.png
index f2186112e..512defefb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartFunctionalWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartGridlines.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartGridlines.png
index 3a389074e..b995c4ad1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartGridlines.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartGridlines.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartHighlight.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartHighlight.png
index a0419c57c..d93e180d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartHighlight.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartHighlight.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartNeutral.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartNeutral.png
index a8a9fe1e9..3c74c6b70 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartNeutral.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorChartNeutral.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentBrandPrimary.png
index 5628d8038..3ee666c9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDefault.png
index 2579b2724..27f985447 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDisabled.png
index 4fcca4980..cfa1e2b96 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentMuted.png
index 602073e95..9915bedb6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionDisabled.png
index 15c2b6277..16b671b01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionEnabled.png
index 7904dce76..f4be29736 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionFocus.png
index 1898badac..4fd22cbcc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHighlighted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHighlighted.png
index fa9a12440..e25ee74d8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHighlighted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHighlighted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHover.png
index 234292551..6bb859126 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionLoading.png
index b2669cbaf..accc3857d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionPressed.png
index 54531e32b..fa996ac8c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnActionPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnBrandPrimary.png
index 7eb094d84..df38612f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnOverlayEmphasized.png
index c0e477d38..eb2930fc0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasized.png
index 18e551b41..7416f232a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasizedAlt.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasizedAlt.png
index 69bef04b2..5a563cfa8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasizedAlt.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusEmphasizedAlt.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusMuted.png
index 6da5f7eaa..002c7efd6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentOnStatusMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusInfo.png
index fe3088229..96b052ed5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusNegative.png
index 3b8be931f..a9273ac2e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusPositive.png
index a27e02a7f..d78cb93e0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusWarning.png
index 0b88bd594..d53cf9268 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorContentStatusWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Default.png
index 46c52ceb9..e7547c7f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Emphasized.png
index 17eb2912f..84b60dee8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Muted.png
index d0ac51d22..455edf321 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent1Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Default.png
index 6ef52491e..6d0644611 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Emphasized.png
index 2411a8723..b5f8340f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Muted.png
index 71e7e482a..7d3fc40a6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent2Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Default.png
index 1943c1d13..6b30cc253 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Emphasized.png
index 9353b767e..bb610513c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Muted.png
index 858566780..2f623fc8c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent3Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Default.png
index f38b9efe0..e20bade3f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Emphasized.png
index 62dc7b975..5d17abf47 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Muted.png
index e91e1a0d7..f33027c85 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent4Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Default.png
index f8c00b173..d29dca2ca 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Emphasized.png
index c9af7c855..861e23534 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Muted.png
index 3003148e5..8c1ad17b3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeAccent5Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandPrimary.png
index 4992641e4..ec4d43507 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandSecondary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandSecondary.png
index e7f919da1..460e08f08 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandSecondary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandSecondary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandTertiary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandTertiary.png
index d20a97673..e5c29e5e6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandTertiary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeBrandTertiary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedHigher.png
index 5e96ab9a4..d20f39b10 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLow.png
index c8507d411..cd5a6159d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLower.png
index 08d85ef7f..99dcaa56e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLowest.png
index 077a538ac..9cfec25e2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralEmphasizedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigh.png
index 67ac39b07..9c3e3a579 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigher.png
index 13e166c0b..1b20f1490 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHighest.png
index b72efb543..5dc460b89 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLow.png
index b9da7ca74..bb9074a19 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLower.png
index fb2327322..3f998f9ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLowest.png
index 6e93e7d48..7f4f1e0e0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedMedium.png
index ebe7f1204..d026e58bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeNeutralMutedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint100.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint100.png
index 4a0934b7b..7a0f238a2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint100.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint100.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint200.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint200.png
index 3986e68ab..cfdaecf4b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint200.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint200.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint300.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint300.png
index a38020fcf..5ebd1a31e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint300.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint300.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint400.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint400.png
index 38cf22559..daa36e137 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint400.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint400.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint500.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint500.png
index 0f6d4b45b..ec22282f0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint500.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint500.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint600.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint600.png
index 6834ce424..3f199d8b4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint600.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint600.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint700.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint700.png
index d3fa74beb..2734640e8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint700.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint700.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint800.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint800.png
index 857a6b8d4..48b395187 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint800.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint800.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint900.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint900.png
index 0bdce267e..300d76f19 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint900.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorDecorativeSkinTint900.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLower.png
index 133c7409c..7189584e9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLowest.png
index 931e6c545..84d974b0b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityTransparent.png
index 68cc00358..19e79f992 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOpacityTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDefault.png
index 356267c1b..92952887c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDrag.png
index 93c29a5c4..fdaa602e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayEmphasized.png
index b95a54e9c..5d0cc5805 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayModal.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayModal.png
index 45a2e0188..d4ca68e82 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayModal.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorOverlayModal.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentDefault.png
index 29cc0b7f7..f62eb7639 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentHighest.png
index ec05e194c..bcd243e99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLow.png
index d48443757..41fc1ac7b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLowest.png
index 4d715e728..6d5861e85 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryAccentLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoDefault.png
index 865ea49be..e1fe71a82 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoHighest.png
index 96b6953e0..4ff3d278d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLow.png
index 359185f63..6783fc4be 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLowest.png
index 9bc2876e9..8899ad664 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryInfoLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeDefault.png
index 79a10d52a..d1c8edb42 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigh.png
index 71bab845b..18d44f3a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigher.png
index c9a69747f..67c8a3352 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHighest.png
index 63736764a..2a91b19d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLow.png
index a7a1bf70b..4407c87f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLower.png
index 151079b28..c9adcb230 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLowest.png
index 6234fa966..8ac08472a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNegativeLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedBlack.png
index 811732178..20179648d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigh.png
index 902aa7c41..80cb0a10c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigher.png
index 1a9a89d44..74504798e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHighest.png
index 0e57b8b57..1cac9d0bf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedMedium.png
index 9b0fc8588..45bb3cf10 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralEmphasizedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLower.png
index 38320cf2d..df016867e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLowest.png
index 015550aa3..c40cc1c01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedWhite.png
index edf5ce7c2..4a4fd0ca9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryNeutralMutedWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigh.png
index 7d42284df..00599ca1e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigher.png
index beb9b9860..0a20514fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHighest.png
index 9605d5e58..22a061a42 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLow.png
index 6acfecc68..8b0f14fbf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLower.png
index bb0266dc8..c2aab870b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLowest.png
index 328562b3b..0843fab4d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMedium.png
index 29fc5d37d..f429ab0f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumHigh.png
index 4989c93c7..04b0a73d3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumLow.png
index 6b14e5085..edb687598 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackMediumLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackTransparent.png
index 282c13c46..19577f63a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityBlackTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityInfo.png
index 6e3071ffb..59e00d8e1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityNegative.png
index b1b6f6c01..e824c45a8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityPositive.png
index 2464cbeed..5ef5644f8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWarning.png
index 9254d86f2..8f6ce3e99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigh.png
index 578292981..30d38efcc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigher.png
index 26e5de1f9..ef9f5b5ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHighest.png
index d864cb1c6..6ea707fe4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLow.png
index 08c1a385a..8573819a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLower.png
index b1293eb8c..5c0788598 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLowest.png
index a7c721173..abb969b9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMedium.png
index 30c1ec978..359339ef2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMediumLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMediumLow.png
index a0ca0b75e..597fe17d1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMediumLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteMediumLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteTransparent.png
index 3a3a752ea..a4b56b047 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryOpacityWhiteTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveDefault.png
index a03f7d4be..5f1a3b524 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHigh.png
index 186a89c93..7e18d7160 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHighest.png
index 9a5cf9fa3..b7b5aa4fb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLow.png
index ec19ccb69..63f6a9ad4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLowest.png
index 25f3c6168..1a09cbc18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPositiveLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryDefault.png
index 6491edcf7..ea305c51c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryLow.png
index a7429f976..62858a4f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryPrimaryLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningDefault.png
index f1dba5f23..bf890bb8d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningHighest.png
index 368fe021f..b09b163ad 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLow.png
index 6ffba27a9..a25115ed1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLowest.png
index 157d0bab8..22917def6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorRepositoryWarningLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceBrandPrimary.png
index f180537c8..c71714bbc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentEmphasized.png
index c26e9ef1d..5e5616c06 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentMuted.png
index a56b80f2c..9f5d18f62 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusAccentMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoEmphasized.png
index 16a7df503..ef9d85221 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoMuted.png
index 9c318553e..400a54fe9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusInfoMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeEmphasized.png
index 1f9bfa7e8..339b59448 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeMuted.png
index 48cbf7cf7..4f74dc30f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNegativeMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralEmphasized.png
index 3fea5e513..a187a548b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralMuted.png
index f87b37f75..5498d559a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusNeutralMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveEmphasized.png
index 8786cc141..919338682 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveMuted.png
index 271d679df..68aa3ed40 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusPositiveMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningEmphasized.png
index 8d07556f4..e1ed480f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningMuted.png
index 1f8bd4f3c..7df05b410 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Dark.colorSurfaceStatusWarningMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionDisabled.png
index 24750e9aa..7cfbc6b77 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionEnabled.png
index 22fbef87e..b6fe93508 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionFocus.png
index 64a790252..872d17e1d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHighlighted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHighlighted.png
index bbe7701be..0b23ede0c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHighlighted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHighlighted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHover.png
index f42d9d4eb..8467d8d8c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionLoading.png
index 305782ea2..e2d52c342 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeEnabled.png
index 1135adabe..796db98d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeFocus.png
index f63ac1e1b..a80c4e47d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeHover.png
index 11a9b589b..5662046c8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeLoading.png
index c03828949..841cfa745 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativeLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativePressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativePressed.png
index 562323da5..1c8f4b077 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativePressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionNegativePressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionPressed.png
index 9771317b7..872305faf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSelected.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSelected.png
index 515d3d0a5..47103375e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSelected.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSelected.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportEnabled.png
index 0f2fee146..f384bd459 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportFocus.png
index b77e2706f..c84ef58d4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportHover.png
index 4ad6cf61a..56c608186 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportLoading.png
index 83e686c9e..b6d1e35df 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportPressed.png
index fc31d1fb9..ed8a01d5c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionSupportPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionVisited.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionVisited.png
index 51de6fba7..c14ac7556 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionVisited.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorActionVisited.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysBlack.png
index ed3d7b88d..7acbb331f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnBlack.png
index 228253459..7c671f109 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnWhite.png
index aa74a6d66..2d4cb055d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysOnWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysWhite.png
index 1b4bd515c..138414891 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorAlwaysWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgEmphasized.png
index 418cd7b12..2a4f233ae 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgPrimary.png
index 177b84610..437593bcf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgSecondary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgSecondary.png
index be5f2561d..2b64298c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgSecondary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgSecondary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgTertiary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgTertiary.png
index 04e8a9522..c55374cc6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgTertiary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBgTertiary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderBrandPrimary.png
index 8f30b6dea..aed85ea2b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderDefault.png
index 3e9e3b8dd..2a28bf10e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderEmphasized.png
index fc6095005..86b08317f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocus.png
index df672c4b8..047735ad5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocusInset.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocusInset.png
index fe8fe7609..17833a54b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocusInset.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderFocusInset.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderMuted.png
index 0b47b2907..cc0918d39 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderOnBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderOnBrandPrimary.png
index c49336cdd..197c58fc2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderOnBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorBorderOnBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorder.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorder.png
index 06ee2a16f..6db8ed307 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorder.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorder.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorderContrast.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorderContrast.png
index 616ebf994..58dd2804c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorderContrast.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartBorderContrast.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier1.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier1.png
index 11f51d886..ec02077de 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier1.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier1.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier10.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier10.png
index 5a81f275b..8c6ec4ca8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier10.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier10.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier2.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier2.png
index 166a5ca77..943ddd244 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier2.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier2.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier3.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier3.png
index ab954117d..944e393bb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier3.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier3.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier4.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier4.png
index 3ff528caa..2f3118d92 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier4.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier4.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier5.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier5.png
index 38d4db4ea..5ffc1b0a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier5.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier5.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier6.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier6.png
index eefbdd3b7..5aee67571 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier6.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier6.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier7.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier7.png
index 1a6558536..4545bdae8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier7.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier7.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier8.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier8.png
index 8a31e1add..c9f8825f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier8.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier8.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier9.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier9.png
index 4d9e13cf6..233826912 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier9.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartCategoricalTier9.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalInfo.png
index 4758c93bc..7cd7ca389 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalNegative.png
index 37ea8fc69..91bfb299b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalPositive.png
index 04858c0df..ce451038f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalWarning.png
index fa346486c..bd7e9f929 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartFunctionalWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartGridlines.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartGridlines.png
index 09844914a..6aa87f06c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartGridlines.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartGridlines.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartHighlight.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartHighlight.png
index 9449c059b..d50684619 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartHighlight.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartHighlight.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartNeutral.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartNeutral.png
index 542c09ca6..557d47846 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartNeutral.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorChartNeutral.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentBrandPrimary.png
index a9764f5f8..4f58abbff 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDefault.png
index f4fb4ac88..0f8d185fe 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDisabled.png
index e0b79875d..8c81e1419 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentMuted.png
index a26044031..a7c78a00a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionDisabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionDisabled.png
index b0b014d46..5aa940f99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionDisabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionDisabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionEnabled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionEnabled.png
index a9e95ceb3..c415cc02f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionEnabled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionEnabled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionFocus.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionFocus.png
index e3a60bead..a6172c305 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionFocus.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionFocus.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHighlighted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHighlighted.png
index 3aff4ffd9..89d43d0c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHighlighted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHighlighted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHover.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHover.png
index 43fdc0343..61dca90f8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHover.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionHover.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionLoading.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionLoading.png
index dcbe6db60..33e4f2512 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionLoading.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionLoading.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionPressed.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionPressed.png
index ce334febe..4aab32dc9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionPressed.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnActionPressed.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnBrandPrimary.png
index a581568c4..7b60f289d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnOverlayEmphasized.png
index 502ef7694..c78d19fc8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasized.png
index 71e3eb546..06baa6bc0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasizedAlt.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasizedAlt.png
index cd8b4eec3..d30f8e92e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasizedAlt.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusEmphasizedAlt.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusMuted.png
index 599c29986..4b5be5d0c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentOnStatusMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusInfo.png
index 83500897b..ef2126322 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusNegative.png
index a3d4cec89..555cb56c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusPositive.png
index 61fc8260f..f9c9273b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusWarning.png
index bb007c6a1..779999c1c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorContentStatusWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Default.png
index ffd600879..76639f7fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Emphasized.png
index fd631211e..a0d8315f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Muted.png
index c010f560b..1588de4d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent1Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Default.png
index 1a08255f2..d989a1206 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Emphasized.png
index f9b2431b9..1564d9093 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Muted.png
index 0de6f2bff..e63c5902b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent2Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Default.png
index 97e2525e5..bf9e3cf88 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Emphasized.png
index be62e74c7..7a31a379d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Muted.png
index 24d69c548..4f36d4e07 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent3Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Default.png
index 75e391f01..9de1943c6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Emphasized.png
index c0c5303ae..18c04f1b1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Muted.png
index b63e362b2..8e48c58d4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent4Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Default.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Default.png
index 104a77f86..860c57fe8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Default.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Default.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Emphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Emphasized.png
index 7354dcf10..617a43a5d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Emphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Emphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Muted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Muted.png
index 2369ea005..92f282f78 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Muted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeAccent5Muted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandPrimary.png
index 323bb8330..35566a3a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandSecondary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandSecondary.png
index d70e01756..62eeaf4aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandSecondary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandSecondary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandTertiary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandTertiary.png
index 71873e596..4f859a506 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandTertiary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeBrandTertiary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedHigher.png
index e6d76ba3f..672ff951f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLow.png
index 2723984c4..8ad7a2456 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLower.png
index 4081977cd..95c8c6f5b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLowest.png
index 33c3cb9f6..81dd6e021 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralEmphasizedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigh.png
index fe7fd9a15..f7981e5c8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigher.png
index 78a2dc6ff..8c3175d3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHighest.png
index 8e5873803..d5aad358a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLow.png
index 9d4ecf9c9..3a19550d7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLower.png
index 1959a47c8..9abe469a5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLowest.png
index 85110189b..e0627c1ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedMedium.png
index 342ef7e83..d879ca734 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeNeutralMutedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint100.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint100.png
index 14646d962..22cc6eb94 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint100.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint100.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint200.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint200.png
index be5dcdc07..b84e077f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint200.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint200.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint300.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint300.png
index b12c3d58f..bce6d3504 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint300.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint300.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint400.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint400.png
index 328712d5a..1ecd415a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint400.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint400.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint500.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint500.png
index 29c968c72..5214be00c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint500.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint500.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint600.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint600.png
index cbd3b20d9..a48fbb36f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint600.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint600.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint700.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint700.png
index 29f79a676..1694785a3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint700.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint700.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint800.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint800.png
index a1f006f14..c1d33087f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint800.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint800.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint900.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint900.png
index f8dd18ac7..926ea63fd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint900.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorDecorativeSkinTint900.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLower.png
index 098821e04..29623b971 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLowest.png
index fb7f093ba..c2e2dda7f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityTransparent.png
index 1834bbd1e..271d89926 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOpacityTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDefault.png
index d9925e339..0a1efbdd3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDrag.png
index 42c03492d..bdc7283cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayEmphasized.png
index f4fbd8229..65cc8813b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayModal.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayModal.png
index 7d057d4d3..2c7ba7d4a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayModal.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorOverlayModal.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentDefault.png
index ac2f5f2a0..3d89d0c6f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentHighest.png
index 0a381decc..242c26186 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLow.png
index 36eec0c50..9ff47797f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLowest.png
index 5096540e1..b4a8ba668 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryAccentLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoDefault.png
index 8014e40d4..ca7df253a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoHighest.png
index 2a4bd2b2b..256578312 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLow.png
index f0294d320..49d5420b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLowest.png
index 93163f8f9..310c8f644 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryInfoLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeDefault.png
index ce52317a7..4604ffb0b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigh.png
index e9a4e7939..f53139c77 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigher.png
index b90b92322..ec2d17f85 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHighest.png
index a1a2533bc..4ee47229d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLow.png
index afcbce7f2..59b35f3a4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLower.png
index ee98e1a0e..2fcdead36 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLowest.png
index 61c73fd55..8b5a4d84b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNegativeLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedBlack.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedBlack.png
index 9943a413f..0a495c1ea 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedBlack.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedBlack.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigh.png
index f2d96b5dc..4be54a348 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigher.png
index 425c9dc95..f8c4e80ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHighest.png
index 87e3963d8..fbd72e9b2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedMedium.png
index e80bdb713..43ce98319 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralEmphasizedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLower.png
index 9ee166634..dbc964012 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLowest.png
index 5b4d68c83..ff176ef05 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedWhite.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedWhite.png
index 83f6df740..502a1c8d3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedWhite.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryNeutralMutedWhite.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigh.png
index 27ea3500e..6b7962bc4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigher.png
index e39be05b2..0038216f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHighest.png
index 561a6517f..ff12d5a18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLow.png
index e12bf2c32..ea7d5d2e3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLower.png
index a6764a450..5cf50a3a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLowest.png
index 60a54cc8f..886cd19ef 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMedium.png
index 9b1b58b95..b9e1099f2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumHigh.png
index 19d0b5e70..ca50ba495 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumLow.png
index b76d9f050..e39607408 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackMediumLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackTransparent.png
index 789b5a601..a2bfab2ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityBlackTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityInfo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityInfo.png
index 7e0926b8d..dbd87a2ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityInfo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityInfo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityNegative.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityNegative.png
index b9eb899e4..cd8800b57 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityNegative.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityNegative.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityPositive.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityPositive.png
index b97120658..a464ee01a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityPositive.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityPositive.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWarning.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWarning.png
index d947763b5..386ad7628 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWarning.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWarning.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigh.png
index b06435934..debd5618a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigher.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigher.png
index 916beb6aa..5347e73c4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigher.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHigher.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHighest.png
index 156ec2f1c..0c4875095 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLow.png
index 9ebd89917..2f0c46e3e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLower.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLower.png
index e0f9ed0ba..2b31807c1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLower.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLower.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLowest.png
index a05691a00..be7479cf3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMedium.png
index 78cb5b958..57efda716 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMediumLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMediumLow.png
index da9658d67..d0442dbc1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMediumLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteMediumLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteTransparent.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteTransparent.png
index 25834f1c8..daa7ad3f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteTransparent.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryOpacityWhiteTransparent.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveDefault.png
index 45a15e9b1..ea17d6e91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHigh.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHigh.png
index 1e74e3292..b2b8521be 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHigh.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHigh.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHighest.png
index 529c31766..6a7540f8a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLow.png
index 5543f76cc..60b0d7b55 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLowest.png
index b704681dd..090da3f12 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPositiveLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryDefault.png
index 65dacb4d7..0245f250c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryLow.png
index 154dcf45e..ec344ce6b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryPrimaryLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningDefault.png
index 878b574cc..20547b418 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningHighest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningHighest.png
index 8b55801c8..cbb5b1292 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningHighest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningHighest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLow.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLow.png
index c8fabafc7..bda597779 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLow.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLow.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLowest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLowest.png
index 849641546..d61694d3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLowest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorRepositoryWarningLowest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceBrandPrimary.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceBrandPrimary.png
index 7bd9d1080..c54e23d59 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceBrandPrimary.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceBrandPrimary.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentEmphasized.png
index f443d8830..4f8a42d91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentMuted.png
index 3ddd98358..30f97c6a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusAccentMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoEmphasized.png
index ad5ac043e..981eec23c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoMuted.png
index af63d60ce..5aaae3111 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusInfoMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeEmphasized.png
index 12c05bd80..80706895a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeMuted.png
index 9350c9f1b..ee3df84b5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNegativeMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralEmphasized.png
index eba59fe67..36225872e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralMuted.png
index aab7dd873..bc24a151f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusNeutralMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveEmphasized.png
index 7a40e50c3..c071b00b4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveMuted.png
index bd6a24e94..6c8decd03 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusPositiveMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningEmphasized.png
index 52216037e..e85f66911 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningMuted.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningMuted.png
index 52c2f9c15..5ca7e819f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningMuted.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensColorUITests/test_OrangeTheme_Light.colorSurfaceStatusWarningMuted.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationDrag.png
index 41c164dbc..df9a6dd81 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationNone.png
index ad5147c13..b659b1a87 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayDefault.png
index 04c30420a..30b225952 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayEmphasized.png
index 83801aebb..d61ecd462 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationRaised.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationRaised.png
index 0582d24f9..a5118b66b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationRaised.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationRaised.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyDefault.png
index a81724b79..d1723f28f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyEmphasized.png
index 7aafddbdd..c7af2270b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyNavigationScrolled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyNavigationScrolled.png
index 9c5122bbf..3a171bb46 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyNavigationScrolled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Dark.elevationStickyNavigationScrolled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationDrag.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationDrag.png
index 4791640a5..8e7ea45d9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationDrag.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationDrag.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationNone.png
index ff48efcd3..a816d44b4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayDefault.png
index 33c165971..48f8c032d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayEmphasized.png
index 2d6938a85..3ad5a7889 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationOverlayEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationRaised.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationRaised.png
index c269a463a..94e09db65 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationRaised.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationRaised.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyDefault.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyDefault.png
index 99b7cf0bf..bae97838d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyDefault.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyDefault.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyEmphasized.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyEmphasized.png
index efd9536e1..9e8629e71 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyEmphasized.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyEmphasized.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyNavigationScrolled.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyNavigationScrolled.png
index ea9b784bc..9250d018b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyNavigationScrolled.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensElevationUITests/test_OrangeTheme_Light.elevationStickyNavigationScrolled.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultLarge.png
index 397b6d443..a9e9b8e9a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultMedium.png
index 32add5a04..c04205f7d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultSmall.png
index b4ff1eb54..f19f529f4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyDefaultSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongLarge.png
index a1d4f450c..142578ddd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongMedium.png
index 936e8f056..cbdad017f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongSmall.png
index 45051e76f..284977334 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.bodyStrongSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeMedium.png
index 2e4831d22..ddc88d469 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeSmall.png
index fe608faab..90c068f13 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.codeSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayLarge.png
index 2ad67114a..3014f7a01 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayMedium.png
index e619eeef4..8c6820b31 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displayMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displaySmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displaySmall.png
index 9291ac3d5..a081cf69e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displaySmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.displaySmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingLarge.png
index 6683f46a4..287a5e754 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingMedium.png
index 739d3d970..ae7b0e287 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingSmall.png
index 444c36003..68f1b6365 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingXLarge.png
index fac5d256a..d120f6dae 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.headingXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultLarge.png
index 4b13fd20d..7e7f1e7bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultMedium.png
index 9d63d880d..739978909 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultSmall.png
index d0c7fa735..c38c92866 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultXLarge.png
index 2e1a6b9fc..68d236695 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelDefaultXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongLarge.png
index 0475e518b..048dd1985 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongMedium.png
index 32de379a3..21dc40a74 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongSmall.png
index b4563fd50..ee0a35612 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongXLarge.png
index 3a3ebdec5..8fe84df38 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Dark.labelStrongXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultLarge.png
index bb8c72c85..e8203bbab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultMedium.png
index f2f848ac0..614e3851d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultSmall.png
index 56e8401cc..9a4cbe498 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyDefaultSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongLarge.png
index 5dccc594b..47ad70662 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongMedium.png
index 359c6109a..449fffe23 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongSmall.png
index 8d38d3868..7fcec3759 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.bodyStrongSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeMedium.png
index 79248ef88..5baca4558 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeSmall.png
index 735aadb1e..af461f423 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.codeSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayLarge.png
index ec508e557..6a4d237d1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayMedium.png
index aee0460bc..1131ca25c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displayMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displaySmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displaySmall.png
index d69ace269..6b3c56ab0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displaySmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.displaySmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingLarge.png
index bca69e8ca..dfd5b025f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingMedium.png
index 479c80a86..f3f9eef6e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingSmall.png
index 02da195de..7b6e977fd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingXLarge.png
index 1a07c62a3..7417f5402 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.headingXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultLarge.png
index 01a9833b3..f98da9f40 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultMedium.png
index 34ed2356c..eb360d4f9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultSmall.png
index bea8e8502..769d60350 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultXLarge.png
index a8b32bea4..678eb0e18 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelDefaultXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongLarge.png
index 62bd8617a..ba78ba4dd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongMedium.png
index d7ba47d53..b1eb2e3eb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongSmall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongSmall.png
index 2cd4dfa70..91d6f7a89 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongSmall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongSmall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongXLarge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongXLarge.png
index 126723ef7..f47c3acf9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongXLarge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_OrangeTheme_Light.labelStrongXLarge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityInvisible.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityInvisible.png
index d867ecc2a..a7560331b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityInvisible.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityInvisible.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityMedium.png
index f7d81e00c..8d81ab2cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityOpaque.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityOpaque.png
index 286d9a3d4..986b1a4f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityOpaque.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityOpaque.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityStrong.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityStrong.png
index 35539178b..870a62586 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityStrong.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityStrong.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeak.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeak.png
index b51c08ace..ee65406e5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeak.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeak.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeaker.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeaker.png
index 6700964c8..2f63f234a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeaker.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Dark.opacityWeaker.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityInvisible.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityInvisible.png
index eb0df0145..b40c532ce 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityInvisible.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityInvisible.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityMedium.png
index 42d304285..9f23a7b9a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityOpaque.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityOpaque.png
index da1768ac8..9435540d8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityOpaque.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityOpaque.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityStrong.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityStrong.png
index ab9c15b9f..2fa2ea947 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityStrong.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityStrong.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeak.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeak.png
index 219da939f..1113e1202 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeak.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeak.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeaker.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeaker.png
index ddb385f4f..034030ad2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeaker.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensOpacityUITests/test_OrangeTheme_Light.opacityWeaker.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xl.png
index 6cbea2b34..19078dccc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xs.png
index 8110f91da..fe3bfffd8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorative2xs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeLg.png
index b4eadb621..03650d818 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeMd.png
index 921268e14..75eb48338 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeSm.png
index 3adfa6b7b..0f7dd1574 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXl.png
index b7e26a404..778facb1d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXs.png
index fbe6c5159..08fc6f94f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconDecorativeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeLg.png
index 8fbd9b2e7..7a70c0853 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeMd.png
index a141f5040..85c5a6dbe 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeSm.png
index ec94ebcdf..ced1d8b5a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeLg.png
index 0bed1d2b0..8141addac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeMd.png
index 491c0e6b7..cf02c1909 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeSm.png
index 4f545c86f..dd5554e73 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodyMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeLg.png
index 1007993ea..5baabba30 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeMd.png
index 34b29403b..7366ea542 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeSm.png
index 0ed89cc3a..3ac126d41 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithBodySmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeLg.png
index 43695cf40..fdcbf7f83 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeMd.png
index b6ef5d11a..6843d0833 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeSm.png
index eb0bef244..5f97cfc51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeLg.png
index 169c12541..710c1ec91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeMd.png
index 961041d9f..4679e1e60 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeSm.png
index 3bf4190c6..bdae50dd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeLg.png
index 169c12541..710c1ec91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeMd.png
index 961041d9f..4679e1e60 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeSm.png
index 3bf4190c6..bdae50dd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingSmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeLg.png
index 1c554e89a..7d8b77e0e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeMd.png
index 376675e56..bf165517d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeSm.png
index 27f11b50b..2f303fe26 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithHeadingXlargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeLg.png
index 169c12541..710c1ec91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeMd.png
index 961041d9f..4679e1e60 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeSm.png
index 3bf4190c6..bdae50dd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXl.png
index 72bd0f945..3be9bfe7e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXs.png
index 9b18d041e..2fec613bf 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelLargeSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeLg.png
index 0bed1d2b0..8141addac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeMd.png
index 491c0e6b7..cf02c1909 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeSm.png
index 4f545c86f..dd5554e73 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeXs.png
index 63e970337..41618caa1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelMediumSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeLg.png
index 1007993ea..5baabba30 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeMd.png
index 34b29403b..7366ea542 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeSm.png
index 0ed89cc3a..3ac126d41 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeXs.png
index 508be7872..256329d06 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelSmallSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeLg.png
index 169c12541..710c1ec91 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeMd.png
index 961041d9f..4679e1e60 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeSm.png
index 3bf4190c6..bdae50dd0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Dark.sizeIconWithLabelXlargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xl.png
index 983cd93b6..ddba7a849 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xs.png
index f2db9e6bf..eb53d4afc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorative2xs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeLg.png
index 94c944c98..d6c55b578 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeMd.png
index 8edb2d047..46ae2298e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeSm.png
index 435741c73..5c7ca05a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXl.png
index b29e30dd0..3189fa76e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXs.png
index 0201a8168..aff5e385e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconDecorativeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeLg.png
index ce652c4e5..39e8675f2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeMd.png
index f870c233a..2fcbb5dd7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeSm.png
index 5f6196277..ec638d0cc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeLg.png
index 2da2e5c24..53a383d6e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeMd.png
index cf57292c1..405a2caf5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeSm.png
index fc258736c..9d63bba3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodyMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeLg.png
index 008dc64c7..a8f42f110 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeMd.png
index 94b3de98b..65204ba3c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeSm.png
index c97702249..d0db587fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithBodySmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeLg.png
index be474929c..3aca61345 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeMd.png
index 911a1d781..459f5604d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeSm.png
index 6cfe62050..a5df56197 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeLg.png
index 33944df4c..8be3b011c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeMd.png
index f07433fe3..42d1268a7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeSm.png
index ddbc1b34b..b0d61185f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeLg.png
index 33944df4c..8be3b011c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeMd.png
index f07433fe3..42d1268a7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeSm.png
index ddbc1b34b..b0d61185f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingSmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeLg.png
index d920df931..aa50d47b5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeMd.png
index 5c6201983..652ce2250 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeSm.png
index 5b6ae7812..b2ba4b509 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithHeadingXlargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeLg.png
index 33944df4c..8be3b011c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeMd.png
index f07433fe3..42d1268a7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeSm.png
index ddbc1b34b..b0d61185f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXl.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXl.png
index 81ec0d417..dcfb4f8b1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXl.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXl.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXs.png
index f753651bc..c63da0ab2 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelLargeSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeLg.png
index 2da2e5c24..53a383d6e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeMd.png
index cf57292c1..405a2caf5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeSm.png
index fc258736c..9d63bba3d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeXs.png
index 02dc32eba..a43c8f2f7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelMediumSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeLg.png
index 008dc64c7..a8f42f110 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeMd.png
index 94b3de98b..65204ba3c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeSm.png
index c97702249..d0db587fc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeXs.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeXs.png
index 6b43e792f..8cf0ba422 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeXs.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelSmallSizeXs.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeLg.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeLg.png
index 33944df4c..8be3b011c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeLg.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeLg.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeMd.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeMd.png
index f07433fe3..42d1268a7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeMd.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeMd.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeSm.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeSm.png
index ddbc1b34b..b0d61185f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeSm.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSizeUITests/test_OrangeTheme_Light.sizeIconWithLabelXlargeSizeSm.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapMedium.png
index 6d3a64a55..f4f7b1b32 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapNone.png
index ff29cc53a..6465928fa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShort.png
index 55d1c5420..39bd2877a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShorter.png
index 732b96acb..d28fd8225 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTall.png
index e0831f280..5db58e64c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTaller.png
index 89fe22d63..221f7f1db 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceColumnGapTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedHuge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedHuge.png
index 8c4efe780..c2c0f750a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedHuge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedHuge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedJumbo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedJumbo.png
index 6d320a440..94185284f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedJumbo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedJumbo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedMedium.png
index 81b3cde82..9eada8007 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedNone.png
index a6dfcee59..612d08c3c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShort.png
index 37593977a..8ab4801ea 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShorter.png
index f4c3fdf81..c41a7b1dd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShortest.png
index 17b04be5e..6cf64fed1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSmash.png
index 694accd5e..967fa23c6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSpacious.png
index 5cfb75aad..be7026183 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTall.png
index 83748ad53..54892a4ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTaller.png
index 7df0bee7d..35f7b6416 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTallest.png
index 15ce45ea8..7c2c24174 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceFixedTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetMedium.png
index e9546b571..ce55a77b6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetNone.png
index 991583433..6d30ac0b4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShort.png
index 19f153013..126147a36 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShorter.png
index 243d0ad57..ef7ad6c43 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShortest.png
index 1da9ece0f..073b04bd7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSmash.png
index 596009b97..88911c0d4 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSpacious.png
index 98f042f28..a6ae3cbf0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTall.png
index 2829079aa..dd54e2745 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTaller.png
index 1831a83e2..83db80ce0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTallest.png
index 7c80bd1d8..adb87c043 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceInsetTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockMedium.png
index 0f947cc11..6068e2396 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockNone.png
index db26c7c09..dc930a7f3 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShort.png
index fbb426d2a..c86ddb987 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShorter.png
index 6fbd92657..952dd3914 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTall.png
index 70792a52d..11fc3b3a0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTaller.png
index 190e29802..7f5b3c06c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTallest.png
index 4d457a1c2..e27403149 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingBlockTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineMedium.png
index a96198809..298f3bc9d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineNone.png
index 2e18c9189..9a7f5b680 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShort.png
index a91e6fa1b..80d283fe6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShorter.png
index 8686d4076..f5540fc66 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTall.png
index 4df8fbec8..880462e4a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTaller.png
index f0330c954..b516f3807 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTallest.png
index ab6d1f7c5..1166fde51 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spacePaddingInlineTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapMedium.png
index 29982747a..3e6286ee9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapNone.png
index 525577cef..9489b58f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShort.png
index a329baac6..3e57c9865 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShorter.png
index 8ab65b464..758ef80f6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShortest.png
index be32b604a..410b19c61 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapTall.png
index df3ed0e87..ca7ecd7d6 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceRowGapTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledMedium.png
index 43e5c9ec8..d43657f6e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledNone.png
index 8f9b48fad..9e1e68865 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShort.png
index a0ce1b5dd..832b557d5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShorter.png
index b8ac45ae8..a7dcab54c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShortest.png
index f8c142a18..a16cf6694 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSmash.png
index 0d0aeb736..90cdc0c5d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSpacious.png
index 4d2c235bc..e7fe9a186 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTall.png
index c99dd82b0..816c7ecc5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTaller.png
index 45b69eeef..87bfee4d0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTallest.png
index 6fb51c0bb..3dbe755c8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Dark.spaceScaledTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapMedium.png
index 5b4581b10..8f8b46717 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapNone.png
index c0789fc37..9a57b4c06 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShort.png
index 2982c79d0..5ddc2f490 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShorter.png
index d0c2f2dd0..c31398721 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTall.png
index e78894a91..8a69e9079 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTaller.png
index 1cff231a1..93c7adc5f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceColumnGapTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedHuge.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedHuge.png
index 14ce7f4c2..1dd1f010d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedHuge.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedHuge.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedJumbo.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedJumbo.png
index 8704f37ed..dc80ee4cb 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedJumbo.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedJumbo.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedMedium.png
index b426507ee..1b14a6e9a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedNone.png
index 9ce65ea7d..8b0f21059 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShort.png
index 0ae91fe5d..b45acc748 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShorter.png
index dbb11ae20..3413c088c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShortest.png
index a905c575c..c5440c497 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSmash.png
index 5a295cdcd..0bb387a4e 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSpacious.png
index 805882b37..852f3ddb0 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTall.png
index 735f6b756..d2d960a68 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTaller.png
index b62564ea2..76582c1ec 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTallest.png
index cafe78d8a..235d991ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceFixedTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetMedium.png
index 3c1677503..6cbd9d508 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetNone.png
index 4e362b41d..f7c35083c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShort.png
index 28c0830e0..62c2c3b2a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShorter.png
index 2953e3fe3..1b237be79 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShortest.png
index 952405ed9..f2c5058a1 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSmash.png
index c27fbdf9c..49a4df2f5 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSpacious.png
index 96cb3b759..febb640a8 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTall.png
index ecd2cdbdc..0977fdde9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTaller.png
index a3a021008..4a871e09f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTallest.png
index f0780c7cc..4837a8c99 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceInsetTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockMedium.png
index 822a37e33..a83be5209 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockNone.png
index ab805bd06..377eee2ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShort.png
index 0b24766ca..06ba1b767 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShorter.png
index fa6d06397..00e8ca6ac 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTall.png
index 0ab2cf2d8..b4d95b5c7 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTaller.png
index daa2ef393..82556c69f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTallest.png
index a55b4886a..9546a1723 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingBlockTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineMedium.png
index 43637b3a3..cc3adbb1f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineNone.png
index 0059a5702..b41fcb7bd 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShort.png
index b7bcd8389..e4bc01740 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShorter.png
index 075fef4eb..4d539e20d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTall.png
index a794bbd07..8abe0383b 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTaller.png
index 7b3fad664..b87307532 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTallest.png
index 5b3d15813..3837a676a 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spacePaddingInlineTallest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapMedium.png
index 94527cd6f..7d955e0bc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapNone.png
index 827cd691a..e1c00e4ab 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShort.png
index 5ba8c95fb..96dead2aa 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShorter.png
index 4667e5d56..2b4a6e44c 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShortest.png
index ceeed747d..b87f8b282 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapTall.png
index 772b78437..9bd221009 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceRowGapTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledMedium.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledMedium.png
index d3db48352..b5b6ad175 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledMedium.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledMedium.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledNone.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledNone.png
index 01fee5ad1..f75bc6105 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledNone.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledNone.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShort.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShort.png
index 3b7446256..66a44509d 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShort.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShort.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShorter.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShorter.png
index ab8e58fd8..05cb2d369 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShorter.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShorter.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShortest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShortest.png
index d637d5fae..5bbdd759f 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShortest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledShortest.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSmash.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSmash.png
index b2cd6eb24..e3b872511 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSmash.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSmash.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSpacious.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSpacious.png
index bbfbe8957..1180ebecc 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSpacious.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledSpacious.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTall.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTall.png
index 593335842..08b5ae5d9 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTall.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTall.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTaller.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTaller.png
index 78f7cc0f5..51c965207 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTaller.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTaller.png differ
diff --git a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTallest.png b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTallest.png
index f1906fd2d..b8ebeae41 100644
Binary files a/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTallest.png and b/DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensSpaceUITests/test_OrangeTheme_Light.spaceScaledTallest.png differ