diff --git a/packages/bbui/src/FancyForm/FancyButton.svelte b/packages/bbui/src/FancyForm/FancyButton.svelte
index 09615df8fa..677d98cecc 100644
--- a/packages/bbui/src/FancyForm/FancyButton.svelte
+++ b/packages/bbui/src/FancyForm/FancyButton.svelte
@@ -22,6 +22,7 @@
 <style>
   img {
     width: 22px;
+    margin-right: 6px;
   }
   div {
     font-size: var(--font-size-l);
diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte
new file mode 100644
index 0000000000..5947034c4c
--- /dev/null
+++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte
@@ -0,0 +1,62 @@
+<script>
+  import { createEventDispatcher, getContext, onMount } from "svelte"
+  import FancyField from "./FancyField.svelte"
+  import Checkbox from "../Form/Core/Checkbox.svelte"
+
+  export let value
+  export let text
+  export let disabled = false
+  export let error = null
+  export let validate = null
+
+  const dispatch = createEventDispatcher()
+  const formContext = getContext("fancy-form")
+  const id = Math.random()
+
+  const onChange = () => {
+    const newValue = !value
+    dispatch("change", newValue)
+    value = newValue
+    if (validate) {
+      error = validate(newValue)
+    }
+  }
+
+  const API = {
+    validate: () => {
+      if (validate) {
+        error = validate(value)
+      }
+      return !error
+    },
+  }
+
+  onMount(() => {
+    if (formContext) {
+      formContext.registerField(id, API)
+    }
+    return () => {
+      if (formContext) {
+        formContext.unregisterField(id)
+      }
+    }
+  })
+</script>
+
+<FancyField {error} {disabled} clickable on:click={onChange}>
+  <span>
+    <Checkbox {disabled} {value} />
+  </span>
+  {#if text}
+    {text}
+  {/if}
+  <div>
+    <slot />
+  </div>
+</FancyField>
+
+<style>
+  span {
+    pointer-events: none;
+  }
+</style>
diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte
index 85f07f2a31..ff02f68df9 100644
--- a/packages/bbui/src/FancyForm/FancyField.svelte
+++ b/packages/bbui/src/FancyForm/FancyField.svelte
@@ -1,4 +1,6 @@
 <script>
+  import Icon from "../Icon/Icon.svelte"
+
   export let disabled = false
   export let error = null
   export let focused = false
@@ -13,7 +15,14 @@
   class:clickable
 >
   <div class="content" on:click>
-    <slot />
+    <div class="field">
+      <slot />
+    </div>
+    {#if error}
+      <div class="error-icon">
+        <Icon name="Alert" />
+      </div>
+    {/if}
   </div>
   {#if error}
     <div class="error-message">
@@ -53,14 +62,20 @@
     pointer-events: none;
   }
   .content {
+    position: relative;
     height: 64px;
     padding: 0 16px;
+  }
+  .content,
+  .field {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
-    gap: 16px;
-    position: relative;
+    gap: 10px;
+  }
+  .field {
+    flex: 1 1 auto;
   }
   .error-message {
     background: var(--spectrum-global-color-red-400);
@@ -69,4 +84,10 @@
     padding: 6px 16px;
     font-weight: 500;
   }
+  .error-icon {
+    flex: 0 0 auto;
+  }
+  .error-icon :global(.spectrum-Icon) {
+    fill: var(--spectrum-global-color-red-400);
+  }
 </style>
diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte
index 1e46f96b1b..6b8b839d53 100644
--- a/packages/bbui/src/FancyForm/FancyInput.svelte
+++ b/packages/bbui/src/FancyForm/FancyInput.svelte
@@ -1,6 +1,7 @@
 <script>
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import FancyField from "./FancyField.svelte"
+  import Icon from "../Icon/Icon.svelte"
 
   export let label
   export let value
@@ -29,8 +30,6 @@
     validate: () => {
       if (validate) {
         error = validate(value)
-      } else {
-        error = null
       }
       return !error
     },
@@ -69,25 +68,25 @@
   .label {
     font-size: 14px;
     font-weight: 500;
-    transform: translateY(-12px);
+    transform: translateY(calc(-50% - 12px));
     position: absolute;
+    top: 50%;
     color: var(--spectrum-global-color-gray-600);
     transition: font-size 130ms ease-out, transform 130ms ease-out;
   }
   .label.placeholder {
     font-size: 15px;
-    transform: translateY(0);
+    transform: translateY(-50%);
   }
   input {
-    z-index: 1;
+    width: 100%;
+    transition: transform 130ms ease-out;
+    transform: translateY(9px);
     background: transparent;
     font-size: 15px;
     color: var(--spectrum-global-color-gray-900);
     outline: none;
     border: none;
-    transition: transform 130ms ease-out;
-    width: 100%;
-    transform: translateY(9px);
   }
   input.placeholder {
     transform: translateY(0);
diff --git a/packages/bbui/src/FancyForm/index.js b/packages/bbui/src/FancyForm/index.js
index 4b8e099b80..78f03202c8 100644
--- a/packages/bbui/src/FancyForm/index.js
+++ b/packages/bbui/src/FancyForm/index.js
@@ -1,3 +1,4 @@
 export { default as FancyInput } from "./FancyInput.svelte"
+export { default as FancyCheckbox } from "./FancyCheckbox.svelte"
 export { default as FancyButton } from "./FancyButton.svelte"
 export { default as FancyForm } from "./FancyForm.svelte"
diff --git a/packages/bbui/src/Link/Link.svelte b/packages/bbui/src/Link/Link.svelte
index 3bbfdd8282..8ad722d553 100644
--- a/packages/bbui/src/Link/Link.svelte
+++ b/packages/bbui/src/Link/Link.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/link/dist/index-vars.css"
+  import { createEventDispatcher } from "svelte"
 
   export let href = "#"
   export let size = "M"
@@ -9,10 +10,12 @@
   export let overBackground = false
   export let target
   export let download
+
+  const dispatch = createEventDispatcher()
 </script>
 
 <a
-  on:click
+  on:click={e => e.stopPropagation() && dispatch(e)}
   {href}
   {target}
   {download}