diff --git a/ui/src/me/components/account/__snapshots__/Settings.test.tsx.snap b/ui/src/me/components/account/__snapshots__/Settings.test.tsx.snap
index cc2f261a7b..281b3559a5 100644
--- a/ui/src/me/components/account/__snapshots__/Settings.test.tsx.snap
+++ b/ui/src/me/components/account/__snapshots__/Settings.test.tsx.snap
@@ -93,7 +93,7 @@ exports[`Account rendering renders! 1`] = `
                                       title="Edit About Me"
                                       type="button"
                                     >
-                                      <X
+                                      <G
                                         icon=""
                                         placeIconAfterText={false}
                                         text="Edit About Me"
@@ -103,7 +103,7 @@ exports[`Account rendering renders! 1`] = `
                                         >
                                           Edit About Me
                                         </span>
-                                      </X>
+                                      </G>
                                     </button>
                                   </ButtonBase>
                                 </Button>
@@ -159,6 +159,21 @@ exports[`Account rendering renders! 1`] = `
                                           }
                                         }
                                       >
+                                        <StatusIndicator
+                                          shadow={true}
+                                          size="sm"
+                                          status="disabled"
+                                          testID="nameInput"
+                                        >
+                                          <div
+                                            className="cf-status-indicator cf-status-indicator__disabled cf-status-indicator__sm"
+                                            data-testid="nameInput--disabled"
+                                          >
+                                            <div
+                                              className="cf-status-indicator--shadow"
+                                            />
+                                          </div>
+                                        </StatusIndicator>
                                         <input
                                           autoComplete="off"
                                           autoFocus={false}
@@ -174,13 +189,6 @@ exports[`Account rendering renders! 1`] = `
                                           type="text"
                                           value="groot"
                                         />
-                                        <ye
-                                          status="disabled"
-                                        >
-                                          <div
-                                            className="cf-input-shadow"
-                                          />
-                                        </ye>
                                       </div>
                                     </Input>
                                   </div>
diff --git a/ui/src/variables/components/__snapshots__/VariableForm.test.tsx.snap b/ui/src/variables/components/__snapshots__/VariableForm.test.tsx.snap
index e7298765b1..44ad15973c 100644
--- a/ui/src/variables/components/__snapshots__/VariableForm.test.tsx.snap
+++ b/ui/src/variables/components/__snapshots__/VariableForm.test.tsx.snap
@@ -38,9 +38,17 @@ exports[`Variables.Components.VariableForm rendering renders 1`] = `
               </span>
             </label>
             <div
-              class="cf-input cf-input-sm cf-input__error"
+              class="cf-input cf-input-sm"
               style="width: 100%;"
             >
+              <div
+                class="cf-status-indicator cf-status-indicator__default cf-status-indicator__sm"
+                data-testid="input-field--default"
+              >
+                <div
+                  class="cf-status-indicator--shadow"
+                />
+              </div>
               <input
                 autocomplete="off"
                 class="cf-input-field"
@@ -52,20 +60,7 @@ exports[`Variables.Components.VariableForm rendering renders 1`] = `
                 type="text"
                 value=""
               />
-              <span
-                class="cf-icon alert-triangle cf-input-status"
-                data-testid="input-error"
-              />
-              <div
-                class="cf-input-shadow"
-              />
             </div>
-            <span
-              class="cf-form--element-error"
-              data-testid="form--element-error"
-            >
-              Variable name cannot be empty
-            </span>
           </div>
         </div>
       </div>