diff --git a/frontend/src/lib/components/FlowPlugConnect.svelte b/frontend/src/lib/components/FlowPlugConnect.svelte
index 1cf48f61a4..da70d882db 100644
--- a/frontend/src/lib/components/FlowPlugConnect.svelte
+++ b/frontend/src/lib/components/FlowPlugConnect.svelte
@@ -14,7 +14,7 @@
 		variant="default"
 		btnClasses={twMerge(
 			connecting ? 'text-accent' : '',
-			'bg-surface hover:bg-surface group/plug-btn overflow-clip flex p-0'
+			'bg-surface hover:bg-surface-hover group/plug-btn overflow-clip flex p-0'
 		)}
 		on:click
 		{...id ? { id } : {}}
diff --git a/frontend/src/lib/components/common/CloseButton.svelte b/frontend/src/lib/components/common/CloseButton.svelte
index aa50de33df..a037a66921 100644
--- a/frontend/src/lib/components/common/CloseButton.svelte
+++ b/frontend/src/lib/components/common/CloseButton.svelte
@@ -24,8 +24,9 @@
 	iconOnly
 	unifiedSize="sm"
 	color="light"
+	wrapperClasses="shrink-0"
 	btnClasses={twMerge(
-		'hover:bg-surface-hover rounded-full p-0',
+		'hover:bg-surface-hover rounded-full p-0 !min-h-0',
 		noBg ? '' : 'bg-surface-secondary',
 		small ? 'w-6 h-6' : 'w-8 h-8',
 		className ?? ''
diff --git a/frontend/src/lib/components/common/button/ConnectionButton.svelte b/frontend/src/lib/components/common/button/ConnectionButton.svelte
index 57408b009d..e7b5e1a53f 100644
--- a/frontend/src/lib/components/common/button/ConnectionButton.svelte
+++ b/frontend/src/lib/components/common/button/ConnectionButton.svelte
@@ -99,7 +99,10 @@
 			on:click={() => handleConnect(true)}
 			{id}
 			wrapperClasses={twMerge(btnWrapperClasses, selected ? 'opacity-100' : '')}
-			btnClasses={twMerge(small ? 'p-0' : '', 'bg-surface hover:bg-surface')}
+			btnClasses={twMerge(
+				small ? 'p-0' : '',
+				isOpen && selected ? 'bg-surface hover:bg-surface' : ''
+			)}
 		>
 			<Plug size={14} />
 		</Button>