diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
index 7cb2c27f..1eec4920 100644
--- a/src/background/controller/wallet.ts
+++ b/src/background/controller/wallet.ts
@@ -1614,21 +1614,27 @@ export class WalletController extends BaseController {
     } else {
       // Transform the address array into blockchain objects
       transformedArray = address.map((item, index) => {
+        const defaultEmoji = emoji[index] || {
+          name: 'Default',
+          emoji: '🐾',
+          bgcolor: '#ffffff',
+        };
+
         return {
           id: 0,
-          name: emoji[index].name,
+          name: defaultEmoji.name,
           chain_id: network,
-          icon: emoji[index].emoji,
-          color: emoji[index].bgcolor,
+          icon: defaultEmoji.emoji,
+          color: defaultEmoji.bgcolor,
           blockchain: [
             {
               id: index,
-              name: emoji[index].name,
+              name: defaultEmoji.name,
               chain_id: network,
               address: item.address,
               coins: ['flow'],
-              icon: emoji[index].emoji,
-              color: emoji[index].bgcolor,
+              icon: defaultEmoji.emoji,
+              color: defaultEmoji.bgcolor,
             },
           ],
         };
@@ -4014,20 +4020,6 @@ export class WalletController extends BaseController {
   };
 
   getEmoji = async () => {
-    const currentId = await storage.get('currentId');
-    // let emojires = await storage.get(`${currentId}emoji`)
-    // if (!emojires) {
-    //   const index1 = Math.floor(Math.random() * emoji.emojis.length);
-    //   let index2;
-
-    //   do {
-    //     index2 = Math.floor(Math.random() * emoji.emojis.length);
-    //   } while (index1 === index2);
-
-    //   emojires = [emoji.emojis[index1], emoji.emojis[index2]];
-    //   storage.set(`${currentId}emoji`, emojires)
-    // }
-
     return emoji.emojis;
   };
 
diff --git a/src/ui/views/Dashboard/Header.tsx b/src/ui/views/Dashboard/Header.tsx
index 15354674..456f23f5 100644
--- a/src/ui/views/Dashboard/Header.tsx
+++ b/src/ui/views/Dashboard/Header.tsx
@@ -618,7 +618,7 @@ const Header = ({ loading = false }) => {
 
   const createWalletList = (props) => {
     return (
-      <List component="nav" key={props.id} sx={{ pb: '0', mb: '0' }}>
+      <List component="nav" key={props.id} sx={{ mb: '0', padding: 0 }}>
         <WalletFunction
           props_id={props.id}
           name={props.name}
diff --git a/src/ui/views/Setting/Wallet/WalletDetail.tsx b/src/ui/views/Setting/Wallet/WalletDetail.tsx
index 2830affb..67e781f3 100644
--- a/src/ui/views/Setting/Wallet/WalletDetail.tsx
+++ b/src/ui/views/Setting/Wallet/WalletDetail.tsx
@@ -294,7 +294,6 @@ const WalletDetail = () => {
     const savedWallet = await storage.get('walletDetail');
     const walletDetail = JSON.parse(savedWallet);
     if (walletDetail) {
-      console.log('walletDetail ', walletDetail);
       setWallet([walletDetail.wallet]);
       const selectingEmoji = {};
       selectingEmoji['name'] = walletDetail.wallet.name;