diff --git a/packages/bridge-ui-v2/src/components/ChainSelector/ChainSelector.svelte b/packages/bridge-ui-v2/src/components/ChainSelector/ChainSelector.svelte
index 8febce611e1..10fe2daadf2 100644
--- a/packages/bridge-ui-v2/src/components/ChainSelector/ChainSelector.svelte
+++ b/packages/bridge-ui-v2/src/components/ChainSelector/ChainSelector.svelte
@@ -132,13 +132,13 @@
   </div>
 
   <dialog id={dialogId} class="modal modal-bottom md:modal-middle" class:modal-open={modalOpen}>
-    <div class="modal-box relative px-6 py-[35px] md:py-[20px] bg-primary-background text-primary-content">
+    <div class="modal-box relative px-6 py-[35px] md:py-[20px] bg-neutral-background text-primary-content">
       {#if switchingNetwork}
         <LoadingMask spinnerClass="border-white" text={$t('messages.network.switching')} />
       {/if}
 
       <button class="absolute right-6 top-[35px] md:top-[20px]" on:click={closeModal}>
-        <Icon type="x-close" fillClass="fill-secondary-icon" size={24} />
+        <Icon type="x-close" fillClass="fill-primary-icon" size={24} />
       </button>
       <div class="w-full">
         <h3 class="title-body-bold mb-[20px]">{$t('chain_selector.placeholder')}</h3>
@@ -154,7 +154,7 @@
                 tabindex="0"
                 class="p-4 rounded-[10px]"
                 class:opacity-20={disabled}
-                class:hover:bg-neutral-background={!disabled}
+                class:hover:bg-primary-background={!disabled}
                 class:hover:cursor-pointer={!disabled}
                 aria-disabled={disabled}
                 on:click={() => {
diff --git a/packages/bridge-ui-v2/src/components/SwitchChainModal/SwitchChainModal.svelte b/packages/bridge-ui-v2/src/components/SwitchChainModal/SwitchChainModal.svelte
index 774e3567554..b72c10621dd 100644
--- a/packages/bridge-ui-v2/src/components/SwitchChainModal/SwitchChainModal.svelte
+++ b/packages/bridge-ui-v2/src/components/SwitchChainModal/SwitchChainModal.svelte
@@ -9,6 +9,9 @@
   import { chains } from '$libs/chain';
   import { switchChainModal } from '$stores/modal';
 
+  // TODO: We should combine this with the ChainSelector component.
+  // Or at least share the same base component. There is a lot of code duplication
+
   let switchingNetwork = false;
 
   function closeModal() {