diff --git a/frontend/src/components/modals/NodeModal.tsx b/frontend/src/components/modals/NodeModal.tsx
index 13980d8..21d14a3 100644
--- a/frontend/src/components/modals/NodeModal.tsx
+++ b/frontend/src/components/modals/NodeModal.tsx
@@ -61,6 +61,7 @@ export function NodeModal({ open, onClose, onSubmit, initial, title = 'Add Node'
   const [iconSearch, setIconSearch] = useState('')
   const [iconPickerOpen, setIconPickerOpen] = useState(false)
   const [labelError, setLabelError] = useState(false)
+  const resolvedNodeColors = resolveNodeColors({ type: form.type ?? 'generic', custom_colors: form.custom_colors })
 
   const set = (key: keyof NodeData, value: unknown) =>
     setForm((f) => ({ ...f, [key]: value }))
@@ -334,7 +335,7 @@ export function NodeModal({ open, onClose, onSubmit, initial, title = 'Add Node'
                     show_services: !(form.custom_colors?.show_services === true),
                   })}
                   className="relative inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus:outline-none"
-                  style={{ background: form.custom_colors?.show_services === true ? '#00d4ff' : '#30363d' }}
+                  style={{ background: form.custom_colors?.show_services === true ? resolvedNodeColors.icon : '#30363d' }}
                 >
                   <span
                     className="pointer-events-none inline-block h-4 w-4 rounded-full bg-white shadow-sm transition-transform"