diff --git a/packages/mask/content-script/components/InjectedComponents/ToolboxUnstyled.tsx b/packages/mask/content-script/components/InjectedComponents/ToolboxUnstyled.tsx
index 3fa32fa75a6b..31098d7b846d 100644
--- a/packages/mask/content-script/components/InjectedComponents/ToolboxUnstyled.tsx
+++ b/packages/mask/content-script/components/InjectedComponents/ToolboxUnstyled.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { useCallback, type HTMLProps } from 'react'
 import {
     CircularProgress,
     type ListItemButtonProps,
@@ -44,7 +44,7 @@ const useStyles = makeStyles()(() => ({
     },
 }))
 
-interface ToolboxHintProps {
+interface ToolboxHintProps extends HTMLProps<HTMLDivElement> {
     Container?: React.ComponentType<React.PropsWithChildren>
     ListItemButton?: React.ComponentType<Pick<ListItemButtonProps, 'onClick' | 'children'>>
     ListItemText?: React.ComponentType<Pick<ListItemTextProps, 'primary'>>
@@ -69,6 +69,7 @@ function ToolboxHintForApplication(props: ToolboxHintProps) {
         iconSize = 24,
         mini,
         ListItemText = MuiListItemText,
+        ...rest
     } = props
     const { classes } = useStyles()
 
@@ -76,7 +77,7 @@ function ToolboxHintForApplication(props: ToolboxHintProps) {
 
     return (
         <GuideStep step={1} total={4} tip={<Trans>Explore multi-chain dApps.</Trans>}>
-            <Container>
+            <Container {...rest}>
                 <ListItemButton onClick={openApplicationBoardDialog}>
                     <ListItemIcon>
                         <Icons.MaskBlue size={iconSize} />
@@ -113,6 +114,7 @@ function ToolboxHintForWallet(props: ToolboxHintProps) {
         iconSize = 24,
         badgeSize = 12,
         mini,
+        ...rest
     } = props
     const { classes } = useStyles()
     const { onClickToolbox, title, chainColor, shouldDisplayChainIndicator, account, provider } = useToolbox()
@@ -121,7 +123,7 @@ function ToolboxHintForWallet(props: ToolboxHintProps) {
 
     return (
         <GuideStep step={2} total={4} tip={<Trans>Connect and switch between your wallets.</Trans>}>
-            <Container>
+            <Container {...rest}>
                 <ListItemButton onClick={onClickToolbox}>
                     <ListItemIcon>
                         {account && provider && provider.type !== ProviderType.MaskWallet ?
diff --git a/packages/mask/content-script/site-adaptors/minds.com/injection/ToolboxHint_UI.tsx b/packages/mask/content-script/site-adaptors/minds.com/injection/ToolboxHint_UI.tsx
index 38c12f95e03e..ccadea0a9a9f 100644
--- a/packages/mask/content-script/site-adaptors/minds.com/injection/ToolboxHint_UI.tsx
+++ b/packages/mask/content-script/site-adaptors/minds.com/injection/ToolboxHint_UI.tsx
@@ -1,5 +1,6 @@
+import type { CSSProperties } from 'react'
 import { ToolboxHintUnstyled } from '../../../components/InjectedComponents/ToolboxUnstyled.js'
-import { styled, ListItemButton, Typography, ListItemIcon, useMediaQuery } from '@mui/material'
+import { styled, ListItemButton, Typography, ListItemIcon, useMediaQuery, useTheme } from '@mui/material'
 
 const mindsBreakPoint = 1221 /** px */
 
@@ -12,15 +13,19 @@ const Item = styled(ListItemButton)`
     border-radius: 8px;
     height: 45px;
     padding: 4px 12px 4px 0;
-    color: #43434d !important;
+    color: var(--nav-text-color, #43434d) !important;
     &:hover {
         background: unset;
-        color: #43434d;
+        color: var(--nav-text-color, #43434d);
     }
     [data-icon] {
         color: #43434d;
         --icon-color: #43434d;
     }
+    [data-icon='Wallet'] {
+        color: var(--nav-text-color, #43434d);
+        --icon-color: var(--nav-text-color, #43434d);
+    }
     @media screen and (max-width: ${mindsBreakPoint}px) {
         padding: 12px 0;
         justify-content: center;
@@ -47,9 +52,15 @@ const Icon = styled(ListItemIcon)`
 
 export function ToolboxHintAtMinds(props: { category: 'wallet' | 'application' }) {
     const mini = useMediaQuery(`(max-width: ${mindsBreakPoint}px)`)
+    const theme = useTheme()
 
     return (
         <ToolboxHintUnstyled
+            style={
+                {
+                    '--nav-text-color': theme.palette.mode === 'dark' ? '#fff' : '#43434d',
+                } as CSSProperties
+            }
             mini={mini}
             Container={Container}
             ListItemButton={Item}
diff --git a/packages/mask/popups/pages/Friends/ContactCard/ConnectedAccounts/index.tsx b/packages/mask/popups/pages/Friends/ContactCard/ConnectedAccounts/index.tsx
index 51cd54453b07..02de61ee13a1 100644
--- a/packages/mask/popups/pages/Friends/ContactCard/ConnectedAccounts/index.tsx
+++ b/packages/mask/popups/pages/Friends/ContactCard/ConnectedAccounts/index.tsx
@@ -56,10 +56,10 @@ export const ConnectedAccounts = memo<ConnectedAccountsProps>(function ({
             height="58px"
             className={classes.connectedAccounts}
             width="100%">
-            {profiles?.slice(0, 2).map((profile, index) => {
+            {profiles?.slice(0, 2).map((profile) => {
                 return (
                     <AccountRender
-                        key={index}
+                        key={profile.identity}
                         profile={profile}
                         avatar={localProfile?.userId === (profile.name ?? profile.identity) ? avatar : ''}
                     />
diff --git a/packages/mask/popups/pages/Friends/ContactCard/SocialAccount/index.tsx b/packages/mask/popups/pages/Friends/ContactCard/SocialAccount/index.tsx
index dc8fe6bbaef1..43ba13b18884 100644
--- a/packages/mask/popups/pages/Friends/ContactCard/SocialAccount/index.tsx
+++ b/packages/mask/popups/pages/Friends/ContactCard/SocialAccount/index.tsx
@@ -44,7 +44,7 @@ export const SocialAccount = memo<SocialAccountProps>(function SocialAccount({ a
     const isOnTwitter = site === EnhanceableSite.Twitter
     const { data: twitterAvatar = avatar } = useQuery({
         enabled: isOnTwitter && !avatar,
-        queryKey: ['social-account-avatar', site, avatar],
+        queryKey: ['social-account-avatar', site, avatar, userId],
         queryFn: async () => {
             const userInfo = await FireflyTwitter.getUserInfo(userId)
             return userInfo?.legacy.profile_image_url_https
diff --git a/packages/plugins/Avatar/src/Application/NFTListDialog.tsx b/packages/plugins/Avatar/src/Application/NFTListDialog.tsx
index 483fb45c851c..b5c3e87ebec8 100644
--- a/packages/plugins/Avatar/src/Application/NFTListDialog.tsx
+++ b/packages/plugins/Avatar/src/Application/NFTListDialog.tsx
@@ -128,7 +128,7 @@ export function NFTListDialog() {
     const handleAddCollectibles = useCallback(async () => {
         const results = await AddCollectiblesModal.openAndWaitForClose({
             pluginID,
-            chainId: assetChainId,
+            chainId: assetChainId || chainId,
             account: targetAccount,
         })
         if (!results || !assetChainId) return
@@ -162,7 +162,7 @@ export function NFTListDialog() {
         setTokens((originalTokens) => {
             return uniqBy([...originalTokens, ...tokens], (x) => `${x.contract?.address}.${x.tokenId}`)
         })
-    }, [pluginID, assetChainId, targetAccount])
+    }, [pluginID, assetChainId, chainId, targetAccount])
 
     useEffect(() => {
         const unsubscribe = emitter.on('add', handleAddCollectibles)
diff --git a/packages/shared/src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx b/packages/shared/src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
index 6627960da8c2..63454e574ea6 100644
--- a/packages/shared/src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+++ b/packages/shared/src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
@@ -17,7 +17,9 @@ const useStyles = makeStyles()((theme) => ({
         gridTemplateColumns: 'repeat(auto-fill, minmax(20%, 1fr))',
     },
     sidebar: {
-        marginLeft: theme.spacing(1),
+        paddingLeft: 12,
+        paddingTop: 12,
+        paddingRight: 4,
     },
     form: {
         flexGrow: 1,
@@ -41,7 +43,11 @@ export const AddCollectiblesDialog = memo(function AddCollectiblesDialog({
     const allNetworks = useNetworks(pluginID, true)
 
     return (
-        <InjectedDialog titleBarIconStyle={'back'} open={open} onClose={() => onAdd()} title={<Trans>Add NFTs</Trans>}>
+        <InjectedDialog
+            titleBarIconStyle={'back'}
+            open={open}
+            onClose={() => onAdd()}
+            title={<Trans>Add Collectibles</Trans>}>
             <DialogContent classes={{ root: classes.content }}>
                 <SelectNetworkSidebar
                     className={classes.sidebar}
@@ -49,6 +55,7 @@ export const AddCollectiblesDialog = memo(function AddCollectiblesDialog({
                     onChainChange={setChainId}
                     pluginID={pluginID}
                     networks={allNetworks}
+                    hideAllButton
                 />
                 <AddCollectibles
                     className={classes.form}
diff --git a/packages/shared/src/locale/en-US.json b/packages/shared/src/locale/en-US.json
index 4baa8a3f2d14..bc2d8886ded5 100644
--- a/packages/shared/src/locale/en-US.json
+++ b/packages/shared/src/locale/en-US.json
@@ -31,6 +31,7 @@
         "GXhrYw": ["1. If you haven't installed the ", ["name"], " Wallet"],
         "M7ZGdw": ["2. If you have installed the ", ["name"], " Wallet"],
         "Axp2cZ": "24 Hour Trading Vol",
+        "9+VwX/": "Add Collectibles",
         "XA8JXM": "Add NFTs",
         "uv94aG": "Added by user",
         "Du6bPw": "Address",
diff --git a/packages/shared/src/locale/en-US.po b/packages/shared/src/locale/en-US.po
index 3690748e32de..467e39561e84 100644
--- a/packages/shared/src/locale/en-US.po
+++ b/packages/shared/src/locale/en-US.po
@@ -113,8 +113,11 @@ msgstr ""
 msgid "24 Hour Trading Vol"
 msgstr ""
 
-#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+msgid "Add Collectibles"
+msgstr ""
+
+#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
 msgid "Add NFTs"
 msgstr ""
diff --git a/packages/shared/src/locale/ja-JP.json b/packages/shared/src/locale/ja-JP.json
index f515a4d64a9a..8fa36c462441 100644
--- a/packages/shared/src/locale/ja-JP.json
+++ b/packages/shared/src/locale/ja-JP.json
@@ -31,6 +31,7 @@
         "GXhrYw": ["1. If you haven't installed the ", ["name"], " Wallet"],
         "M7ZGdw": ["2. If you have installed the ", ["name"], " Wallet"],
         "Axp2cZ": "24時間取引Vol",
+        "9+VwX/": "Add Collectibles",
         "XA8JXM": "コレクティブルを追加",
         "uv94aG": "ユーザーによって追加",
         "Du6bPw": "アドレス",
diff --git a/packages/shared/src/locale/ja-JP.po b/packages/shared/src/locale/ja-JP.po
index b3a1886de64d..40586ede86b7 100644
--- a/packages/shared/src/locale/ja-JP.po
+++ b/packages/shared/src/locale/ja-JP.po
@@ -118,8 +118,11 @@ msgstr ""
 msgid "24 Hour Trading Vol"
 msgstr "24時間取引Vol"
 
-#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+msgid "Add Collectibles"
+msgstr ""
+
+#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
 msgid "Add NFTs"
 msgstr "コレクティブルを追加"
diff --git a/packages/shared/src/locale/ko-KR.json b/packages/shared/src/locale/ko-KR.json
index fdb36eac7f05..11eed4ed78eb 100644
--- a/packages/shared/src/locale/ko-KR.json
+++ b/packages/shared/src/locale/ko-KR.json
@@ -31,6 +31,7 @@
         "GXhrYw": ["1. If you haven't installed the ", ["name"], " Wallet"],
         "M7ZGdw": ["2. If you have installed the ", ["name"], " Wallet"],
         "Axp2cZ": "24 시간 거래량",
+        "9+VwX/": "Add Collectibles",
         "XA8JXM": "NFT 추가",
         "uv94aG": "사용자별 추가",
         "Du6bPw": "주소",
diff --git a/packages/shared/src/locale/ko-KR.po b/packages/shared/src/locale/ko-KR.po
index 886114075737..29d4ef19e0bd 100644
--- a/packages/shared/src/locale/ko-KR.po
+++ b/packages/shared/src/locale/ko-KR.po
@@ -118,8 +118,11 @@ msgstr ""
 msgid "24 Hour Trading Vol"
 msgstr "24 시간 거래량"
 
-#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+msgid "Add Collectibles"
+msgstr ""
+
+#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
 msgid "Add NFTs"
 msgstr "NFT 추가"
diff --git a/packages/shared/src/locale/zh-CN.json b/packages/shared/src/locale/zh-CN.json
index a2f5203c622e..09922f528961 100644
--- a/packages/shared/src/locale/zh-CN.json
+++ b/packages/shared/src/locale/zh-CN.json
@@ -31,6 +31,7 @@
         "GXhrYw": ["1. If you haven't installed the ", ["name"], " Wallet"],
         "M7ZGdw": ["2. If you have installed the ", ["name"], " Wallet"],
         "Axp2cZ": "24h 交易总额",
+        "9+VwX/": "Add Collectibles",
         "XA8JXM": "添加 NFT",
         "uv94aG": "由用户添加",
         "Du6bPw": "地址",
diff --git a/packages/shared/src/locale/zh-CN.po b/packages/shared/src/locale/zh-CN.po
index 018c51c9c200..ffa06a3e4400 100644
--- a/packages/shared/src/locale/zh-CN.po
+++ b/packages/shared/src/locale/zh-CN.po
@@ -118,8 +118,11 @@ msgstr ""
 msgid "24 Hour Trading Vol"
 msgstr "24h 交易总额"
 
-#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+msgid "Add Collectibles"
+msgstr ""
+
+#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
 msgid "Add NFTs"
 msgstr "添加 NFT"
diff --git a/packages/shared/src/locale/zh-TW.json b/packages/shared/src/locale/zh-TW.json
index 09e936ea9b0f..27837b2fb69d 100644
--- a/packages/shared/src/locale/zh-TW.json
+++ b/packages/shared/src/locale/zh-TW.json
@@ -31,6 +31,7 @@
         "GXhrYw": ["1. If you haven't installed the ", ["name"], " Wallet"],
         "M7ZGdw": ["2. If you have installed the ", ["name"], " Wallet"],
         "Axp2cZ": "24h 交易总额",
+        "9+VwX/": "Add Collectibles",
         "XA8JXM": "添加 NFT",
         "uv94aG": "由用户添加",
         "Du6bPw": "地址",
diff --git a/packages/shared/src/locale/zh-TW.po b/packages/shared/src/locale/zh-TW.po
index ff4410067a85..e9f80b7443a2 100644
--- a/packages/shared/src/locale/zh-TW.po
+++ b/packages/shared/src/locale/zh-TW.po
@@ -118,8 +118,11 @@ msgstr ""
 msgid "24 Hour Trading Vol"
 msgstr ""
 
-#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/AddCollectiblesModal/AddCollectiblesDialog.tsx
+msgid "Add Collectibles"
+msgstr ""
+
+#: src/UI/components/AddCollectibles/index.tsx
 #: src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
 msgid "Add NFTs"
 msgstr ""