diff --git a/src/ui/component/ChainIcon.tsx b/src/ui/component/ChainIcon.tsx
index e9958513619..4d79d216734 100644
--- a/src/ui/component/ChainIcon.tsx
+++ b/src/ui/component/ChainIcon.tsx
@@ -120,7 +120,7 @@ const ChainIcon = ({
   showCustomRPCToolTip = false,
   nonce,
   innerClassName,
-  tooltipTriggerElement = 'chain',
+  tooltipTriggerElement = 'dot',
   tooltipProps,
 }: Props) => {
   const wallet = useWallet();
@@ -197,7 +197,7 @@ const ChainIcon = ({
     );
   } else {
     return (
-      <div className="chain-icon-comp">
+      <div className="chain-icon-comp relative">
         <Tooltip
           placement="top"
           overlayClassName={clsx('rectangle')}
@@ -213,7 +213,7 @@ const ChainIcon = ({
             />
           </ChainIconWrapper>
         </Tooltip>
-        <Tooltip
+        <TooltipWithMagnetArrow
           placement="top"
           overlayClassName={clsx('rectangle')}
           {...tooltipProps}
@@ -233,7 +233,7 @@ const ChainIcon = ({
             ) : (
               <UnavaliableIcon className={clsx(size)} />
             ))}
-        </Tooltip>
+        </TooltipWithMagnetArrow>
       </div>
     );
   }
diff --git a/src/ui/component/ChainSelector/InForm.tsx b/src/ui/component/ChainSelector/InForm.tsx
index cc67bc0aa08..90d1cbc964b 100644
--- a/src/ui/component/ChainSelector/InForm.tsx
+++ b/src/ui/component/ChainSelector/InForm.tsx
@@ -16,10 +16,10 @@ import { SWAP_SUPPORT_CHAINS } from '@/constant';
 import { findChain } from '@/utils/chain';
 
 const ChainWrapper = styled.div`
-  height: 40px;
+  /* height: 40px; */
   background: var(--r-neutral-card-2, #f2f4f7);
   border-radius: 6px;
-  padding: 12px 10px;
+  padding: 12px 12px;
   width: 100%;
   display: flex;
   align-items: center;
@@ -39,6 +39,7 @@ const ChainWrapper = styled.div`
     }
     .name {
       color: var(--r-neutral-title-1, #192945);
+      line-height: 15px;
     }
   }
 `;
@@ -155,6 +156,7 @@ export default function ChainSelectorInForm({
           supportChains={supportChains}
           disabledTips={disabledTips}
           title={title}
+          showRPCStatus
         />
       )}
     </>
diff --git a/src/ui/component/ChainSelector/components/SelectChainItem.tsx b/src/ui/component/ChainSelector/components/SelectChainItem.tsx
index b51e5b5f945..b3f968101bb 100644
--- a/src/ui/component/ChainSelector/components/SelectChainItem.tsx
+++ b/src/ui/component/ChainSelector/components/SelectChainItem.tsx
@@ -109,6 +109,7 @@ export const SelectChainItem = forwardRef(
                         ? customRPC[data.enum].url
                         : ''
                     }
+                    showCustomRPCToolTip
                   />
                 ) : (
                   <img
diff --git a/src/ui/views/Approval/components/AddAsset.tsx b/src/ui/views/Approval/components/AddAsset.tsx
index ae8e95287f1..2436208a71c 100644
--- a/src/ui/views/Approval/components/AddAsset.tsx
+++ b/src/ui/views/Approval/components/AddAsset.tsx
@@ -564,6 +564,7 @@ const AddAsset = ({ params }: { params: AddAssetProps }) => {
             onChange={handleChainChanged}
             onCancel={() => rejectApproval('User rejected the request.')}
             disabledTips={t('page.addToken.noTokenFoundOnThisChain')}
+            showRPCStatus
           />
         </div>
       </AddAssetWrapper>
diff --git a/src/ui/views/CommonPopup/AssetList/CustomAssetList/AddCustomTokenPopup.tsx b/src/ui/views/CommonPopup/AssetList/CustomAssetList/AddCustomTokenPopup.tsx
index 0d0a16c309b..3db1664a30d 100644
--- a/src/ui/views/CommonPopup/AssetList/CustomAssetList/AddCustomTokenPopup.tsx
+++ b/src/ui/views/CommonPopup/AssetList/CustomAssetList/AddCustomTokenPopup.tsx
@@ -422,6 +422,7 @@ export const AddCustomTokenPopup = ({ visible, onClose, onConfirm }: Props) => {
         hideTestnetTab
         hideMainnetTab={false}
         visible={chainSelectorState.visible}
+        showRPCStatus
         onCancel={() => {
           setChainSelectorState({
             visible: false,
diff --git a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
index ce8dafbf486..f89163ebdd2 100644
--- a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
+++ b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
@@ -367,6 +367,7 @@ export const AddCustomTestnetTokenPopup = ({
             visible: false,
           });
         }}
+        showRPCStatus
         onChange={(value) => {
           setChainSelectorState({
             visible: false,
diff --git a/src/ui/views/Dashboard/components/ChainAndSiteSelector/index.tsx b/src/ui/views/Dashboard/components/ChainAndSiteSelector/index.tsx
index 069d4de5ca1..6c821e5a1a7 100644
--- a/src/ui/views/Dashboard/components/ChainAndSiteSelector/index.tsx
+++ b/src/ui/views/Dashboard/components/ChainAndSiteSelector/index.tsx
@@ -417,6 +417,7 @@ export default ({
         className="receive-chain-select-modal"
         value={CHAINS_ENUM.ETH}
         visible={isShowReceiveModal}
+        showRPCStatus
         onChange={(chain) => {
           history.push(`/receive?rbisource=dashboard&chain=${chain}`);
           setIsShowReceiveModal(false);