diff --git a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
index ae3da3cfdb..afb0e68f6c 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
@@ -241,8 +241,6 @@
     overflow: hidden;
     position: relative;
     --background-color: var(--spectrum-global-color-gray-50);
-    --node-background: var(--spectrum-global-color-gray-100);
-    --node-background-hover: var(--spectrum-global-color-gray-300);
     --border-color: var(--spectrum-global-color-gray-300);
     --edge-color: var(--spectrum-global-color-gray-500);
     --handle-color: var(--spectrum-global-color-gray-600);
@@ -255,8 +253,6 @@
     --xy-background-color: var(--background-color);
 
     /* Controls */
-    --xy-controls-button-background-color: var(--node-background);
-    --xy-controls-button-background-color-hover: var(--node-background-hover);
     --xy-controls-button-border-color: var(--border-color);
 
     /* Handles */
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
index 1615a355fa..ffc0db3758 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Handle, Position, useSvelteFlow, NodeToolbar } from "@xyflow/svelte"
+  import { Handle, Position, useSvelteFlow } from "@xyflow/svelte"
   import {
     Icon,
     Input,
@@ -9,9 +9,8 @@
     FieldLabel,
   } from "@budibase/bbui"
   import { Roles } from "constants/backend"
-  import { NodeWidth, NodeHeight, MaxAutoZoom, ZoomDuration } from "./constants"
+  import { NodeWidth, NodeHeight } from "./constants"
   import { getContext } from "svelte"
-  import { autoLayout } from "./layout"
   import { roles } from "stores/builder"
 
   export let data
@@ -31,6 +30,7 @@
   $: descriptionError = validateDescription(tempDescription)
   $: invalid = nameError || descriptionError
   $: targetClasses = `target${$dragging ? "" : " hidden"}`
+  $: sourceClasses = `source${selected ? "" : " hidden"}`
 
   const validateName = (name, roles) => {
     if (!name?.length) {
@@ -102,8 +102,8 @@
       isConnectable={$dragging}
     />
   {/if}
-  {#if id !== Roles.ADMIN && selected}
-    <Handle type="source" position={Position.Right} />
+  {#if id !== Roles.ADMIN}
+    <Handle type="source" position={Position.Right} class={sourceClasses} />
   {/if}
 </div>
 
@@ -136,7 +136,7 @@
 <style>
   .node {
     position: relative;
-    background: var(--node-background);
+    background: var(--spectrum-global-color-gray-100);
     border-radius: 4px;
     width: var(--width);
     height: var(--height);
@@ -145,6 +145,10 @@
     gap: 12px;
     box-sizing: border-box;
     cursor: pointer;
+    transition: background 130ms ease-out;
+  }
+  .node:hover {
+    background: var(--spectrum-global-color-gray-200);
   }
   .node.selected {
     background: var(--spectrum-global-color-blue-100);