diff --git a/frontend/__tests__/components/ui/form/InputField.spec.tsx b/frontend/__tests__/components/ui/form/InputField.spec.tsx
index 0bd301410072..b9228192d38c 100644
--- a/frontend/__tests__/components/ui/form/InputField.spec.tsx
+++ b/frontend/__tests__/components/ui/form/InputField.spec.tsx
@@ -83,12 +83,10 @@ describe("InputField", () => {
     expect(screen.getByRole("textbox")).toBeDisabled();
   });
 
-  it("shows FieldIndicator when showIndicator is true", () => {
+  it("shows FieldIndicator", () => {
     const field = makeField("name");
     field.state.meta.isValidating = true;
-    const { container } = render(() => (
-      <InputField field={() => field} showIndicator />
-    ));
+    const { container } = render(() => <InputField field={() => field} />);
 
     expect(container.querySelector(".fa-circle-notch")).toBeInTheDocument();
   });
diff --git a/frontend/src/html/pages/settings.html b/frontend/src/html/pages/settings.html
index 7049cbd4ee1f..c5dedf55751f 100644
--- a/frontend/src/html/pages/settings.html
+++ b/frontend/src/html/pages/settings.html
@@ -712,6 +712,16 @@
         <button data-config-value="14">fist fight</button>
         <button data-config-value="15">rubber keys</button>
         <button data-config-value="16">fart</button>
+        <button data-config-value="17">akko lavenders</button>
+        <button data-config-value="18">cherrymx black abs</button>
+        <button data-config-value="19">cherrymx black pbt</button>
+        <button data-config-value="20">cherrymx blue abs</button>
+        <button data-config-value="21">cherrymx blue pbt</button>
+        <button data-config-value="22">cherrymx brown pbt</button>
+        <button data-config-value="23">kalih box white</button>
+        <button data-config-value="24">razer green</button>
+        <button data-config-value="25">tealios v2</button>
+        <button data-config-value="26">trust gxt</button>
       </div>
     </div>
     <div class="section fullWidth" data-config-name="playSoundOnError">
diff --git a/frontend/src/ts/collections/results.ts b/frontend/src/ts/collections/results.ts
index be252a51999f..0b8662f7f78c 100644
--- a/frontend/src/ts/collections/results.ts
+++ b/frontend/src/ts/collections/results.ts
@@ -26,9 +26,14 @@ import Ape from "../ape";
 import { SnapshotResult } from "../constants/default-snapshot";
 import { queryClient } from "../queries";
 import { baseKey } from "../queries/utils/keys";
-import { __nonReactive as tagsNonReactive, updateLocalTagPB } from "./tags";
+import {
+  __nonReactive as tagsNonReactive,
+  reconcileLocalTagPB,
+  saveLocalTagPB,
+} from "./tags";
 import { isAuthenticated } from "../states/core";
 import { createEffectOn } from "../hooks/effects";
+import { getLastResult, setLastResult } from "../states/snapshot";
 
 export type ResultsQueryState = {
   difficulty: SnapshotResult<Mode>["difficulty"][];
@@ -224,9 +229,18 @@ const resultsCollection = createCollection(
         throw new Error("Error fetching results:" + response.body.message);
       }
 
-      return response.body.data.map((result) =>
+      const results = response.body.data.map((result) =>
         normalizeResult(result, knownTagIds),
       );
+
+      if (getLastResult() === undefined && results.length > 0) {
+        const lastResult = results.reduce((acc, cur) =>
+          acc === undefined || acc.timestamp < cur.timestamp ? cur : acc,
+        );
+        setLastResult(lastResult);
+      }
+
+      return results;
     },
     queryClient,
     getKey: (it) => it._id,
@@ -278,7 +292,7 @@ const actions = {
         ...newTagIds.filter((tag) => !currentTagIds.includes(tag)),
       ];
       tagsToUpdate.forEach((tag) => {
-        updateLocalTagPB(
+        reconcileLocalTagPB(
           tag,
           result.mode,
           result.mode2,
@@ -312,6 +326,49 @@ const actions = {
 export async function updateTags(
   params: ActionType["updateTags"],
 ): Promise<void> {
+  if (!resultsCollection.isReady()) {
+    // if its not ready yet, send the api request to update the tags
+    const response = await Ape.results.updateTags({
+      body: { resultId: params.resultId, tagIds: params.newTagIds },
+    });
+
+    if (response.status !== 200) {
+      throw new Error(`Failed to update result tag: ${response.body.message}`);
+    }
+
+    const result = getLastResult();
+
+    if (result === undefined) {
+      throw new Error(`Cannot find result with id ${params.resultId}`);
+    }
+
+    if (result._id !== params.resultId) {
+      throw new Error(
+        `Last result id ${result._id} does not match updated result id ${params.resultId}. Call the devs and tell them to fix their ugly code`,
+      );
+    }
+
+    response.body.data.tagPbs.forEach((tag) => {
+      saveLocalTagPB(
+        tag,
+        result.mode,
+        result.mode2,
+        result.punctuation,
+        result.numbers,
+        result.language,
+        result.difficulty,
+        result.lazyMode,
+        result.wpm,
+        result.acc,
+        result.rawWpm,
+        result.consistency,
+      );
+    });
+
+    params.afterUpdate?.({ tagPbs: response.body.data.tagPbs });
+    return;
+  }
+
   const transaction = actions.updateTags(params);
   await transaction.isPersisted.promise;
 }
@@ -500,13 +557,17 @@ export async function getUserAverage10(
   //exit early if there is no user. Don't init the result collection
   if (!isAuthenticated()) return { wpm: 0, acc: 0 };
 
-  const result = await queryOnce(() =>
-    buildSettingsResultsQuery(options, {
-      tagIds: tagsNonReactive.getActiveTags().map((it) => it._id),
-    })
-      .orderBy(({ r }) => r.timestamp, "desc")
-      .limit(10)
-      .select(({ r }) => ({ wpm: avg(r.wpm), acc: avg(r.acc) })),
+  const result = await queryOnce((q) =>
+    q
+      .from({
+        //we use sub-query to filter first and then aggregate
+        last10: buildSettingsResultsQuery(options, {
+          tagIds: tagsNonReactive.getActiveTags().map((it) => it._id),
+        })
+          .orderBy(({ r }) => r.timestamp, "desc")
+          .limit(10),
+      })
+      .select(({ last10 }) => ({ wpm: avg(last10.wpm), acc: avg(last10.acc) })),
   );
 
   return result.length === 1 && result[0] !== undefined
diff --git a/frontend/src/ts/collections/tags.ts b/frontend/src/ts/collections/tags.ts
index 8e0b53ba1c75..311d148aff1f 100644
--- a/frontend/src/ts/collections/tags.ts
+++ b/frontend/src/ts/collections/tags.ts
@@ -396,7 +396,7 @@ export function saveLocalTagPB<M extends Mode>(
   tagsCollection.utils.writeUpdate(tag);
 }
 
-export function updateLocalTagPB<M extends Mode>(
+export function reconcileLocalTagPB<M extends Mode>(
   tagId: string,
   mode: M,
   mode2: Mode2<M>,
diff --git a/frontend/src/ts/commandline/commandline-metadata.ts b/frontend/src/ts/commandline/commandline-metadata.ts
index afb70b6653c2..0f53145a8f2e 100644
--- a/frontend/src/ts/commandline/commandline-metadata.ts
+++ b/frontend/src/ts/commandline/commandline-metadata.ts
@@ -393,6 +393,16 @@ export const commandlineConfigMetadata: CommandlineConfigMetadataObject = {
           "14": "fist fight",
           "15": "rubber keys",
           "16": "fart",
+          "17": "akko lavenders",
+          "18": "cherrymx black abs",
+          "19": "cherrymx black pbt",
+          "20": "cherrymx blue abs",
+          "21": "cherrymx blue pbt",
+          "22": "cherrymx brown pbt",
+          "23": "kalih box white",
+          "24": "razer green",
+          "25": "tealios v2",
+          "26": "trust gxt",
         };
         return map[value];
       },
diff --git a/frontend/src/ts/components/pages/login/Register.tsx b/frontend/src/ts/components/pages/login/Register.tsx
index 3625bd84ebf7..7a531b1e6123 100644
--- a/frontend/src/ts/components/pages/login/Register.tsx
+++ b/frontend/src/ts/components/pages/login/Register.tsx
@@ -166,7 +166,6 @@ export function Register(): JSXElement {
             <InputField
               field={field}
               placeholder="username"
-              showIndicator
               autocomplete="new-username"
               disabled={!getLoginPageInputsEnabled()}
             />
@@ -187,7 +186,6 @@ export function Register(): JSXElement {
             <InputField
               field={field}
               placeholder="email"
-              showIndicator
               autocomplete="new-email"
               disabled={!getLoginPageInputsEnabled()}
               onFocus={() => {
@@ -214,7 +212,6 @@ export function Register(): JSXElement {
           children={(field) => (
             <InputField
               field={field}
-              showIndicator
               autocomplete="verify-email"
               placeholder="verify email"
               disabled={!getLoginPageInputsEnabled()}
@@ -238,7 +235,6 @@ export function Register(): JSXElement {
             <InputField
               field={field}
               placeholder="password"
-              showIndicator
               autocomplete="new-password"
               type="password"
               disabled={!getLoginPageInputsEnabled()}
@@ -256,7 +252,6 @@ export function Register(): JSXElement {
           children={(field) => (
             <InputField
               field={field}
-              showIndicator
               placeholder="verify password"
               autocomplete="verify-password"
               type="password"
diff --git a/frontend/src/ts/components/pages/profile/ProfileSearchPage.tsx b/frontend/src/ts/components/pages/profile/ProfileSearchPage.tsx
index 5526f27d9065..3b168dde5153 100644
--- a/frontend/src/ts/components/pages/profile/ProfileSearchPage.tsx
+++ b/frontend/src/ts/components/pages/profile/ProfileSearchPage.tsx
@@ -86,7 +86,6 @@ export function ProfileSearchPage(): JSXElement {
                   <InputField
                     field={field}
                     placeholder="username"
-                    showIndicator
                     autocomplete="new-username"
                     disabled={!isEditable()}
                   />
diff --git a/frontend/src/ts/components/ui/form/InputField.tsx b/frontend/src/ts/components/ui/form/InputField.tsx
index dc423c9c1927..1a3cc90dd192 100644
--- a/frontend/src/ts/components/ui/form/InputField.tsx
+++ b/frontend/src/ts/components/ui/form/InputField.tsx
@@ -7,7 +7,6 @@ import { FieldIndicator } from "./FieldIndicator";
 export function InputField(props: {
   field: Accessor<AnyFieldApi>;
   placeholder?: string;
-  showIndicator?: boolean;
   autocomplete?: string;
   type?: string;
   disabled?: boolean;
@@ -24,7 +23,7 @@ export function InputField(props: {
           "rounded border-none bg-sub-alt p-[0.5em] text-em-base leading-[1.25em] caret-main outline-none",
           "focus-visible:shadow-[0_0_0_0.1rem_var(--bg-color),0_0_0_0.2rem_var(--text-color)]",
           "autofill-fix",
-          props.showIndicator === true ? "pr-[1.85em]" : "",
+          props.field().options.validators ? "pr-[1.85em]" : "",
           props.class,
         )}
         type={props.type ?? "text"}
@@ -40,7 +39,7 @@ export function InputField(props: {
         dir={props.dir}
         maxLength={props.maxLength}
       />
-      <Show when={props.showIndicator}>
+      <Show when={props.field().options.validators}>
         <FieldIndicator field={props.field()} />
       </Show>
     </div>
diff --git a/frontend/src/ts/constants/sounds.ts b/frontend/src/ts/constants/sounds.ts
index 122c30d4d37d..aefb6450f1b5 100644
--- a/frontend/src/ts/constants/sounds.ts
+++ b/frontend/src/ts/constants/sounds.ts
@@ -17,6 +17,16 @@ export const soundsConfig: SoundConfigType = {
   14: { numberOfSounds: 8 },
   15: { numberOfSounds: 5 },
   16: { numberOfSounds: 8 },
+  17: { numberOfSounds: 10 },
+  18: { numberOfSounds: 10 },
+  19: { numberOfSounds: 10 },
+  20: { numberOfSounds: 10 },
+  21: { numberOfSounds: 10 },
+  22: { numberOfSounds: 10 },
+  23: { numberOfSounds: 10 },
+  24: { numberOfSounds: 10 },
+  25: { numberOfSounds: 10 },
+  26: { numberOfSounds: 10 },
 };
 
 export type ClickSoundConfig = {
diff --git a/frontend/static/sounds/click17/1.wav b/frontend/static/sounds/click17/1.wav
new file mode 100644
index 000000000000..39594279aa36
Binary files /dev/null and b/frontend/static/sounds/click17/1.wav differ
diff --git a/frontend/static/sounds/click17/10.wav b/frontend/static/sounds/click17/10.wav
new file mode 100644
index 000000000000..672cc5c1e089
Binary files /dev/null and b/frontend/static/sounds/click17/10.wav differ
diff --git a/frontend/static/sounds/click17/2.wav b/frontend/static/sounds/click17/2.wav
new file mode 100644
index 000000000000..d4e4b25b13f1
Binary files /dev/null and b/frontend/static/sounds/click17/2.wav differ
diff --git a/frontend/static/sounds/click17/3.wav b/frontend/static/sounds/click17/3.wav
new file mode 100644
index 000000000000..bd92bf2733f0
Binary files /dev/null and b/frontend/static/sounds/click17/3.wav differ
diff --git a/frontend/static/sounds/click17/4.wav b/frontend/static/sounds/click17/4.wav
new file mode 100644
index 000000000000..1faad3497b81
Binary files /dev/null and b/frontend/static/sounds/click17/4.wav differ
diff --git a/frontend/static/sounds/click17/5.wav b/frontend/static/sounds/click17/5.wav
new file mode 100644
index 000000000000..4972960da9c8
Binary files /dev/null and b/frontend/static/sounds/click17/5.wav differ
diff --git a/frontend/static/sounds/click17/6.wav b/frontend/static/sounds/click17/6.wav
new file mode 100644
index 000000000000..5904c64a294a
Binary files /dev/null and b/frontend/static/sounds/click17/6.wav differ
diff --git a/frontend/static/sounds/click17/7.wav b/frontend/static/sounds/click17/7.wav
new file mode 100644
index 000000000000..9c4c803ade8c
Binary files /dev/null and b/frontend/static/sounds/click17/7.wav differ
diff --git a/frontend/static/sounds/click17/8.wav b/frontend/static/sounds/click17/8.wav
new file mode 100644
index 000000000000..dd85e97f5e37
Binary files /dev/null and b/frontend/static/sounds/click17/8.wav differ
diff --git a/frontend/static/sounds/click17/9.wav b/frontend/static/sounds/click17/9.wav
new file mode 100644
index 000000000000..977ad59a6889
Binary files /dev/null and b/frontend/static/sounds/click17/9.wav differ
diff --git a/frontend/static/sounds/click18/1.wav b/frontend/static/sounds/click18/1.wav
new file mode 100644
index 000000000000..25644b65638c
Binary files /dev/null and b/frontend/static/sounds/click18/1.wav differ
diff --git a/frontend/static/sounds/click18/10.wav b/frontend/static/sounds/click18/10.wav
new file mode 100644
index 000000000000..0175d76d230d
Binary files /dev/null and b/frontend/static/sounds/click18/10.wav differ
diff --git a/frontend/static/sounds/click18/2.wav b/frontend/static/sounds/click18/2.wav
new file mode 100644
index 000000000000..9b1c263c008b
Binary files /dev/null and b/frontend/static/sounds/click18/2.wav differ
diff --git a/frontend/static/sounds/click18/3.wav b/frontend/static/sounds/click18/3.wav
new file mode 100644
index 000000000000..1a926b50eeeb
Binary files /dev/null and b/frontend/static/sounds/click18/3.wav differ
diff --git a/frontend/static/sounds/click18/4.wav b/frontend/static/sounds/click18/4.wav
new file mode 100644
index 000000000000..77406a333583
Binary files /dev/null and b/frontend/static/sounds/click18/4.wav differ
diff --git a/frontend/static/sounds/click18/5.wav b/frontend/static/sounds/click18/5.wav
new file mode 100644
index 000000000000..cc99d4f8a8ed
Binary files /dev/null and b/frontend/static/sounds/click18/5.wav differ
diff --git a/frontend/static/sounds/click18/6.wav b/frontend/static/sounds/click18/6.wav
new file mode 100644
index 000000000000..a633df2b7c81
Binary files /dev/null and b/frontend/static/sounds/click18/6.wav differ
diff --git a/frontend/static/sounds/click18/7.wav b/frontend/static/sounds/click18/7.wav
new file mode 100644
index 000000000000..40530520bfd9
Binary files /dev/null and b/frontend/static/sounds/click18/7.wav differ
diff --git a/frontend/static/sounds/click18/8.wav b/frontend/static/sounds/click18/8.wav
new file mode 100644
index 000000000000..063ac5d01bcc
Binary files /dev/null and b/frontend/static/sounds/click18/8.wav differ
diff --git a/frontend/static/sounds/click18/9.wav b/frontend/static/sounds/click18/9.wav
new file mode 100644
index 000000000000..9d05c4f97ec8
Binary files /dev/null and b/frontend/static/sounds/click18/9.wav differ
diff --git a/frontend/static/sounds/click19/1.wav b/frontend/static/sounds/click19/1.wav
new file mode 100644
index 000000000000..a98c96f5f252
Binary files /dev/null and b/frontend/static/sounds/click19/1.wav differ
diff --git a/frontend/static/sounds/click19/10.wav b/frontend/static/sounds/click19/10.wav
new file mode 100644
index 000000000000..3674434ac8fb
Binary files /dev/null and b/frontend/static/sounds/click19/10.wav differ
diff --git a/frontend/static/sounds/click19/2.wav b/frontend/static/sounds/click19/2.wav
new file mode 100644
index 000000000000..1ddd7d3da6aa
Binary files /dev/null and b/frontend/static/sounds/click19/2.wav differ
diff --git a/frontend/static/sounds/click19/3.wav b/frontend/static/sounds/click19/3.wav
new file mode 100644
index 000000000000..3bc4a62e0272
Binary files /dev/null and b/frontend/static/sounds/click19/3.wav differ
diff --git a/frontend/static/sounds/click19/4.wav b/frontend/static/sounds/click19/4.wav
new file mode 100644
index 000000000000..76ead2b5b4d2
Binary files /dev/null and b/frontend/static/sounds/click19/4.wav differ
diff --git a/frontend/static/sounds/click19/5.wav b/frontend/static/sounds/click19/5.wav
new file mode 100644
index 000000000000..001a1f3769d1
Binary files /dev/null and b/frontend/static/sounds/click19/5.wav differ
diff --git a/frontend/static/sounds/click19/6.wav b/frontend/static/sounds/click19/6.wav
new file mode 100644
index 000000000000..8b0fc87db248
Binary files /dev/null and b/frontend/static/sounds/click19/6.wav differ
diff --git a/frontend/static/sounds/click19/7.wav b/frontend/static/sounds/click19/7.wav
new file mode 100644
index 000000000000..8410a5f9640a
Binary files /dev/null and b/frontend/static/sounds/click19/7.wav differ
diff --git a/frontend/static/sounds/click19/8.wav b/frontend/static/sounds/click19/8.wav
new file mode 100644
index 000000000000..c6d12a376da8
Binary files /dev/null and b/frontend/static/sounds/click19/8.wav differ
diff --git a/frontend/static/sounds/click19/9.wav b/frontend/static/sounds/click19/9.wav
new file mode 100644
index 000000000000..aba1d376fb4d
Binary files /dev/null and b/frontend/static/sounds/click19/9.wav differ
diff --git a/frontend/static/sounds/click20/1.wav b/frontend/static/sounds/click20/1.wav
new file mode 100644
index 000000000000..e174a683e310
Binary files /dev/null and b/frontend/static/sounds/click20/1.wav differ
diff --git a/frontend/static/sounds/click20/10.wav b/frontend/static/sounds/click20/10.wav
new file mode 100644
index 000000000000..d9c390c853b6
Binary files /dev/null and b/frontend/static/sounds/click20/10.wav differ
diff --git a/frontend/static/sounds/click20/2.wav b/frontend/static/sounds/click20/2.wav
new file mode 100644
index 000000000000..6fa32d1d6954
Binary files /dev/null and b/frontend/static/sounds/click20/2.wav differ
diff --git a/frontend/static/sounds/click20/3.wav b/frontend/static/sounds/click20/3.wav
new file mode 100644
index 000000000000..8c580bdd0fda
Binary files /dev/null and b/frontend/static/sounds/click20/3.wav differ
diff --git a/frontend/static/sounds/click20/4.wav b/frontend/static/sounds/click20/4.wav
new file mode 100644
index 000000000000..ef1de152bf79
Binary files /dev/null and b/frontend/static/sounds/click20/4.wav differ
diff --git a/frontend/static/sounds/click20/5.wav b/frontend/static/sounds/click20/5.wav
new file mode 100644
index 000000000000..affdd2b9a9bb
Binary files /dev/null and b/frontend/static/sounds/click20/5.wav differ
diff --git a/frontend/static/sounds/click20/6.wav b/frontend/static/sounds/click20/6.wav
new file mode 100644
index 000000000000..77bc5995eff7
Binary files /dev/null and b/frontend/static/sounds/click20/6.wav differ
diff --git a/frontend/static/sounds/click20/7.wav b/frontend/static/sounds/click20/7.wav
new file mode 100644
index 000000000000..6605091ed1d5
Binary files /dev/null and b/frontend/static/sounds/click20/7.wav differ
diff --git a/frontend/static/sounds/click20/8.wav b/frontend/static/sounds/click20/8.wav
new file mode 100644
index 000000000000..f415079d34f5
Binary files /dev/null and b/frontend/static/sounds/click20/8.wav differ
diff --git a/frontend/static/sounds/click20/9.wav b/frontend/static/sounds/click20/9.wav
new file mode 100644
index 000000000000..db04f900334d
Binary files /dev/null and b/frontend/static/sounds/click20/9.wav differ
diff --git a/frontend/static/sounds/click21/1.wav b/frontend/static/sounds/click21/1.wav
new file mode 100644
index 000000000000..cb2628bebc23
Binary files /dev/null and b/frontend/static/sounds/click21/1.wav differ
diff --git a/frontend/static/sounds/click21/10.wav b/frontend/static/sounds/click21/10.wav
new file mode 100644
index 000000000000..d8ac7b120567
Binary files /dev/null and b/frontend/static/sounds/click21/10.wav differ
diff --git a/frontend/static/sounds/click21/2.wav b/frontend/static/sounds/click21/2.wav
new file mode 100644
index 000000000000..bfb18e90a880
Binary files /dev/null and b/frontend/static/sounds/click21/2.wav differ
diff --git a/frontend/static/sounds/click21/3.wav b/frontend/static/sounds/click21/3.wav
new file mode 100644
index 000000000000..c6d74f44c0cb
Binary files /dev/null and b/frontend/static/sounds/click21/3.wav differ
diff --git a/frontend/static/sounds/click21/4.wav b/frontend/static/sounds/click21/4.wav
new file mode 100644
index 000000000000..54cd89a74d70
Binary files /dev/null and b/frontend/static/sounds/click21/4.wav differ
diff --git a/frontend/static/sounds/click21/5.wav b/frontend/static/sounds/click21/5.wav
new file mode 100644
index 000000000000..c5d00e05d5c8
Binary files /dev/null and b/frontend/static/sounds/click21/5.wav differ
diff --git a/frontend/static/sounds/click21/6.wav b/frontend/static/sounds/click21/6.wav
new file mode 100644
index 000000000000..fa9a90746d31
Binary files /dev/null and b/frontend/static/sounds/click21/6.wav differ
diff --git a/frontend/static/sounds/click21/7.wav b/frontend/static/sounds/click21/7.wav
new file mode 100644
index 000000000000..be44574db2a4
Binary files /dev/null and b/frontend/static/sounds/click21/7.wav differ
diff --git a/frontend/static/sounds/click21/8.wav b/frontend/static/sounds/click21/8.wav
new file mode 100644
index 000000000000..c4e5c3ebb246
Binary files /dev/null and b/frontend/static/sounds/click21/8.wav differ
diff --git a/frontend/static/sounds/click21/9.wav b/frontend/static/sounds/click21/9.wav
new file mode 100644
index 000000000000..9c0a978074b4
Binary files /dev/null and b/frontend/static/sounds/click21/9.wav differ
diff --git a/frontend/static/sounds/click22/1.wav b/frontend/static/sounds/click22/1.wav
new file mode 100644
index 000000000000..dcf5c8e78ad9
Binary files /dev/null and b/frontend/static/sounds/click22/1.wav differ
diff --git a/frontend/static/sounds/click22/10.wav b/frontend/static/sounds/click22/10.wav
new file mode 100644
index 000000000000..00cd42ec0d0f
Binary files /dev/null and b/frontend/static/sounds/click22/10.wav differ
diff --git a/frontend/static/sounds/click22/2.wav b/frontend/static/sounds/click22/2.wav
new file mode 100644
index 000000000000..4bfcf49f76b2
Binary files /dev/null and b/frontend/static/sounds/click22/2.wav differ
diff --git a/frontend/static/sounds/click22/3.wav b/frontend/static/sounds/click22/3.wav
new file mode 100644
index 000000000000..386044a29024
Binary files /dev/null and b/frontend/static/sounds/click22/3.wav differ
diff --git a/frontend/static/sounds/click22/4.wav b/frontend/static/sounds/click22/4.wav
new file mode 100644
index 000000000000..063a08a6c660
Binary files /dev/null and b/frontend/static/sounds/click22/4.wav differ
diff --git a/frontend/static/sounds/click22/5.wav b/frontend/static/sounds/click22/5.wav
new file mode 100644
index 000000000000..e7926047813c
Binary files /dev/null and b/frontend/static/sounds/click22/5.wav differ
diff --git a/frontend/static/sounds/click22/6.wav b/frontend/static/sounds/click22/6.wav
new file mode 100644
index 000000000000..bbfa6766e2ed
Binary files /dev/null and b/frontend/static/sounds/click22/6.wav differ
diff --git a/frontend/static/sounds/click22/7.wav b/frontend/static/sounds/click22/7.wav
new file mode 100644
index 000000000000..4430ecc0845a
Binary files /dev/null and b/frontend/static/sounds/click22/7.wav differ
diff --git a/frontend/static/sounds/click22/8.wav b/frontend/static/sounds/click22/8.wav
new file mode 100644
index 000000000000..ce4319c54a42
Binary files /dev/null and b/frontend/static/sounds/click22/8.wav differ
diff --git a/frontend/static/sounds/click22/9.wav b/frontend/static/sounds/click22/9.wav
new file mode 100644
index 000000000000..36fa84dbd5d8
Binary files /dev/null and b/frontend/static/sounds/click22/9.wav differ
diff --git a/frontend/static/sounds/click23/1.wav b/frontend/static/sounds/click23/1.wav
new file mode 100644
index 000000000000..5f921b4641c6
Binary files /dev/null and b/frontend/static/sounds/click23/1.wav differ
diff --git a/frontend/static/sounds/click23/10.wav b/frontend/static/sounds/click23/10.wav
new file mode 100644
index 000000000000..c1a8bdd2270f
Binary files /dev/null and b/frontend/static/sounds/click23/10.wav differ
diff --git a/frontend/static/sounds/click23/2.wav b/frontend/static/sounds/click23/2.wav
new file mode 100644
index 000000000000..31ad298c9346
Binary files /dev/null and b/frontend/static/sounds/click23/2.wav differ
diff --git a/frontend/static/sounds/click23/3.wav b/frontend/static/sounds/click23/3.wav
new file mode 100644
index 000000000000..b57dfee0a213
Binary files /dev/null and b/frontend/static/sounds/click23/3.wav differ
diff --git a/frontend/static/sounds/click23/4.wav b/frontend/static/sounds/click23/4.wav
new file mode 100644
index 000000000000..a131143f7df6
Binary files /dev/null and b/frontend/static/sounds/click23/4.wav differ
diff --git a/frontend/static/sounds/click23/5.wav b/frontend/static/sounds/click23/5.wav
new file mode 100644
index 000000000000..890f92069cd1
Binary files /dev/null and b/frontend/static/sounds/click23/5.wav differ
diff --git a/frontend/static/sounds/click23/6.wav b/frontend/static/sounds/click23/6.wav
new file mode 100644
index 000000000000..cabb917d38c9
Binary files /dev/null and b/frontend/static/sounds/click23/6.wav differ
diff --git a/frontend/static/sounds/click23/7.wav b/frontend/static/sounds/click23/7.wav
new file mode 100644
index 000000000000..c1761145fa27
Binary files /dev/null and b/frontend/static/sounds/click23/7.wav differ
diff --git a/frontend/static/sounds/click23/8.wav b/frontend/static/sounds/click23/8.wav
new file mode 100644
index 000000000000..b90e235ffd08
Binary files /dev/null and b/frontend/static/sounds/click23/8.wav differ
diff --git a/frontend/static/sounds/click23/9.wav b/frontend/static/sounds/click23/9.wav
new file mode 100644
index 000000000000..4ac2f9752f66
Binary files /dev/null and b/frontend/static/sounds/click23/9.wav differ
diff --git a/frontend/static/sounds/click24/1.wav b/frontend/static/sounds/click24/1.wav
new file mode 100644
index 000000000000..04e2eda500ae
Binary files /dev/null and b/frontend/static/sounds/click24/1.wav differ
diff --git a/frontend/static/sounds/click24/10.wav b/frontend/static/sounds/click24/10.wav
new file mode 100644
index 000000000000..eba8292583d5
Binary files /dev/null and b/frontend/static/sounds/click24/10.wav differ
diff --git a/frontend/static/sounds/click24/2.wav b/frontend/static/sounds/click24/2.wav
new file mode 100644
index 000000000000..069c9dfd2a17
Binary files /dev/null and b/frontend/static/sounds/click24/2.wav differ
diff --git a/frontend/static/sounds/click24/3.wav b/frontend/static/sounds/click24/3.wav
new file mode 100644
index 000000000000..49dc21b858b4
Binary files /dev/null and b/frontend/static/sounds/click24/3.wav differ
diff --git a/frontend/static/sounds/click24/4.wav b/frontend/static/sounds/click24/4.wav
new file mode 100644
index 000000000000..5dd47d561b65
Binary files /dev/null and b/frontend/static/sounds/click24/4.wav differ
diff --git a/frontend/static/sounds/click24/5.wav b/frontend/static/sounds/click24/5.wav
new file mode 100644
index 000000000000..40b8a855477e
Binary files /dev/null and b/frontend/static/sounds/click24/5.wav differ
diff --git a/frontend/static/sounds/click24/6.wav b/frontend/static/sounds/click24/6.wav
new file mode 100644
index 000000000000..f4dc26624dfc
Binary files /dev/null and b/frontend/static/sounds/click24/6.wav differ
diff --git a/frontend/static/sounds/click24/7.wav b/frontend/static/sounds/click24/7.wav
new file mode 100644
index 000000000000..ea10c1eac7a7
Binary files /dev/null and b/frontend/static/sounds/click24/7.wav differ
diff --git a/frontend/static/sounds/click24/8.wav b/frontend/static/sounds/click24/8.wav
new file mode 100644
index 000000000000..500d6a84b34e
Binary files /dev/null and b/frontend/static/sounds/click24/8.wav differ
diff --git a/frontend/static/sounds/click24/9.wav b/frontend/static/sounds/click24/9.wav
new file mode 100644
index 000000000000..58899e58c044
Binary files /dev/null and b/frontend/static/sounds/click24/9.wav differ
diff --git a/frontend/static/sounds/click25/1.wav b/frontend/static/sounds/click25/1.wav
new file mode 100644
index 000000000000..f16f5f7cbfdc
Binary files /dev/null and b/frontend/static/sounds/click25/1.wav differ
diff --git a/frontend/static/sounds/click25/10.wav b/frontend/static/sounds/click25/10.wav
new file mode 100644
index 000000000000..948cd9602f5b
Binary files /dev/null and b/frontend/static/sounds/click25/10.wav differ
diff --git a/frontend/static/sounds/click25/2.wav b/frontend/static/sounds/click25/2.wav
new file mode 100644
index 000000000000..cd9a53442958
Binary files /dev/null and b/frontend/static/sounds/click25/2.wav differ
diff --git a/frontend/static/sounds/click25/3.wav b/frontend/static/sounds/click25/3.wav
new file mode 100644
index 000000000000..2b3fc35ce799
Binary files /dev/null and b/frontend/static/sounds/click25/3.wav differ
diff --git a/frontend/static/sounds/click25/4.wav b/frontend/static/sounds/click25/4.wav
new file mode 100644
index 000000000000..8c245092c73e
Binary files /dev/null and b/frontend/static/sounds/click25/4.wav differ
diff --git a/frontend/static/sounds/click25/5.wav b/frontend/static/sounds/click25/5.wav
new file mode 100644
index 000000000000..ef6a63409c5a
Binary files /dev/null and b/frontend/static/sounds/click25/5.wav differ
diff --git a/frontend/static/sounds/click25/6.wav b/frontend/static/sounds/click25/6.wav
new file mode 100644
index 000000000000..af282aede259
Binary files /dev/null and b/frontend/static/sounds/click25/6.wav differ
diff --git a/frontend/static/sounds/click25/7.wav b/frontend/static/sounds/click25/7.wav
new file mode 100644
index 000000000000..6effb8c222d9
Binary files /dev/null and b/frontend/static/sounds/click25/7.wav differ
diff --git a/frontend/static/sounds/click25/8.wav b/frontend/static/sounds/click25/8.wav
new file mode 100644
index 000000000000..fbd5a0b26c18
Binary files /dev/null and b/frontend/static/sounds/click25/8.wav differ
diff --git a/frontend/static/sounds/click25/9.wav b/frontend/static/sounds/click25/9.wav
new file mode 100644
index 000000000000..f2001eee1082
Binary files /dev/null and b/frontend/static/sounds/click25/9.wav differ
diff --git a/frontend/static/sounds/click26/1.wav b/frontend/static/sounds/click26/1.wav
new file mode 100644
index 000000000000..f02c06f78753
Binary files /dev/null and b/frontend/static/sounds/click26/1.wav differ
diff --git a/frontend/static/sounds/click26/10.wav b/frontend/static/sounds/click26/10.wav
new file mode 100644
index 000000000000..47303ed921f6
Binary files /dev/null and b/frontend/static/sounds/click26/10.wav differ
diff --git a/frontend/static/sounds/click26/2.wav b/frontend/static/sounds/click26/2.wav
new file mode 100644
index 000000000000..2fe82a24ae22
Binary files /dev/null and b/frontend/static/sounds/click26/2.wav differ
diff --git a/frontend/static/sounds/click26/3.wav b/frontend/static/sounds/click26/3.wav
new file mode 100644
index 000000000000..acff23839292
Binary files /dev/null and b/frontend/static/sounds/click26/3.wav differ
diff --git a/frontend/static/sounds/click26/4.wav b/frontend/static/sounds/click26/4.wav
new file mode 100644
index 000000000000..ae41c9918b5d
Binary files /dev/null and b/frontend/static/sounds/click26/4.wav differ
diff --git a/frontend/static/sounds/click26/5.wav b/frontend/static/sounds/click26/5.wav
new file mode 100644
index 000000000000..3f8fb4dfad46
Binary files /dev/null and b/frontend/static/sounds/click26/5.wav differ
diff --git a/frontend/static/sounds/click26/6.wav b/frontend/static/sounds/click26/6.wav
new file mode 100644
index 000000000000..4246c58b8d33
Binary files /dev/null and b/frontend/static/sounds/click26/6.wav differ
diff --git a/frontend/static/sounds/click26/7.wav b/frontend/static/sounds/click26/7.wav
new file mode 100644
index 000000000000..9b4540293784
Binary files /dev/null and b/frontend/static/sounds/click26/7.wav differ
diff --git a/frontend/static/sounds/click26/8.wav b/frontend/static/sounds/click26/8.wav
new file mode 100644
index 000000000000..2b38fb102f3c
Binary files /dev/null and b/frontend/static/sounds/click26/8.wav differ
diff --git a/frontend/static/sounds/click26/9.wav b/frontend/static/sounds/click26/9.wav
new file mode 100644
index 000000000000..b54fac199dea
Binary files /dev/null and b/frontend/static/sounds/click26/9.wav differ
diff --git a/frontend/storybook/stories/Form.stories.tsx b/frontend/storybook/stories/Form.stories.tsx
index 7b3cd161ee6c..cbb7c92183e3 100644
--- a/frontend/storybook/stories/Form.stories.tsx
+++ b/frontend/storybook/stories/Form.stories.tsx
@@ -64,7 +64,6 @@ export const withValidation = meta.story({
           children={(field) => (
             <InputField
               field={field}
-              showIndicator
               autocomplete="current-user"
               disabled={!isEditable()}
             />
@@ -79,7 +78,6 @@ export const withValidation = meta.story({
             <InputField
               field={field}
               type="password"
-              showIndicator
               autocomplete="current-password"
               disabled={!isEditable()}
             />
diff --git a/packages/schemas/src/configs.ts b/packages/schemas/src/configs.ts
index 77c257a54834..c2cd9ee56b7f 100644
--- a/packages/schemas/src/configs.ts
+++ b/packages/schemas/src/configs.ts
@@ -144,6 +144,16 @@ export const PlaySoundOnClickSchema = z.enum([
   "14",
   "15",
   "16",
+  "17",
+  "18",
+  "19",
+  "20",
+  "21",
+  "22",
+  "23",
+  "24",
+  "25",
+  "26",
 ]);
 export type PlaySoundOnClick = z.infer<typeof PlaySoundOnClickSchema>;