diff --git a/client/src/components/Draftail/Tooltip/Tooltip.scss b/client/src/components/Draftail/Tooltip/Tooltip.scss
index 54812ce79760..989682bc11f0 100644
--- a/client/src/components/Draftail/Tooltip/Tooltip.scss
+++ b/client/src/components/Draftail/Tooltip/Tooltip.scss
@@ -11,14 +11,11 @@ $tooltip-z-index: $draftail-tooltip-z-index;
 $tooltip-color-no: theme('colors.critical.100');
 
 @mixin arrow--top {
-  margin-top: $tooltip-arrow-spacing;
+  margin-top: $tooltip-spacing;
   transform: translateX(calc(var(--w-direction-factor) * -50%));
 
   &::before {
-    bottom: 100%;
-    inset-inline-start: 50%;
-    transform: translateX(calc(var(--w-direction-factor) * -50%));
-    border-bottom-color: $tooltip-chrome;
+    content: none;
   }
 }
 
diff --git a/client/src/components/Draftail/decorators/TooltipEntity.js b/client/src/components/Draftail/decorators/TooltipEntity.js
index f9a3afcc5f29..80a2a86fdbc0 100644
--- a/client/src/components/Draftail/decorators/TooltipEntity.js
+++ b/client/src/components/Draftail/decorators/TooltipEntity.js
@@ -116,12 +116,15 @@ class TooltipEntity extends Component {
                 </a>
               ) : null}
 
-              <button className="button Tooltip__button" onClick={this.onEdit}>
+              <button
+                className="button button-small Tooltip__button"
+                onClick={this.onEdit}
+              >
                 Edit
               </button>
 
               <button
-                className="button button-secondary no Tooltip__button"
+                className="button button-small button-secondary no Tooltip__button"
                 onClick={this.onRemove}
               >
                 Remove
diff --git a/client/src/components/Draftail/decorators/__snapshots__/TooltipEntity.test.js.snap b/client/src/components/Draftail/decorators/__snapshots__/TooltipEntity.test.js.snap
index c3100340c794..25a28ce59e0e 100644
--- a/client/src/components/Draftail/decorators/__snapshots__/TooltipEntity.test.js.snap
+++ b/client/src/components/Draftail/decorators/__snapshots__/TooltipEntity.test.js.snap
@@ -68,13 +68,13 @@ exports[`TooltipEntity #openTooltip 1`] = `
         www.example.com
       </a>
       <button
-        className="button Tooltip__button"
+        className="button button-small Tooltip__button"
         onClick={[Function]}
       >
         Edit
       </button>
       <button
-        className="button button-secondary no Tooltip__button"
+        className="button button-small button-secondary no Tooltip__button"
         onClick={[Function]}
       >
         Remove