diff --git a/packages/code-studio/src/styleguide/Inputs.tsx b/packages/code-studio/src/styleguide/Inputs.tsx
index 1cef56658..8dd8f125b 100644
--- a/packages/code-studio/src/styleguide/Inputs.tsx
+++ b/packages/code-studio/src/styleguide/Inputs.tsx
@@ -188,15 +188,18 @@ function Inputs(): React.ReactElement {
               aria-labelledby="inputs-radios-heading"
               onChange={handleRadioChange}
               value={radioValue}
+              isInvalid={radioValue === '4'}
+              description="Select a radio item"
+              errorMessage={
+                radioValue === '4' ? 'Invalid radio selected' : undefined
+              }
             >
               <Radio value="1">Toggle this custom radio</Radio>
               <Radio value="2">Or toggle this other custom radio</Radio>
               <Radio value="3" isDisabled>
                 Disabled radio
               </Radio>
-              <Radio value="4" UNSAFE_className="is-invalid">
-                Invalid radio
-              </Radio>
+              <Radio value="4">Invalid radio</Radio>
               <Radio isHidden={!check4} value="5">
                 Extra radio item
               </Radio>
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-chromium-linux.png
index a9f50582e..5e7fd2661 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-firefox-linux.png
index 24418bd19..aca566546 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-chromium-linux.png
index 5ef910ff3..46bfbc31e 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-firefox-linux.png
index 1ce70118d..1219d90a7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-webkit-linux.png
index dd66e1478..ed854ea30 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row0-radio-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-chromium-linux.png
index e21fff9cc..66288c437 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-firefox-linux.png
index a5a449368..1e1dd93d7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-webkit-linux.png
index de84db630..42409be65 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row1-radio-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-chromium-linux.png
index 31bac5fb3..2cba74e7a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-firefox-linux.png
index 07212a292..9b1a366e0 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-webkit-linux.png
index f8c19d2f6..bb2d52d7a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row2-radio-disabled-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-chromium-linux.png
index e64cc6fb4..0fd93d4a6 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-firefox-linux.png
index 673eec1af..162d3c08c 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-webkit-linux.png
index e23421cfd..ea7107bce 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row3-radio-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-chromium-linux.png
index c3cff7828..c419770ee 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-firefox-linux.png
index be48ba6ef..5f2f1f602 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-webkit-linux.png
index 5cef10e82..7f87b116e 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row4-button-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-chromium-linux.png
index 3395e06c7..16e977803 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-firefox-linux.png
index a43b581c4..b84faab66 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-webkit-linux.png
index 6bbeac1d9..f9fc83447 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row5-button-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-chromium-linux.png
index a2a57fe87..f83cf66d7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-firefox-linux.png
index 8add3ce1a..39c17f916 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-webkit-linux.png
index 69699f67c..02b3a110b 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row6-button-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-chromium-linux.png
index f356dd8f6..2cba74e7a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-firefox-linux.png
index 07212a292..9b1a366e0 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-webkit-linux.png
index f8c19d2f6..bb2d52d7a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-focus-col2-row7-button-disabled-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/inputs-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/inputs-webkit-linux.png
index 52731fc92..ca38958d4 100644
Binary files a/tests/styleguide.spec.ts-snapshots/inputs-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/inputs-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/list-views-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/list-views-chromium-linux.png
index 3cbb03987..0d1ee7024 100644
Binary files a/tests/styleguide.spec.ts-snapshots/list-views-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/list-views-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/list-views-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/list-views-firefox-linux.png
index 168d42430..46e2429eb 100644
Binary files a/tests/styleguide.spec.ts-snapshots/list-views-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/list-views-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/list-views-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/list-views-webkit-linux.png
index 9dc3773c4..4e0f2825a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/list-views-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/list-views-webkit-linux.png differ