diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index efd5f33bd2..cc0a1c7332 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -52,8 +52,13 @@
   {#if $$slots}
     <span class="spectrum-Button-label"><slot /></span>
   {/if}
-  {#if !disabled && tooltip}
-    <div class="tooltip-icon">
+  {#if tooltip}
+    <div
+      class="tooltip-icon"
+      on:mouseover={() => (showTooltip = true)}
+      on:focus={() => (showTooltip = true)}
+      on:mouseleave={() => (showTooltip = false)}
+    >
       <svg
         class="spectrum-Icon spectrum-Icon--size{size.toUpperCase()}"
         focusable="false"
@@ -98,6 +103,8 @@
   .tooltip-icon {
     padding-left: var(--spacing-m);
     line-height: 0;
+    pointer-events: all !important;
+    z-index: 1;
   }
   .spectrum-Button--primary.new-styles {
     background: var(--spectrum-global-color-gray-800);
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
index 70ef5bc4bc..9b0615a70e 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
@@ -65,7 +65,6 @@
       tooltip={appDeployed
         ? "You must unpublish your app to make changes"
         : null}
-      icon={appDeployed ? "HelpOutline" : null}
     >
       Edit
     </Button>