diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 87f2e1c130..7d8b490115 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -303,21 +303,28 @@
   <ContextTooltip
     visible={contextTooltipVisible}
     anchor={contextTooltipAnchor}
+    offset={20}
   >
     <div
       class="tooltipContents"
     >
       {#if contextTooltipOption}
+        <div class="contextTooltipHeader">
           <Icon name={getOptionIcon(contextTooltipOption)} />
-        <Heading>{contextTooltipOption}</Heading>
+          <Heading>{contextTooltipOption}</Heading>
+        </div>
+        <p>{getOptionTooltip(contextTooltipOption)}</p>
       {/if}
     </div>
     <div slot="previous"
       class="tooltipContents"
     >
       {#if previousContextTooltipOption}
+        <div class="contextTooltipHeader">
           <Icon name={getOptionIcon(previousContextTooltipOption)} />
-        <Heading>{previousContextTooltipOption}</Heading>
+          <Heading>{previousContextTooltipOption}</Heading>
+        </div>
+        <p>{getOptionTooltip(previousContextTooltipOption)}</p>
       {/if}
     </div>
   </ContextTooltip>
@@ -327,18 +334,29 @@
     max-width: 200px;
     background-color: var(--spectrum-global-color-gray-200);
     display: inline-block;
+    padding: 12px;
+    border-radius: 5px;
+    box-sizing: border-box;
   }
 
-  .tooltipContents :global(h1) {
+  .contextTooltipHeader {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .contextTooltipHeader :global(svg) {
+    color: var(--background);
+    margin-right: 5px;
+  }
+
+  .contextTooltipHeader :global(h1) {
+    flex-grow: 1;
     font-size: 15px;
     text-wrap: wrap;
     word-break: break-all;
   }
 
-  .tooltipContents :global(svg) {
-    color: var(--background);
-    fill: var(--background);
-  }
 
   .spectrum-Menu {
     display: block;
diff --git a/packages/bbui/src/Tooltip/Context.svelte b/packages/bbui/src/Tooltip/Context.svelte
index d1220c2198..59747f83ed 100644
--- a/packages/bbui/src/Tooltip/Context.svelte
+++ b/packages/bbui/src/Tooltip/Context.svelte
@@ -2,12 +2,15 @@
   import Portal from "svelte-portal"
   import { fade } from 'svelte/transition';
 
-  export let wrapper
-  export let resetWrapper
-  export let currentTooltip
   export let anchor
   export let visible = false
-  export let hovering = false
+  export let offset = 0;
+
+  let hovering = false
+  let wrapper
+  let resetWrapper
+  let currentTooltip
+  let previousTooltip
 
   let initialShow = true;
   let previousX = 0
@@ -24,9 +27,9 @@
     }
   }
 
-  const updatePosition = (anchor, currentTooltip, wrapper, resetWrapper) => {
+  const updatePosition = (anchor, currentTooltip, previousTooltip, wrapper, resetWrapper) => {
     requestAnimationFrame(() => {
-      if (anchor == null || currentTooltip == null || wrapper == null || resetWrapper == null) {
+      if (anchor == null || currentTooltip == null || previousTooltip == null || wrapper == null || resetWrapper == null) {
         return;
       }
 
@@ -39,8 +42,19 @@
       previousY = currentY
 
       // - width to align to left side of anchor
-      currentX = rect.x - currentTooltipWidth
+      currentX = rect.x - currentTooltipWidth - offset
       currentY = rect.y
+      const fadeIn = [{ opacity: "0" }, { opacity: "1" }];
+      const fadeOut = [{ opacity: "1" }, { opacity: "0" }];
+
+      const fadeTiming = {
+        duration: 300,
+        iterations: 1,
+        easing: "ease-in"
+      };
+
+      currentTooltip.animate(fadeIn, fadeTiming);
+      previousTooltip.animate(fadeOut, fadeTiming);
 
       // Bypass animations if the tooltip has only just been opened
       if (initialShow) {
@@ -64,7 +78,7 @@
     })
   }
 
-  $: updatePosition(anchor, currentTooltip, wrapper, resetWrapper)
+  $: updatePosition(anchor, currentTooltip, previousTooltip, wrapper, resetWrapper)
   $: handleVisibilityChange(visible, hovering)
 
   const handleMouseenter = (e) => {
@@ -74,14 +88,6 @@
   const handleMouseleave = (e) => {
     hovering = false;
   }
-
-  $: {
-    console.log(currentX)
-    console.log(currentY)
-    console.log(currentTooltipWidth)
-    console.log(currentTooltipHeight)
-    console.log();
-  }
 </script>
 
 <Portal target=".spectrum">
@@ -116,6 +122,7 @@
         class="previousContent"
         style:left={`${previousX}px`}
         style:top={`${previousY}px`}
+        bind:this={previousTooltip}
       >
         <slot name="previous"/>
       </div>
@@ -129,6 +136,8 @@
     z-index: 9999;
     pointer-events: none;
     background-color: var(--spectrum-global-color-gray-200);
+    border-radius: 5px;
+    box-sizing: border-box;
 
     opacity: 0;
     overflow: hidden;
@@ -149,7 +158,7 @@
 
   .currentContent {
     position: absolute;
-    z-index: 10000;
+    z-index: 10001;
   }
 
   .previousContent {
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index b2a308596c..412a797db3 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -102,7 +102,6 @@
   }
 
   const getOptionTooltip = optionKey => {
-    console.log(optionKey)
     const support = fieldSupport[optionKey]?.support;
     const message = fieldSupport[optionKey]?.message;