diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
index 1be70ad8..126df985 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
@@ -925,9 +925,10 @@ const MCPServerComponent = ({ name, server }: { name: string, server: MCPServer
 				<div className="text-sm font-medium mr-2">{name}</div>
 
 				{/* Power toggle switch */}
-				<div className="ml-auto">
+				<div className="ml-auto mb-2">
 					<VoidSwitch
 						value={isOn ?? false}
+						size='sm'
 						disabled={server.status === 'error'}
 						onChange={() => mcpService.toggleServerIsOn(name, !isOn)}
 					/>
@@ -964,16 +965,7 @@ const MCPServerComponent = ({ name, server }: { name: string, server: MCPServer
 			)}
 
 			{/* Error message if present */}
-			{server.error && (
-				<div className="mt-2 ml-4 text-red-500 flex items-center">
-					<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="mr-1">
-						<circle cx="12" cy="12" r="10"></circle>
-						<line x1="12" y1="8" x2="12" y2="12"></line>
-						<line x1="12" y1="16" x2="12.01" y2="16"></line>
-					</svg>
-					{server.error}
-				</div>
-			)}
+			{server.error && (<WarningBox className='ml-4' text={server.error} />)}
 		</div>
 	);
 };
diff --git a/src/vs/workbench/contrib/void/common/mcpService.ts b/src/vs/workbench/contrib/void/common/mcpService.ts
index f516822d..ca6d94a1 100644
--- a/src/vs/workbench/contrib/void/common/mcpService.ts
+++ b/src/vs/workbench/contrib/void/common/mcpService.ts
@@ -92,9 +92,14 @@ class MCPService extends Disposable implements IMCPService {
 		super();
 		this.channel = this.mainProcessService.getChannel('void-channel-mcp')
 
-		this._register((this.channel.listen('onAdd_server') satisfies Event<MCPServerEventResponse>)(e => { this._setMCPServerState(e.response.name, e.response.newServer) }));
-		this._register((this.channel.listen('onUpdate_server') satisfies Event<MCPServerEventResponse>)(e => { this._setMCPServerState(e.response.name, e.response.newServer) }));
-		this._register((this.channel.listen('onDelete_server') satisfies Event<MCPServerEventResponse>)(e => { this._setMCPServerState(e.response.name, e.response.newServer) }));
+
+		const onEvent = (e: MCPServerEventResponse) => {
+			console.log('GOT EVENT', e)
+			this._setMCPServerState(e.response.name, e.response.newServer)
+		}
+		this._register((this.channel.listen('onAdd_server') satisfies Event<MCPServerEventResponse>)(onEvent));
+		this._register((this.channel.listen('onUpdate_server') satisfies Event<MCPServerEventResponse>)(onEvent));
+		this._register((this.channel.listen('onDelete_server') satisfies Event<MCPServerEventResponse>)(onEvent));
 
 		this._initialize();
 	}