diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte
index 3033759e88..057248a926 100644
--- a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte
@@ -137,11 +137,12 @@
       text="required"
     />
     <span class="space" />
-      <a target="_blank" rel="noopener noreferrer" href={"https://docs.budibase.com/docs/budibasedb#constraints"} class="chip link topLink">
-        <Icon size="S" name={"DataUnavailable"} />
-        <span class="text">
-          Constraint
-        </span></a><span class="comma">,</span>
+    <DocumentationLink
+      icon="DataUnavailable"
+      href="https://docs.budibase.com/docs/budibasedb#constraints"
+      text="Constraint"
+    />
+      <span class="comma">,</span>
       <span class="text">
         so values may be missing
       </span>
@@ -325,6 +326,7 @@
   }
 
   .comma {
+    margin-left: 2px;
     color: var(--grey-5);
     font-size: 20px;
     display: inline block;
diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte
index 0afd5e9545..66f8ea5790 100644
--- a/packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte
@@ -11,7 +11,7 @@
   {href}
   rel="noopener noreferrer"
   target="_blank"
-  class="chip link"
+  class="link"
 >
   <Icon size="S" name={icon} />
   <span class="text">
@@ -22,29 +22,6 @@
 </a>
 
 <style>
-  .chip {
-    display: inline-flex;
-    box-sizing: border-box;
-    padding: 3px 6px;
-    border-radius: 5px;
-    vertical-align: sub;
-    filter: brightness(100%);
-    background-color: var(--grey-3);
-    border: 1px solid var(--grey-3);
-    overflow: hidden;
-    flex-shrink: 0;
-  }
-
-  .chip:hover {
-    filter: brightness(120%);
-    transition: filter 300ms
-  }
-
-  .chip :global(svg) {
-    color: inherit;
-    margin-right: 5px;
-  }
-
   .text {
     color: var(--ink);
     white-space: nowrap;
@@ -53,21 +30,21 @@
   }
 
   .link {
-    border-radius: 0;
-    background-color: transparent;
-    border: 1px solid red;
-    border-width: 0 0 1px 0;
+    display: inline-flex;
     box-sizing: border-box;
-    border-color: var(--blue);
-    color: white;
-    padding-left: 0px;
-    padding-right: 0px;
-    transition: background-color 200ms;
+    padding: 3px 0 2px;
+    vertical-align: sub;
+    filter: brightness(100%);
+
+    overflow: hidden;
+    flex-shrink: 0;
+    border-radius: 0;
+    border-bottom: 1px solid var(--blue);
+    transition: filter 300ms;
   }
 
   .link:hover {
-    cursor: pointer;
-    background-color: #ffffff0a;
+    filter: brightness(120%);
   }
 
   .link :global(svg) {
diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte
index bc95ec7423..11538c3906 100644
--- a/packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte
@@ -14,7 +14,7 @@
     {href}
     rel="noopener noreferrer"
     target="_blank"
-    class="chip"
+    class="infoWord"
     style:color={color}
     style:border-color={color}
     on:mouseenter
@@ -32,7 +32,7 @@
 {:else}
   <div
     role="tooltip"
-    class="chip"
+    class="infoWord"
     style:color={color}
     style:border-color={color}
     on:mouseenter
@@ -50,7 +50,7 @@
 {/if}
 
 <style>
-  .chip {
+  .infoWord {
     display: inline-flex;
     box-sizing: border-box;
     padding: 3px 6px;
@@ -60,16 +60,16 @@
     background-color: var(--grey-3);
     border: 1px solid var(--grey-3);
     overflow: hidden;
-  }
-
-  .chip:hover {
-    filter: brightness(120%);
     transition: filter 300ms
   }
 
-  .chip :global(svg) {
+  .infoWord:hover {
+    filter: brightness(120%);
+  }
+
+  .infoWord :global(svg) {
     color: inherit;
-    margin-right: 5px;
+    margin-right: 4px;
   }
 
   .text {