diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
index e6818518a..06013cfea 100644
--- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
@@ -143,10 +143,18 @@
     margin-top: 0;
   }
   .bindings__wrapper {
-    overflow-y: auto;
+    overflow-y: scroll;
+    overflow-x: hidden;
     position: relative;
     flex: 1 1 auto;
+    -ms-overflow-style: none;
   }
+
+  .bindings__wrapper::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+  }
+
   .bindings__list {
     position: absolute;
     width: 100%;
diff --git a/packages/builder/src/components/common/BindableInput.svelte b/packages/builder/src/components/common/BindableInput.svelte
index 6234e3e04..a8df01986 100644
--- a/packages/builder/src/components/common/BindableInput.svelte
+++ b/packages/builder/src/components/common/BindableInput.svelte
@@ -24,7 +24,7 @@
 <div class="container" bind:this={anchor}>
   <Input {...inputProps} bind:value />
   <div class="icon" on:click={popover.show}>
-    <Icon name="edit" />
+    <Icon name="lightning" />
   </div>
 </div>
 <GenericBindingPopover
@@ -54,6 +54,7 @@
     border-bottom-right-radius: var(--border-radius-m);
     color: var(--grey-7);
     font-size: 16px;
+    margin-top: 20px;
   }
   .icon:hover {
     color: var(--ink);
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
index bf0c30b18..0a62d3407 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
@@ -37,8 +37,10 @@
     return [...acc, ...viewsArr]
   }, [])
   $: queries = $backendUiStore.queries
-  .filter(query => showAllQueries || (query.queryVerb === "read" || query.readable))
-  .map(query => ({
+    .filter(
+      query => showAllQueries || query.queryVerb === "read" || query.readable
+    )
+    .map(query => ({
       label: query.name,
       name: query.name,
       tableId: query._id,