diff --git a/packages/extension/package.json b/packages/extension/package.json
index adf4328ff..b3af75bf9 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/extension/src/libs/recently-sent-addresses/index.ts b/packages/extension/src/libs/recently-sent-addresses/index.ts
new file mode 100644
index 000000000..73f9a56ed
--- /dev/null
+++ b/packages/extension/src/libs/recently-sent-addresses/index.ts
@@ -0,0 +1,41 @@
+import { InternalStorageNamespace } from "@/types/provider";
+import BrowserStorage from "../common/browser-storage";
+import { IState, } from "./types";
+import { NetworkNames } from "@enkryptcom/types";
+import { BaseNetwork } from "@/types/base-network";
+
+class RecentlySentAddressesState {
+  #storage: BrowserStorage
+
+  constructor() {
+    this.#storage = new BrowserStorage(
+      InternalStorageNamespace.recentlySentAddresses,
+    );
+  }
+
+  async addRecentlySentAddress(
+    network: Pick<BaseNetwork, 'name' | 'displayAddress'>,
+    address: string,
+  ): Promise<void> {
+    const key = network.name
+    const state: IState | undefined = await this.#storage.get(key)
+    const newState: IState = {
+      ...state,
+      addresses: Array.from(new Set([
+        network.displayAddress(address),
+        ...(state?.addresses ?? []),
+      ])).slice(0, 5),
+    }
+    await this.#storage.set(key, newState)
+  }
+
+  async getRecentlySentAddresses(networkName: NetworkNames): Promise<string[]> {
+    const key = networkName
+    const out: IState | undefined = await this.#storage.get(key)
+    if (!out) return []
+    return out.addresses
+  }
+}
+
+export default RecentlySentAddressesState
+
diff --git a/packages/extension/src/libs/recently-sent-addresses/types.ts b/packages/extension/src/libs/recently-sent-addresses/types.ts
new file mode 100644
index 000000000..44976940a
--- /dev/null
+++ b/packages/extension/src/libs/recently-sent-addresses/types.ts
@@ -0,0 +1,3 @@
+export type IState = {
+  addresses: string[]
+}
diff --git a/packages/extension/src/libs/utils/networks.ts b/packages/extension/src/libs/utils/networks.ts
index 6bbe422bc..7634ac299 100644
--- a/packages/extension/src/libs/utils/networks.ts
+++ b/packages/extension/src/libs/utils/networks.ts
@@ -75,12 +75,13 @@ const DEFAULT_SOLANA_NETWORK = Solana;
 const POPULAR_NAMES = [
   NetworkNames.Bitcoin,
   NetworkNames.Ethereum,
+  NetworkNames.Solana,
   NetworkNames.Matic,
   NetworkNames.Polkadot,
   NetworkNames.Binance,
   NetworkNames.Rootstock,
   NetworkNames.Optimism,
-  NetworkNames.Kadena,
+  NetworkNames.Arbitrum,
 ];
 export {
   getAllNetworks,
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/components/send-alert.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/components/send-alert.vue
index 8ba300e2c..e62d46777 100644
--- a/packages/extension/src/providers/bitcoin/ui/send-transaction/components/send-alert.vue
+++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/components/send-alert.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="send-alert">
     <alert-icon />
-    <p v-if="belowDust">Minimum amount: {{ dust }}</p>
+    <p v-if="isBalanceZero">Not enough balance.</p>
+    <p v-else-if="belowDust">Minimum amount: {{ dust }}</p>
     <p v-else-if="notEnough">
       Not enough funds. You are<br />~{{
         $filters.formatFloatingPointValue(nativeValue).value
@@ -24,6 +25,7 @@ interface IProps {
   price?: string;
   notEnough: boolean;
   belowDust: boolean;
+  isBalanceZero: boolean;
   dust: string;
 }
 
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
index 66138e361..bb8003b1c 100644
--- a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
@@ -96,6 +96,7 @@
         "
         :native-symbol="network.name"
         :price="selectedAsset.price || '0'"
+        :is-balance-zero="UTXOBalance.isZero()"
         :native-value="
           fromBase(
             nativeBalanceAfterTransaction.abs().toString(),
@@ -168,6 +169,7 @@ import { getTxInfo as getBTCTxInfo } from '@/providers/bitcoin/libs/utils';
 import { NFTItem, NFTItemWithCollectionName, NFTType } from '@/types/nft';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -313,8 +315,8 @@ const isInputsValid = computed<boolean>(() => {
   )
     return false;
 
-  const sendAmountBigNumber = new BigNumber(sendAmount.value)
-  if (sendAmountBigNumber.isNaN()) return false
+  const sendAmountBigNumber = new BigNumber(sendAmount.value);
+  if (sendAmountBigNumber.isNaN()) return false;
   if (sendAmountBigNumber.gt(assetMaxValue.value)) return false;
   return true;
 });
@@ -427,7 +429,14 @@ const selectNFT = (item: NFTItemWithCollectionName) => {
   isOpenSelectNft.value = false;
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(addressFrom.value);
   const currentFee = toBN(
diff --git a/packages/extension/src/providers/common/libs/new-features.ts b/packages/extension/src/providers/common/libs/new-features.ts
index 1c63677fc..189011b41 100644
--- a/packages/extension/src/providers/common/libs/new-features.ts
+++ b/packages/extension/src/providers/common/libs/new-features.ts
@@ -1,6 +1,6 @@
 import { NetworkNames } from '@enkryptcom/types';
 
 const newNetworks = [NetworkNames.Bitrock, NetworkNames.Fraxtal];
-const newSwaps: NetworkNames[] = [NetworkNames.Dogecoin];
+const newSwaps: NetworkNames[] = [];
 
 export { newNetworks, newSwaps };
diff --git a/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue b/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
index 06e126c82..4d5f9f9d3 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
@@ -1,22 +1,14 @@
 <template>
   <a class="nft-select-list__token" @click="$emit('selectNft', item)">
     <div class="nft-select-list__token-info">
-      <img :src="item.image" />
+      <img :src="item.image" @error="imageLoadError" />
 
       <div class="nft-select-list__token-info-name">
         <h4>
-          {{
-            item.name.length > 40
-              ? item.name.substring(0, 40) + '...'
-              : item.name
-          }}
+          {{ $filters.truncate(item.name, 25) }}
         </h4>
         <p>
-          {{
-            item.collectionName.length > 50
-              ? item.collectionName.substring(0, 50) + '...'
-              : item.collectionName
-          }}
+          {{ $filters.truncate(item.collectionName, 50) }}
         </p>
       </div>
     </div>
@@ -26,6 +18,7 @@
 <script setup lang="ts">
 import { PropType } from 'vue';
 import { NFTItemWithCollectionName } from '@/types/nft';
+import { imageLoadError } from '@/ui/action/utils/misc';
 
 defineEmits<{
   (e: 'selectNft', data: NFTItemWithCollectionName): void;
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue b/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
index cb940ce1e..8c845e78c 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
@@ -7,7 +7,7 @@
       <img :src="network.identicon(network.displayAddress(account.address))" />
 
       <div class="send-address-item__name">
-        <h4>{{ account.name }}</h4>
+        <h4 v-if="account.name != null">{{ account.name }}</h4>
         <p>
           {{
             $filters.replaceWithEllipsis(
@@ -32,13 +32,17 @@ import { EnkryptAccount } from '@enkryptcom/types';
 const emit = defineEmits<{
   (e: 'selected:account', address: string): void;
 }>();
+
 defineProps({
   network: {
     type: Object as PropType<BaseNetwork>,
     default: () => ({}),
   },
   account: {
-    type: Object as PropType<EnkryptAccount>,
+    type: Object as PropType<{
+      name?: string;
+      address: string;
+    }>,
     default: () => {
       return {};
     },
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue b/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
index b44d3f578..9826bf675 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
@@ -9,7 +9,10 @@
         class="send-contacts-list__scroll-area"
         :settings="scrollSettings({ suppressScrollX: true })"
       >
-        <div v-if="!isMyAddress" class="send-contacts-list__block">
+        <div
+          v-if="recentlySentAddresses && !isMyAddress"
+          class="send-contacts-list__block"
+        >
           <div class="send-contacts-list__buttons">
             <base-button title="Send to my address" :click="sendToMyAddress" />
 
@@ -20,7 +23,31 @@
               <paste-icon /> Paste
             </a>
           </div>
-          <h3>Recent</h3>
+          <template v-if="recentlySentAddresses.length">
+            <h3>Recent</h3>
+            <div class="send-contacts-list__list">
+              <send-address-item
+                v-for="(recentAddress, index) in recentlySentAddresses"
+                :key="index"
+                :account="{
+                  address: recentAddress,
+                  name: accountInfo.activeAccounts.find(
+                    account =>
+                      network.displayAddress(account.address) ===
+                      network.displayAddress(recentAddress),
+                  )?.name,
+                }"
+                :network="network"
+                v-bind="$attrs"
+                :is-checked="
+                  !!address &&
+                  network.displayAddress(address) ===
+                    network.displayAddress(recentAddress)
+                "
+              />
+            </div>
+          </template>
+          <h3>My accounts</h3>
           <div class="send-contacts-list__list">
             <send-address-item
               v-for="(account, index) in accountInfo.activeAccounts"
@@ -28,7 +55,11 @@
               :account="account"
               :network="network"
               v-bind="$attrs"
-              :is-checked="address == account.address"
+              :is-checked="
+                !!address &&
+                network.displayAddress(address) ===
+                  network.displayAddress(account.address)
+              "
             />
           </div>
         </div>
@@ -39,7 +70,6 @@
             </a>
             <h4>My accounts</h4>
           </div>
-
           <div class="send-contacts-list__list">
             <send-address-item
               v-for="(account, index) in accountInfo.activeAccounts"
@@ -47,7 +77,11 @@
               :account="account"
               :network="network"
               v-bind="$attrs"
-              :is-checked="address == account.address"
+              :is-checked="
+                !!address &&
+                network.displayAddress(address) ===
+                  network.displayAddress(account.address)
+              "
             />
           </div>
         </div>
@@ -57,7 +91,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, ref } from 'vue';
+import { onMounted, PropType, ref } from 'vue';
 import SendAddressItem from './send-address-item.vue';
 import CustomScrollbar from '@action/components/custom-scrollbar/index.vue';
 import BaseButton from '@action/components/base-button/index.vue';
@@ -66,6 +100,7 @@ import scrollSettings from '@/libs/utils/scroll-settings';
 import { BaseNetwork } from '@/types/base-network';
 import PasteIcon from '@action/icons/actions/paste.vue';
 import ArrowBack from '@action/icons/common/arrow-back.vue';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const emit = defineEmits<{
   (e: 'update:pasteFromClipboard'): void;
@@ -74,7 +109,7 @@ const emit = defineEmits<{
 
 const isMyAddress = ref(false);
 
-defineProps({
+const props = defineProps({
   showAccounts: Boolean,
   accountInfo: {
     type: Object as PropType<AccountsHeaderData>,
@@ -90,6 +125,36 @@ defineProps({
   },
 });
 
+const recentlySentAddressesState = new RecentlySentAddressesState();
+
+const recentlySentAddresses = ref<null | string[]>(null);
+
+onMounted(async function () {
+  let timedOut = false;
+  const timeout = setTimeout(function () {
+    console.error('Timed out getting recently sent addresses');
+    recentlySentAddresses.value = [];
+    timedOut = true;
+  }, 500);
+  try {
+    const addresses = await recentlySentAddressesState.getRecentlySentAddresses(
+      props.network.name,
+    );
+    if (!timedOut) {
+      recentlySentAddresses.value = Array.from(
+        new Set(
+          addresses.map(address => props.network.displayAddress(address)),
+        ),
+      );
+    }
+  } catch (err) {
+    console.error('Error getting recently sent addresses', err);
+    recentlySentAddresses.value = [];
+  } finally {
+    clearTimeout(timeout);
+  }
+});
+
 const close = () => {
   emit('close', false);
 };
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue b/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
index 809fcbb3d..82df0bd42 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
@@ -2,22 +2,14 @@
   <div class="send-nft-select__wrap">
     <a class="send-nft-select" @click="$emit('toggleSelect', item.id !== '')">
       <div class="send-nft-select__image">
-        <img v-if="item.image !== ''" :src="item.image" alt="" />
+        <img :src="item.image" alt="" @error="imageLoadError" />
       </div>
       <div class="send-nft-select__info">
         <h5>
-          {{
-            item.name.length > 25
-              ? item.name.substring(0, 25) + '...'
-              : item.name
-          }}
+          {{ $filters.truncate(item.name, 25) }}
         </h5>
         <p>
-          {{
-            item.collectionName.length > 50
-              ? item.collectionName.substring(0, 50) + '...'
-              : item.collectionName
-          }}
+          {{ $filters.truncate(item.collectionName, 50) }}
         </p>
       </div>
 
@@ -43,6 +35,7 @@
 import { PropType } from 'vue';
 import SwitchArrow from '@action/icons/header/switch_arrow.vue';
 import { NFTItemWithCollectionName } from '@/types/nft';
+import { imageLoadError } from '@/ui/action/utils/misc';
 
 defineEmits<{
   (e: 'toggleSelect', val: boolean): void;
diff --git a/packages/extension/src/providers/ethereum/libs/api.ts b/packages/extension/src/providers/ethereum/libs/api.ts
index a923daf42..9e8f34a09 100644
--- a/packages/extension/src/providers/ethereum/libs/api.ts
+++ b/packages/extension/src/providers/ethereum/libs/api.ts
@@ -76,6 +76,7 @@ class API implements ProviderAPIInterface {
         name: 'Unknown',
         symbol: 'UNKNWN',
         decimals: 18,
+        icon: undefined,
       };
     }
   };
diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
index 85803b768..5ff6cc7e1 100644
--- a/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
+++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
@@ -231,7 +231,6 @@ export default (
       (obj, cur) => ({ ...obj, [cur.contract]: cur }),
       {},
     );
-
     const marketData = new MarketData();
 
     const marketInfo = supportedNetworks[networkName].cgPlatform
@@ -336,7 +335,10 @@ export default (
             balancef: formatFloatingPointValue(userBalance).value,
             balanceUSD: 0,
             balanceUSDf: formatFiatValue('0').value,
-            icon: tokenInfo[unknownTokens[idx]]?.logoURI || network.icon,
+            icon:
+              tokenInfo[unknownTokens[idx]]?.logoURI ||
+              tInfo.icon ||
+              network.icon,
             name: tInfo.name,
             symbol: tInfo.symbol,
             value: '0',
@@ -350,7 +352,6 @@ export default (
         });
       });
     }
-
     return assets;
   });
 };
diff --git a/packages/extension/src/providers/ethereum/networks/arb-nova.ts b/packages/extension/src/providers/ethereum/networks/arb-nova.ts
index 527404a50..7c299eb0d 100644
--- a/packages/extension/src/providers/ethereum/networks/arb-nova.ts
+++ b/packages/extension/src/providers/ethereum/networks/arb-nova.ts
@@ -3,6 +3,7 @@ import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const arbNovaOptions: EvmNetworkOptions = {
   name: NetworkNames.ArbitrumNova,
@@ -20,7 +21,7 @@ const arbNovaOptions: EvmNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.ArbitrumNova,
   assetsInfoHandler,
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const arb = new EvmNetwork(arbNovaOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/bsc.ts b/packages/extension/src/providers/ethereum/networks/bsc.ts
index 1c39b730f..7eaebd53c 100644
--- a/packages/extension/src/providers/ethereum/networks/bsc.ts
+++ b/packages/extension/src/providers/ethereum/networks/bsc.ts
@@ -23,7 +23,7 @@ const bscOptions: EvmNetworkOptions = {
   basePath: "m/44'/714'",
   NFTHandler: shNFTHandler,
   assetsInfoHandler,
-  activityHandler: wrapActivityHandler(EtherscanActivity),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const bsc = new EvmNetwork(bscOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/holesky.ts b/packages/extension/src/providers/ethereum/networks/holesky.ts
index f15cb90cd..cf5eac096 100644
--- a/packages/extension/src/providers/ethereum/networks/holesky.ts
+++ b/packages/extension/src/providers/ethereum/networks/holesky.ts
@@ -1,6 +1,7 @@
 import icon from './icons/eth.svg';
 import { NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const holeskyOptions: EvmNetworkOptions = {
   name: NetworkNames.Holesky,
@@ -14,7 +15,7 @@ const holeskyOptions: EvmNetworkOptions = {
   currencyNameLong: 'Holesky',
   node: 'wss://nodes.mewapi.io/ws/holesky',
   icon,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const holesky = new EvmNetwork(holeskyOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/op-bnb.ts b/packages/extension/src/providers/ethereum/networks/op-bnb.ts
index 330ad7a63..a76288bac 100644
--- a/packages/extension/src/providers/ethereum/networks/op-bnb.ts
+++ b/packages/extension/src/providers/ethereum/networks/op-bnb.ts
@@ -3,6 +3,7 @@ import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const opBnbOptions: EvmNetworkOptions = {
   name: NetworkNames.OpBNB,
@@ -20,7 +21,7 @@ const opBnbOptions: EvmNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.OpBNB,
   assetsInfoHandler,
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const op = new EvmNetwork(opBnbOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/palm.ts b/packages/extension/src/providers/ethereum/networks/palm.ts
index 9b3e66fcf..12f2d37c7 100644
--- a/packages/extension/src/providers/ethereum/networks/palm.ts
+++ b/packages/extension/src/providers/ethereum/networks/palm.ts
@@ -2,6 +2,7 @@ import icon from './icons/palm.svg';
 import { NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 // Palm network has an API but it seems broken (DNS won't resolve)
 // @see https://palm.chainlens.com/api/swagger-ui/index.html
@@ -20,7 +21,7 @@ const palmNetworkOptions: EvmNetworkOptions = {
   icon,
   coingeckoID: 'palm-ai',
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const palmNetwork = new EvmNetwork(palmNetworkOptions);
diff --git a/packages/extension/src/providers/ethereum/types/index.ts b/packages/extension/src/providers/ethereum/types/index.ts
index 87e3522bb..a9ee4d084 100644
--- a/packages/extension/src/providers/ethereum/types/index.ts
+++ b/packages/extension/src/providers/ethereum/types/index.ts
@@ -60,6 +60,7 @@ export interface ERC20TokenInfo {
   name: string;
   symbol: string;
   decimals: number;
+  icon?: string;
 }
 export interface JsonRpcRequest {
   id: string;
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
index 4fd40a1f8..17a4f0bd6 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
@@ -171,6 +171,7 @@ import { GenericNameResolver, CoinType } from '@/libs/name-resolver';
 import { NetworkNames } from '@enkryptcom/types';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -225,6 +226,18 @@ const hasEnoughBalance = computed(() => {
     return false;
   }
 
+  // check if user has enough balance for fees
+  if (
+    toBN(
+      toBase(
+        gasCostValues.value[selectedFee.value].nativeValue,
+        props.network.decimals,
+      ),
+    ).gt(toBN(nativeBalance.value))
+  ) {
+    return false;
+  }
+
   return toBN(selectedAsset.value.balance ?? '0').gte(
     toBN(toBase(sendAmount.value ?? '0', selectedAsset.value.decimals!)),
   );
@@ -451,7 +464,7 @@ const errorMsg = computed(() => {
   }
 
   if (new BigNumber(sendAmount.value).gt(assetMaxValue.value)) {
-    return `Amount exceeds maximum value.`;
+    return `Not enough balance.`;
   }
 
   return '';
@@ -562,8 +575,8 @@ const isInputsValid = computed<boolean>(() => {
   if (!isSendToken.value && !selectedNft.value.id) {
     return false;
   }
-  const sendAmountBigNumber = new BigNumber(sendAmount.value)
-  if (sendAmountBigNumber.isNaN()) return false
+  const sendAmountBigNumber = new BigNumber(sendAmount.value);
+  if (sendAmountBigNumber.isNaN()) return false;
   if (sendAmountBigNumber.gt(assetMaxValue.value)) return false;
   if (gasCostValues.value.REGULAR.nativeValue === '0') return false;
   if (!isNumericPositive(sendAmount.value)) return false;
@@ -710,7 +723,14 @@ const selectFee = (type: GasPriceTypes) => {
     updateTransactionFees(Tx.value);
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(
     addressFrom.value.toLowerCase(),
diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
index e1bd7305c..89ac7c7a0 100644
--- a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
@@ -127,6 +127,7 @@ import getUiPath from '@/libs/utils/get-ui-path';
 import { ProviderName } from '@/types/provider';
 import Browser from 'webextension-polyfill';
 import { ICommandResult } from '@kadena/client';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -322,7 +323,7 @@ const validateFields = async () => {
 
       if (rawAmount.add(rawFee).gt(rawBalance)) {
         fieldsValidation.value.amount = false;
-        errorMsg.value = 'Insufficient funds';
+        errorMsg.value = 'Not enough balance.';
         return;
       }
 
@@ -466,7 +467,14 @@ const isDisabled = computed(() => {
   );
 });
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccount = await keyring.getAccount(addressFrom.value);
   const networkApi = (await props.network.api()) as KadenaAPI;
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
index bae45e7bc..38e6b6320 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
@@ -141,6 +141,7 @@ import { GenericNameResolver, CoinType } from '@/libs/name-resolver';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
 import { BNType } from '@/providers/common/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -497,7 +498,14 @@ const isDisabled = computed(() => {
   return isDisabled;
 });
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const sendAmount = toBase(amount.value!, selectedAsset.value.decimals!);
 
   const sendOptions: SendOptions | undefined = sendMax.value
diff --git a/packages/extension/src/providers/solana/libs/api.ts b/packages/extension/src/providers/solana/libs/api.ts
index 2893cbdae..deffac6de 100644
--- a/packages/extension/src/providers/solana/libs/api.ts
+++ b/packages/extension/src/providers/solana/libs/api.ts
@@ -23,7 +23,7 @@ class API implements ProviderAPIInterface {
     return getSolAddress(pubkey);
   }
 
-  async init(): Promise<void> { }
+  async init(): Promise<void> {}
 
   /**
    * Returns null if the transaction hasn't been received by the node
@@ -33,7 +33,7 @@ class API implements ProviderAPIInterface {
     const tx = await this.web3.getTransaction(hash, {
       maxSupportedTransactionVersion: 0,
       commitment: 'confirmed',
-    })
+    });
 
     if (!tx) {
       // Transaction hasn't been picked up by the node
@@ -66,39 +66,47 @@ class API implements ProviderAPIInterface {
   }
 
   getTokenInfo = async (contractAddress: string): Promise<SPLTokenInfo> => {
-    interface TokenDetails {
-      address: string;
-      decimals: number;
-      name: string;
-      symbol: string;
-      logoURI: string;
-      extensions?: { coingeckoId: string };
-    }
-    const allTokensResponse = await cacheFetch(
+    const tokenResponse: {
+      result?: {
+        token_info: {
+          symbol: string;
+          decimals: number;
+        };
+        content: {
+          files: { uri: string }[];
+          metadata: {
+            name: string;
+            symbol: string;
+          };
+        };
+      };
+    } = await cacheFetch(
       {
-        url: 'https://raw.githubusercontent.com/solflare-wallet/token-list/refs/heads/master/solana-tokenlist.json',
-        postProcess: (data: any) => {
-          const allTokens = data.tokens as TokenDetails[];
-          const tObj: Record<string, TokenDetails> = {};
-          allTokens.forEach(t => {
-            tObj[t.address] = t;
-          });
-          return tObj;
+        url: this.node,
+        post: {
+          jsonrpc: '2.0',
+          id: 1,
+          method: 'getAsset',
+          params: {
+            id: contractAddress,
+          },
         },
       },
       6 * 60 * 60 * 1000,
     );
-    const allTokens = allTokensResponse as Record<string, TokenDetails>;
     let decimals = 9;
-    if (allTokens[contractAddress]) {
+    if (tokenResponse.result) {
       return {
-        name: allTokens[contractAddress].name,
-        symbol: allTokens[contractAddress].symbol,
-        decimals: allTokens[contractAddress].decimals,
-        icon: allTokens[contractAddress].logoURI,
-        cgId: allTokens[contractAddress].extensions?.coingeckoId
-          ? allTokens[contractAddress].extensions?.coingeckoId
-          : undefined,
+        name: tokenResponse.result.content.metadata.name
+          ? tokenResponse.result.content.metadata.name
+          : tokenResponse.result.content.metadata.symbol,
+        symbol: tokenResponse.result.content.metadata.symbol,
+        decimals: tokenResponse.result.token_info.decimals,
+        icon:
+          tokenResponse.result.content.files &&
+          tokenResponse.result.content.files.length > 0
+            ? `https://img.mewapi.io/?image=${tokenResponse.result.content.files[0].uri}`
+            : undefined,
       };
     } else {
       await this.web3
@@ -115,7 +123,6 @@ class API implements ProviderAPIInterface {
       symbol: 'UNKNWN',
       decimals,
       icon: undefined,
-      cgId: undefined,
     };
   };
 }
diff --git a/packages/extension/src/providers/solana/networks/solana.ts b/packages/extension/src/providers/solana/networks/solana.ts
index b11e8c760..e34d3fe9e 100644
--- a/packages/extension/src/providers/solana/networks/solana.ts
+++ b/packages/extension/src/providers/solana/networks/solana.ts
@@ -25,6 +25,6 @@ const solanaOptions: SolanaNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.Solana,
 };
 
-const bitcoin = new SolanaNetwork(solanaOptions);
+const solana = new SolanaNetwork(solanaOptions);
 
-export default bitcoin;
+export default solana;
diff --git a/packages/extension/src/providers/solana/types/sol-token.ts b/packages/extension/src/providers/solana/types/sol-token.ts
index 5a905c673..c86586cf6 100644
--- a/packages/extension/src/providers/solana/types/sol-token.ts
+++ b/packages/extension/src/providers/solana/types/sol-token.ts
@@ -3,10 +3,8 @@ import SolanaAPI from '@/providers/bitcoin/libs/api';
 import { ERC20TokenInfo } from '@/providers/ethereum/types';
 
 export interface SPLTokenInfo extends ERC20TokenInfo {
-  icon: string | undefined;
-  cgId: string | undefined;
+  cgId?: string;
 }
-
 export interface SolTokenOptions extends BaseTokenOptions {
   contract: string;
 }
diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index 0ecf92072..80acc2c6d 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -173,7 +173,7 @@ import {
 import getPriorityFees from '../libs/get-priority-fees';
 import bs58 from 'bs58';
 import SolanaAPI from '@/providers/solana/libs/api';
-import { ComputedRefSymbol } from '@vue/reactivity';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -397,7 +397,7 @@ const errorMsg = computed(() => {
   }
 
   if (new BigNumber(sendAmount.value).gt(assetMaxValue.value)) {
-    return `Amount exceeds maximum value.`;
+    return `Not enough balance.`;
   }
 
   return '';
@@ -718,7 +718,14 @@ const inputAmount = (inputAmount: string) => {
   }
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(
     addressFrom.value.toLowerCase(),
diff --git a/packages/extension/src/types/provider.ts b/packages/extension/src/types/provider.ts
index a50480a27..4d9adafb4 100644
--- a/packages/extension/src/types/provider.ts
+++ b/packages/extension/src/types/provider.ts
@@ -51,6 +51,7 @@ export enum InternalStorageNamespace {
   tokensState = 'TokensState',
   customNetworksState = 'CustomNetworksState',
   rateState = 'RateState',
+  recentlySentAddresses = 'RecentlySentAddresses',
 }
 export enum EnkryptProviderEventMethods {
   persistentEvents = 'PersistentEvents',
@@ -128,7 +129,7 @@ export abstract class BackgroundProviderInterface extends EventEmitter {
 export abstract class ProviderAPIInterface {
   abstract node: string;
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  constructor(node: string, options?: unknown) {}
+  constructor(node: string, options?: unknown) { }
   abstract init(): Promise<void>;
   abstract getBalance(address: string): Promise<string>;
   abstract getTransactionStatus(
diff --git a/packages/extension/src/ui/action/components/network-menu/index.vue b/packages/extension/src/ui/action/components/network-menu/index.vue
index 64429c7ee..3002a6d13 100644
--- a/packages/extension/src/ui/action/components/network-menu/index.vue
+++ b/packages/extension/src/ui/action/components/network-menu/index.vue
@@ -85,7 +85,7 @@ defineProps({
     text-align: center;
     letter-spacing: 0.5px;
     color: @primaryLabel;
-    opacity: 0.38;
+    opacity: 0.6;
     transition: opacity 300ms ease-in-out;
 
     svg {
@@ -93,7 +93,7 @@ defineProps({
     }
 
     &:hover {
-      opacity: 0.6;
+      opacity: 0.9;
     }
   }
 
diff --git a/packages/extension/src/ui/action/icons/actions/buy.vue b/packages/extension/src/ui/action/icons/actions/buy.vue
index dae1f718c..46d726cbb 100644
--- a/packages/extension/src/ui/action/icons/actions/buy.vue
+++ b/packages/extension/src/ui/action/icons/actions/buy.vue
@@ -1,23 +1,26 @@
 <template>
   <svg
-    width="29"
+    width="28"
     height="28"
-    viewBox="0 0 29 28"
+    viewBox="0 0 28 28"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M18.25 7H10.25C8.81687 7 7.8623 7.00156 7.12887 7.06148C6.4188 7.11949 6.09387 7.2221 5.88803 7.32698C5.32354 7.6146 4.8646 8.07354 4.57698 8.63803C4.4721 8.84387 4.36949 9.1688 4.31148 9.87887C4.25156 10.6123 4.25 11.5669 4.25 13V15C4.25 16.4331 4.25156 17.3877 4.31148 18.1211C4.36949 18.8312 4.4721 19.1561 4.57698 19.362C4.8646 19.9265 5.32354 20.3854 5.88803 20.673C6.09387 20.7779 6.4188 20.8805 7.12887 20.9385C7.8623 20.9984 8.81687 21 10.25 21H18.25C19.6831 21 20.6377 20.9984 21.3711 20.9385C22.0812 20.8805 22.4061 20.7779 22.612 20.673C23.1765 20.3854 23.6354 19.9265 23.923 19.362C24.0279 19.1561 24.1305 18.8312 24.1885 18.1211C24.2484 17.3877 24.25 16.4331 24.25 15V13C24.25 11.5669 24.2484 10.6123 24.1885 9.87887C24.1305 9.1688 24.0279 8.84387 23.923 8.63803C23.6354 8.07354 23.1765 7.6146 22.612 7.32698C22.4061 7.2221 22.0812 7.11949 21.3711 7.06148C20.6377 7.00156 19.6831 7 18.25 7ZM2.79497 7.73005C2.25 8.79961 2.25 10.1997 2.25 13V15C2.25 17.8003 2.25 19.2004 2.79497 20.27C3.27433 21.2108 4.03924 21.9757 4.98005 22.455C6.04961 23 7.44974 23 10.25 23H18.25C21.0503 23 22.4504 23 23.52 22.455C24.4608 21.9757 25.2257 21.2108 25.705 20.27C26.25 19.2004 26.25 17.8003 26.25 15V13C26.25 10.1997 26.25 8.79961 25.705 7.73005C25.2257 6.78924 24.4608 6.02433 23.52 5.54497C22.4504 5 21.0503 5 18.25 5H10.25C7.44974 5 6.04961 5 4.98005 5.54497C4.03924 6.02433 3.27433 6.78924 2.79497 7.73005Z"
+    <rect
+      x="2.25"
+      y="2.25"
+      width="23.5"
+      height="23.5"
+      rx="11.75"
       fill="#684CFF"
+      stroke="#684CFF"
+      stroke-width="2.5"
     />
     <path
       fill-rule="evenodd"
       clip-rule="evenodd"
-      d="M6.25 10C6.25 9.44772 6.69772 9 7.25 9L21.25 9C21.8023 9 22.25 9.44772 22.25 10C22.25 10.5523 21.8023 11 21.25 11L7.25 11C6.69772 11 6.25 10.5523 6.25 10Z"
-      fill="#684CFF"
-      opacity="0.5"
+      d="M14 5.5C14.6527 5.5 15.1819 6.02912 15.1819 6.68182V7.06291C15.9679 7.12142 16.8274 7.25879 17.5951 7.56629C18.2022 7.80944 18.8192 8.18486 19.286 8.77455C19.7674 9.38254 20.0227 10.1354 20.0227 11C20.0227 11.6903 19.4631 12.25 18.7727 12.25C18.0824 12.25 17.5227 11.6903 17.5227 11C17.5227 10.6517 17.4295 10.4572 17.326 10.3264C17.2079 10.1773 17.0037 10.0225 16.6656 9.88706C15.957 9.60326 14.9699 9.52273 14 9.52273C13.0091 9.52273 12.0406 9.63047 11.3601 9.94305C11.0382 10.0909 10.8312 10.2621 10.7028 10.4436C10.582 10.6143 10.4773 10.8683 10.4773 11.2871C10.4773 11.6899 10.5793 11.9008 10.676 12.0267C10.7836 12.1667 10.9695 12.3101 11.292 12.4338C11.9848 12.6993 12.957 12.75 14 12.75C15.0077 12.75 16.4219 12.7792 17.6028 13.2318C18.2171 13.4673 18.8398 13.8426 19.3068 14.4506C19.7845 15.0726 20.0227 15.8392 20.0227 16.7129C20.0227 17.5912 19.7893 18.3625 19.3382 19.0002C18.8948 19.627 18.2963 20.0473 17.6834 20.3288C16.8948 20.691 16.0055 20.858 15.1819 20.9294V21.3182C15.1819 21.9709 14.6527 22.5 14 22.5C13.3473 22.5 12.8182 21.9709 12.8182 21.3182V20.9371C12.0322 20.8786 11.1727 20.7412 10.4049 20.4337C9.79786 20.1906 9.18088 19.8151 8.71402 19.2254C8.23266 18.6175 7.97729 17.8646 7.97729 17C7.97729 16.3096 8.53694 15.75 9.22729 15.75C9.91765 15.75 10.4773 16.3096 10.4773 17C10.4773 17.3483 10.5705 17.5428 10.6741 17.6736C10.7921 17.8227 10.9963 17.9775 11.3345 18.1129C12.043 18.3967 13.0301 18.4773 14 18.4773C14.9909 18.4773 15.9594 18.3695 16.64 18.057C16.9619 17.9091 17.1688 17.7379 17.2973 17.5564C17.418 17.3857 17.5227 17.1317 17.5227 16.7129C17.5227 16.3101 17.4208 16.0992 17.324 15.9733C17.2165 15.8332 17.0306 15.6898 16.708 15.5662C16.0152 15.3007 15.043 15.25 14 15.25C12.9923 15.25 11.5782 15.2208 10.3973 14.7682C9.78295 14.5327 9.1602 14.1574 8.69326 13.5494C8.21555 12.9274 7.97729 12.1608 7.97729 11.2871C7.97729 10.4088 8.21073 9.63751 8.66181 8.99985C9.10523 8.37301 9.70377 7.95271 10.3166 7.67123C11.1052 7.30902 11.9946 7.142 12.8182 7.07059V6.68182C12.8182 6.02912 13.3473 5.5 14 5.5Z"
+      fill="white"
     />
   </svg>
 </template>
diff --git a/packages/extension/src/ui/action/icons/actions/deposit.vue b/packages/extension/src/ui/action/icons/actions/deposit.vue
index 95907d086..6e9883b51 100644
--- a/packages/extension/src/ui/action/icons/actions/deposit.vue
+++ b/packages/extension/src/ui/action/icons/actions/deposit.vue
@@ -6,19 +6,40 @@
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M21.0711 8.92894C24.9763 12.8342 24.9763 19.1658 21.0711 23.0711C17.1658 26.9763 10.8342 26.9763 6.92893 23.0711C3.02369 19.1658 3.02369 12.8342 6.92893 8.92894C7.31946 8.53842 7.95262 8.53842 8.34315 8.92894C8.73367 9.31946 8.73367 9.95263 8.34315 10.3432C5.21895 13.4673 5.21895 18.5327 8.34315 21.6569C11.4673 24.7811 16.5327 24.7811 19.6569 21.6569C22.781 18.5327 22.781 13.4673 19.6569 10.3432C19.2663 9.95263 19.2663 9.31946 19.6569 8.92894C20.0474 8.53842 20.6805 8.53842 21.0711 8.92894Z"
-      fill="#684CFF"
+    <rect
+      x="4.25"
+      y="4.25"
+      width="7.5"
+      height="7.5"
+      rx="1.75"
+      stroke="#684CFF"
+      stroke-width="2.5"
     />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M14 3C14.5128 3 14.9355 3.38604 14.9933 3.88338L15 4V15.585L17.2929 13.2929C17.6534 12.9324 18.2206 12.9047 18.6129 13.2097L18.7071 13.2929C19.0676 13.6534 19.0953 14.2206 18.7903 14.6129L18.7071 14.7071L14.7071 18.7071C14.3466 19.0676 13.7794 19.0953 13.3871 18.7903L13.2929 18.7071L9.29289 14.7071C8.90237 14.3166 8.90237 13.6834 9.29289 13.2929C9.65338 12.9324 10.2206 12.9047 10.6129 13.2097L10.7071 13.2929L13 15.585V4C13 3.44772 13.4477 3 14 3Z"
-      fill="#684CFF"
-      opacity="0.5"
+    <rect
+      x="16.25"
+      y="4.25"
+      width="7.5"
+      height="7.5"
+      rx="1.75"
+      stroke="#684CFF"
+      stroke-width="2.5"
     />
+    <rect
+      x="4.25"
+      y="16.25"
+      width="7.5"
+      height="7.5"
+      rx="1.75"
+      stroke="#684CFF"
+      stroke-width="2.5"
+    />
+    <rect x="15" y="15" width="4" height="4" rx="1" fill="#684CFF" />
+    <rect x="21" y="21" width="4" height="4" rx="1" fill="#684CFF" />
+    <rect x="21" y="15" width="4" height="4" rx="1" fill="#684CFF" />
+    <rect x="15" y="21" width="4" height="4" rx="1" fill="#684CFF" />
+    <rect x="7" y="7" width="2" height="2" fill="#684CFF" />
+    <rect x="7" y="19" width="2" height="2" fill="#684CFF" />
+    <rect x="19" y="7" width="2" height="2" fill="#684CFF" />
   </svg>
 </template>
 <style scoped>
diff --git a/packages/extension/src/ui/action/icons/actions/send.vue b/packages/extension/src/ui/action/icons/actions/send.vue
index 5ba1a1c08..3f50d0f5f 100644
--- a/packages/extension/src/ui/action/icons/actions/send.vue
+++ b/packages/extension/src/ui/action/icons/actions/send.vue
@@ -1,24 +1,17 @@
 <template>
   <svg
-    width="29"
+    width="28"
     height="28"
-    viewBox="0 0 29 28"
+    viewBox="0 0 28 28"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
       fill-rule="evenodd"
       clip-rule="evenodd"
-      d="M21.5711 8.92894C25.4763 12.8342 25.4763 19.1658 21.5711 23.0711C17.6658 26.9763 11.3342 26.9763 7.42893 23.0711C3.52369 19.1658 3.52369 12.8342 7.42893 8.92894C7.81946 8.53842 8.45262 8.53842 8.84315 8.92894C9.23367 9.31946 9.23367 9.95263 8.84315 10.3432C5.71895 13.4673 5.71895 18.5327 8.84315 21.6569C11.9673 24.7811 17.0327 24.7811 20.1569 21.6569C23.281 18.5327 23.281 13.4673 20.1569 10.3432C19.7663 9.95263 19.7663 9.31946 20.1569 8.92894C20.5474 8.53842 21.1805 8.53842 21.5711 8.92894Z"
+      d="M2.68093 11.5026C2.8374 11.8352 3.38331 12.0833 4.47513 12.5796L9.46799 14.8491C9.59695 14.8954 9.70419 14.923 9.81259 14.9342C10.0213 14.9557 10.2322 14.9332 10.4317 14.8682C10.6572 14.7947 10.8609 14.6465 11.2683 14.3502L17.5414 9.78801C18.2291 9.28787 18.5729 9.03779 18.7052 9.06733C18.8186 9.09267 18.9072 9.18127 18.9326 9.29473C18.9621 9.42698 18.712 9.77083 18.2119 10.4585L13.8029 16.5208C13.4848 16.9583 13.3257 17.177 13.2523 17.4185C13.1873 17.6321 13.1708 17.8574 13.204 18.0781C13.2163 18.1602 13.2381 18.2411 13.2708 18.3298L16.2671 23.823C16.8156 24.8285 17.0898 25.3312 17.4251 25.4647C17.7163 25.5806 18.0451 25.5532 18.3131 25.3907C18.6218 25.2037 18.8091 24.6625 19.1837 23.5803L25.8742 4.25212C26.233 3.21574 26.4124 2.69756 26.2914 2.36432C26.1863 2.07466 25.9535 1.84963 25.6605 1.7544C25.3233 1.64485 24.8115 1.84169 23.7879 2.23539L4.56285 9.62964C3.44347 10.0602 2.88378 10.2754 2.70783 10.5981C2.55513 10.878 2.54514 11.2141 2.68093 11.5026Z"
       fill="#684CFF"
     />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M15.1129 2.7097L15.2071 2.79289L19.2071 6.79289C19.5976 7.18342 19.5976 7.81658 19.2071 8.20711C18.8466 8.56759 18.2794 8.59532 17.8871 8.2903L17.7929 8.20711L15.5 5.914V18C15.5 18.5523 15.0523 19 14.5 19C13.9872 19 13.5645 18.614 13.5067 18.1166L13.5 18V5.914L11.2071 8.20711C10.8466 8.56759 10.2794 8.59532 9.8871 8.2903L9.79289 8.20711C9.43241 7.84662 9.40468 7.27939 9.7097 6.8871L9.79289 6.79289L13.7929 2.79289C14.1534 2.43241 14.7206 2.40468 15.1129 2.7097Z"
-      fill="#684CFF"
-      opacity="0.5"
-    />
   </svg>
 </template>
 <style scoped>
diff --git a/packages/extension/src/ui/action/icons/actions/swap.vue b/packages/extension/src/ui/action/icons/actions/swap.vue
index 0f855fb4a..e86d6f058 100644
--- a/packages/extension/src/ui/action/icons/actions/swap.vue
+++ b/packages/extension/src/ui/action/icons/actions/swap.vue
@@ -1,37 +1,17 @@
 <template>
   <svg
-    width="29"
+    width="28"
     height="28"
-    viewBox="0 0 29 28"
+    viewBox="0 0 28 28"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
-    <g clip-path="url(#clip0_1657_709)">
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M11.0673 6.34104C10.3329 6.11909 9.55462 6 8.75 6C4.33172 6 0.75 9.58172 0.75 14C0.75 18.4183 4.33172 22 8.75 22C9.55459 22 10.3328 21.8809 11.0673 21.659C10.5162 21.142 10.021 20.5662 9.59157 19.9416C9.31685 19.9801 9.03592 20 8.75 20C5.43629 20 2.75 17.3137 2.75 14C2.75 10.6863 5.43629 8 8.75 8C9.03591 8 9.31684 8.01993 9.59157 8.05843C10.021 7.43385 10.5162 6.85805 11.0673 6.34104Z"
-        fill="#684CFF"
-        opacity="0.5"
-      />
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M8.72274 9.58853C10.3884 5.99545 14.0285 3.5 18.2536 3.5C24.0526 3.5 28.7536 8.20101 28.7536 14C28.7536 19.799 24.0526 24.5 18.2536 24.5C14.0388 24.5 10.4061 22.0167 8.73499 18.4378C8.50132 17.9374 8.71757 17.3423 9.21798 17.1086C9.7184 16.8749 10.3135 17.0912 10.5472 17.5916C11.9019 20.4929 14.8444 22.5 18.2536 22.5C22.948 22.5 26.7536 18.6944 26.7536 14C26.7536 9.30558 22.948 5.5 18.2536 5.5C14.836 5.5 11.8875 7.51691 10.5373 10.4297C10.305 10.9307 9.71049 11.1486 9.20943 10.9164C8.70836 10.6841 8.49047 10.0896 8.72274 9.58853Z"
-        fill="#684CFF"
-      />
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M17.0429 9.29289C17.4334 8.90237 18.0666 8.90237 18.4571 9.29289L22.4571 13.2929C22.8476 13.6834 22.8476 14.3166 22.4571 14.7071L18.4571 18.7071C18.0666 19.0976 17.4334 19.0976 17.0429 18.7071C16.6524 18.3166 16.6524 17.6834 17.0429 17.2929L19.3358 15H7.75C7.19772 15 6.75 14.5523 6.75 14C6.75 13.4477 7.19772 13 7.75 13H19.3358L17.0429 10.7071C16.6524 10.3166 16.6524 9.68342 17.0429 9.29289Z"
-        fill="#684CFF"
-      />
-    </g>
-    <defs>
-      <clipPath id="clip0_1657_709">
-        <rect width="28" height="28" fill="white" transform="translate(0.75)" />
-      </clipPath>
-    </defs>
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M5.27449 8.28999C4.68528 9.4839 4.5435 10.7639 4.50999 12.3887L3.06066 10.9393C2.47487 10.3535 1.52513 10.3535 0.93934 10.9393C0.353553 11.5251 0.353553 12.4749 0.93934 13.0607L4.93934 17.0607C5.22065 17.342 5.60218 17.5 6 17.5C6.39783 17.5 6.77936 17.342 7.06066 17.0607L11.0607 13.0607C11.6464 12.4749 11.6464 11.5251 11.0607 10.9393C10.4749 10.3535 9.52513 10.3535 8.93934 10.9393L7.51567 12.363C7.54955 10.9302 7.65383 10.2476 7.96471 9.61766C8.31771 8.90238 9.13881 8.04551 9.8384 7.66235C10.7008 7.19003 11.4707 7.12764 13.8674 7.02545C14.2538 7.00898 14.6329 7 14.9999 7C17.3996 7 19.04 7.23993 20.0496 7.46428C20.5545 7.57649 20.9027 7.68502 21.1101 7.75824C21.2139 7.79487 21.2827 7.82273 21.3185 7.83791C21.3328 7.844 21.3419 7.84805 21.3458 7.84983C22.0835 8.20762 22.9739 7.90625 23.3416 7.17081C23.7121 6.42984 23.4117 5.52883 22.6708 5.15835L22 6.5C22.6708 5.15835 22.6694 5.15769 22.6694 5.15769L22.6681 5.157L22.6652 5.15556L22.6588 5.15243L22.6438 5.14517C22.6329 5.13989 22.6199 5.13376 22.6049 5.12683C22.5748 5.11296 22.5366 5.09591 22.4901 5.07616C22.397 5.03665 22.2704 4.98639 22.1086 4.92926C21.7848 4.81498 21.3204 4.67351 20.7003 4.53572C19.4599 4.26007 17.6002 4 14.9999 4C14.5847 4 14.1625 4.01015 13.7396 4.02818L13.5124 4.03779C11.4197 4.12604 9.93561 4.18863 8.39731 5.03114C7.15737 5.71025 5.90014 7.02224 5.27449 8.28999ZM22.0001 10.5C22.3979 10.5 22.7794 10.658 23.0607 10.9393L27.0607 14.9393C27.6465 15.5251 27.6465 16.4749 27.0607 17.0607C26.4749 17.6464 25.5252 17.6464 24.9394 17.0607L23.4902 15.6114C23.4567 17.2362 23.3149 18.5161 22.7257 19.71C22.1 20.9778 20.8428 22.2897 19.6029 22.9689C18.0646 23.8114 16.5805 23.874 14.4878 23.9622L14.2606 23.9718C13.8377 23.9898 13.4155 24 13.0002 24C10.4 24 8.54026 23.7399 7.29984 23.4643C6.67978 23.3265 6.21541 23.185 5.89162 23.0707C5.72977 23.0136 5.60323 22.9633 5.5101 22.9238C5.46354 22.9041 5.39531 22.8732 5.39531 22.8732L5.3294 22.8416C4.58843 22.4712 4.28808 21.5702 4.65856 20.8292C5.02627 20.0937 5.91663 19.7924 6.65441 20.1502C6.65831 20.1519 6.66737 20.156 6.68173 20.1621C6.71751 20.1773 6.78628 20.2051 6.89006 20.2418C7.09752 20.315 7.44567 20.4235 7.95062 20.5357C8.96022 20.7601 10.6005 21 13.0002 21C13.3672 21 13.7464 20.991 14.1328 20.9745C16.5294 20.8724 17.2994 20.81 18.1618 20.3376C18.8614 19.9545 19.6825 19.0976 20.0355 18.3823C20.3464 17.7524 20.4506 17.0698 20.4845 15.6369L19.0607 17.0607C18.4749 17.6464 17.5252 17.6464 16.9394 17.0607C16.3536 16.4749 16.3536 15.5251 16.9394 14.9393L20.9394 10.9393C21.2207 10.658 21.6022 10.5 22.0001 10.5Z"
+      fill="#684CFF"
+    />
   </svg>
 </template>
 
diff --git a/packages/extension/src/ui/action/icons/actions/trash.vue b/packages/extension/src/ui/action/icons/actions/trash.vue
new file mode 100644
index 000000000..c64af8635
--- /dev/null
+++ b/packages/extension/src/ui/action/icons/actions/trash.vue
@@ -0,0 +1,7 @@
+
+<template>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.30327 1.28266C6.48336 1.10772 6.7291 1 7 1H9C9.2709 1 9.51664 1.10772 9.69673 1.28266C10.1198 1.69362 10.3313 1.8991 10.3811 1.92895C10.4264 1.95607 10.4363 1.96446 10.4477 1.96909C10.4591 1.97371 10.472 1.97459 10.5234 1.98669C10.5799 2 10.6533 2 10.8 2H11.8986H13.5H13.7C14.1418 2 14.5 2.35817 14.5 2.8C14.5 3.24183 14.1418 3.6 13.7 3.6H13.4323L13.0797 11.9353C13.0341 13.0123 13.0113 13.5509 12.7872 13.9603C12.5899 14.3207 12.2865 14.6115 11.9181 14.7934C11.4996 15 10.9606 15 9.88252 15H6.11748C5.03943 15 4.50041 15 4.08187 14.7934C3.7135 14.6115 3.41006 14.3207 3.21281 13.9603C2.98869 13.5509 2.96591 13.0123 2.92034 11.9353L2.56769 3.6H2.3C1.85817 3.6 1.5 3.24183 1.5 2.8C1.5 2.35817 1.85817 2 2.3 2H2.5H4.10143H5.2C5.3467 2 5.42005 2 5.47659 1.98669C5.52797 1.97459 5.5409 1.97371 5.55231 1.96909C5.56372 1.96446 5.5736 1.95607 5.61889 1.92895C5.66872 1.8991 5.88023 1.69363 6.30326 1.28268L6.30327 1.28266ZM4.16912 3.6L4.51891 11.8676C4.54278 12.432 4.5579 12.7609 4.58766 13.0029C4.60269 13.1251 4.61739 13.184 4.62345 13.2046C4.66045 13.2668 4.71363 13.3177 4.7773 13.3521C4.79817 13.3573 4.85756 13.3694 4.98035 13.3793C5.22335 13.3988 5.55263 13.4 6.11748 13.4H9.88252C10.4474 13.4 10.7766 13.3988 11.0197 13.3793C11.1424 13.3694 11.2018 13.3573 11.2227 13.3521C11.2864 13.3177 11.3395 13.2668 11.3765 13.2046C11.3826 13.184 11.3973 13.1251 11.4123 13.0029C11.4421 12.7609 11.4572 12.432 11.4811 11.8676L11.8309 3.6H4.16912ZM11.3745 13.2112L11.3736 13.2135C11.3736 13.2135 11.3737 13.2133 11.3739 13.2129C11.374 13.2125 11.3742 13.212 11.3745 13.2112ZM4.76824 13.3495L4.77056 13.3503C4.76895 13.3498 4.76821 13.3495 4.76824 13.3495Z" fill="black" fill-opacity="0.6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.99478 6.60505C6.72141 6.33168 6.2782 6.33168 6.00483 6.60505C5.73146 6.87842 5.73146 7.32163 6.00483 7.595L7.00986 8.60002L6.00483 9.60505C5.73146 9.87842 5.73146 10.3216 6.00483 10.595C6.2782 10.8684 6.72141 10.8684 6.99478 10.595L7.9998 9.58997L9.00483 10.595C9.2782 10.8684 9.72141 10.8684 9.99478 10.595C10.2681 10.3216 10.2681 9.87842 9.99478 9.60505L8.98975 8.60002L9.99478 7.595C10.2681 7.32163 10.2681 6.87842 9.99478 6.60505C9.72141 6.33168 9.2782 6.33168 9.00483 6.60505L7.9998 7.61007L6.99478 6.60505Z" fill="black" fill-opacity="0.6"/>
+</svg>
+</template>
diff --git a/packages/extension/src/ui/action/icons/tabs/assets.vue b/packages/extension/src/ui/action/icons/tabs/assets.vue
index 8da79fe6a..7a922ba8e 100644
--- a/packages/extension/src/ui/action/icons/tabs/assets.vue
+++ b/packages/extension/src/ui/action/icons/tabs/assets.vue
@@ -9,8 +9,9 @@
     <path
       fill-rule="evenodd"
       clip-rule="evenodd"
-      d="M24 14C24 19.5228 19.5228 24 14 24C8.47715 24 4 19.5228 4 14C4 8.47715 8.47715 4 14 4C19.5228 4 24 8.47715 24 14ZM26 14C26 20.6274 20.6274 26 14 26C7.37258 26 2 20.6274 2 14C2 7.37258 7.37258 2 14 2C20.6274 2 26 7.37258 26 14ZM18.5 8H15V6.5H13V8H12C10.3431 8 9 9.34315 9 11V12C9 13.6569 10.3431 15 12 15H16C16.5523 15 17 15.4477 17 16V17C17 17.5523 16.5523 18 16 18H9.5V20H13V21.5H15V20H16C17.6569 20 19 18.6569 19 17V16C19 14.3431 17.6569 13 16 13H12C11.4477 13 11 12.5523 11 12V11C11 10.4477 11.4477 10 12 10H18.5V8Z"
-      fill="#202124"
+      d="M18.5715 21.9796C20.6832 19.9752 22 17.1414 22 14C22 10.8586 20.6832 8.02483 18.5715 6.02044C19.4264 6.08167 20.2672 6.28 21.0614 6.60896C22.032 7.011 22.9139 7.60028 23.6568 8.34315C24.3997 9.08602 24.9889 9.96793 25.391 10.9385C25.793 11.9091 25.9999 12.9494 25.9999 14C25.9999 15.0506 25.793 16.0909 25.391 17.0615C24.9889 18.0321 24.3997 18.914 23.6568 19.6569C22.9139 20.3997 22.032 20.989 21.0614 21.391C20.2672 21.72 19.4264 21.9183 18.5715 21.9796ZM16.0036 23.7987C14.5026 24.5667 12.8019 25 11 25C4.92487 25 0 20.0751 0 14C0 7.92487 4.92487 3 11 3C12.8019 3 14.5026 3.43326 16.0036 4.20129C16.6591 4.06776 17.3278 4 17.9999 4C19.3132 4 20.6135 4.25866 21.8268 4.76121C23.04 5.26375 24.1424 6.00035 25.071 6.92893C25.9996 7.85752 26.7362 8.95991 27.2387 10.1732C27.7413 11.3864 27.9999 12.6868 27.9999 14C27.9999 15.3132 27.7413 16.6136 27.2387 17.8268C26.7362 19.0401 25.9996 20.1425 25.071 21.0711C24.1424 21.9997 23.04 22.7362 21.8268 23.2388C20.6135 23.7413 19.3132 24 17.9999 24C17.3278 24 16.6591 23.9322 16.0036 23.7987Z"
+      fill="black"
+      fill-opacity="0.9"
     />
   </svg>
 </template>
diff --git a/packages/extension/src/ui/action/styles/color.less b/packages/extension/src/ui/action/styles/color.less
index bec40dce8..139ff62c4 100644
--- a/packages/extension/src/ui/action/styles/color.less
+++ b/packages/extension/src/ui/action/styles/color.less
@@ -12,6 +12,7 @@
 @black007: rgba(0, 0, 0, 0.07);
 @black004: rgba(0, 0, 0, 0.04);
 @white: #ffffff;
+@grayPrimary: rgba(95, 99, 104, 1);
 @gray01: rgba(95, 99, 104, 0.1);
 @gray02: rgba(95, 99, 104, 0.2);
 @white07: rgba(255, 255, 255, 0.7);
diff --git a/packages/extension/src/ui/action/types/filters.ts b/packages/extension/src/ui/action/types/filters.ts
index 7033e46bf..bce420d08 100644
--- a/packages/extension/src/ui/action/types/filters.ts
+++ b/packages/extension/src/ui/action/types/filters.ts
@@ -4,6 +4,7 @@ import {
   replaceWithEllipsis,
   formatFiatValue,
   formatFloatingPointValue,
+  truncate
 } from '../utils/filters';
 declare global {
   namespace $filters {
@@ -12,6 +13,7 @@ declare global {
       replaceWithEllipsis,
       formatFiatValue,
       formatFloatingPointValue,
+      truncate
     };
   }
 }
diff --git a/packages/extension/src/ui/action/utils/filters.ts b/packages/extension/src/ui/action/utils/filters.ts
index 017e5ff9f..9cd4a793a 100644
--- a/packages/extension/src/ui/action/utils/filters.ts
+++ b/packages/extension/src/ui/action/utils/filters.ts
@@ -16,6 +16,14 @@ export const replaceWithEllipsis = (
     value.substring(value.length - keepRight, value.length)
   );
 };
+
+
+export const truncate = (value: string, length: number): string => {
+  if (!value) return '';
+  value = value.toString();
+  return value.length > length ? value.substring(0, length) + '...' : value;
+}
+
 export const formatDuration = (
   duration: moment.Duration,
   date: number,
diff --git a/packages/extension/src/ui/action/views/add-network/components/add-network-item.vue b/packages/extension/src/ui/action/views/add-network/components/add-network-item.vue
index 1a120f8e5..98a2bfa69 100644
--- a/packages/extension/src/ui/action/views/add-network/components/add-network-item.vue
+++ b/packages/extension/src/ui/action/views/add-network/components/add-network-item.vue
@@ -8,26 +8,29 @@
     </div>
 
     <div class="add-network__action">
-      <!-- <a href="#">
-        <InfoIcon />
-      </a> -->
-      <a
-        v-show="isCustomNetwork"
-        class="add-network__close"
-        @click="deleteNetwork"
-      >
-        <edit-icon />
-      </a>
       <div class="add-network__link__block" @click="setPinned">
-        <p class="add-network__link__block__pin">
-          <pin-icon :is-pinned="isPinned" :is-active="true" />
-        </p>
+        <tooltip text="Pin Network" is-top-right>
+          <div class="add-network__link__block__pin">
+            <pin-icon :is-pinned="isPinned" :is-active="true" />
+          </div>
+        </tooltip>
       </div>
-      <Switch
-        v-if="network.isTestNetwork"
-        :is-checked="isActive"
-        @update:check="addTestnet"
-      />
+      <tooltip text="Delete Custom Network" is-top-right>
+        <div
+          v-show="isCustomNetwork"
+          class="add-network__delete"
+          @click="deleteNetwork"
+        >
+          <delete-icon />
+        </div>
+      </tooltip>
+      <tooltip text="Enable Network" is-top-right>
+        <Switch
+          v-if="network.isTestNetwork"
+          :is-checked="isActive"
+          @update:check="addTestnet"
+        />
+      </tooltip>
     </div>
   </div>
 </template>
@@ -35,12 +38,13 @@
 <script setup lang="ts">
 import { PropType } from 'vue';
 import Switch from '@action/components/switch/index.vue';
-import editIcon from '@/ui/action/icons/actions/edit.vue';
+import deleteIcon from '@/ui/action/icons/actions/trash.vue';
 import { NodeType } from '@/types/provider';
 import { CustomEvmNetwork } from '@/providers/ethereum/types/custom-evm-network';
 import PinIcon from '@action/icons/actions/pin.vue';
 import customNetworkIcon from '@/ui/action/icons/common/custom-network-icon.vue';
 import { NetworkNames } from '@enkryptcom/types';
+import Tooltip from '@/ui/action/components/tooltip/index.vue';
 
 const emit = defineEmits<{
   (e: 'networkToggled', name: string, isActive: boolean): void;
@@ -205,24 +209,20 @@ const addTestnet = async (value: boolean) => {
     justify-content: flex-start;
     align-items: center;
     flex-direction: row;
-
-    a {
-      display: inline-block;
-      font-size: 0;
-      margin-right: 10px;
-    }
   }
 
-  &__close {
-    border-radius: 8px;
+  &__delete {
     cursor: pointer;
     font-size: 0;
     transition: background 300ms ease-in-out;
-    svg {
-      width: 16px;
-      height: 16px;
-    }
-
+    width: 16px;
+    height: 16px;
+    padding: 5px 8px 5px 8px;
+    margin-left: -4px;
+    background: transparent;
+    border-radius: 24px;
+    transition: @opacity-noBG-transition;
+    cursor: pointer;
     &:hover {
       background: @black007;
     }
diff --git a/packages/extension/src/ui/action/views/add-network/index.vue b/packages/extension/src/ui/action/views/add-network/index.vue
index 1542b9be7..aea0e5680 100644
--- a/packages/extension/src/ui/action/views/add-network/index.vue
+++ b/packages/extension/src/ui/action/views/add-network/index.vue
@@ -9,7 +9,12 @@
         @update:pin-network="setPinnedNetwork"
         @update:test-network-toggle="emit('update:testNetworkToggle')"
       />
-      <add-custom-network v-else :close="closePopup" :back="toNetworkList" />
+      <add-custom-network
+        v-else
+        :close="closePopup"
+        :back="toNetworkList"
+        @update:pin-network="setPinnedNetwork"
+      />
     </div>
   </div>
 </template>
diff --git a/packages/extension/src/ui/action/views/add-network/views/add-custom-network.vue b/packages/extension/src/ui/action/views/add-network/views/add-custom-network.vue
index 210716608..159ae8508 100644
--- a/packages/extension/src/ui/action/views/add-network/views/add-custom-network.vue
+++ b/packages/extension/src/ui/action/views/add-network/views/add-custom-network.vue
@@ -136,6 +136,10 @@ const isValid = computed<boolean>(() => {
   return true;
 });
 
+const emit = defineEmits<{
+  (e: 'update:pinNetwork', network: string, isPinned: boolean): void;
+}>();
+
 const props = defineProps({
   close: {
     type: Function as PropType<() => void>,
@@ -259,7 +263,7 @@ const sendAction = async () => {
 
   await customNetworksState.addCustomNetwork(customNetworkOptions);
   await networksState.setNetworkStatus(customNetworkOptions.name, true);
-
+  emit('update:pinNetwork', customNetworkOptions.name, true);
   nameValue.value = '';
   symbolValue.value = '';
   chainIDValue.value = '';
diff --git a/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue b/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue
index 485b4d789..2fde18949 100644
--- a/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue
+++ b/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue
@@ -22,7 +22,7 @@
         @update:value="updateSearch"
         @action:custom-network="toCustom"
       />
-      <div>
+      <div v-if="isLoaded">
         <h3
           v-if="
             searchInput === '' ||
@@ -78,6 +78,10 @@
           <span> Just press the <plus-small-icon /> button above. </span>
         </div>
       </div>
+
+      <div v-else class="add-network__loading">
+        <loader />
+      </div>
     </custom-scrollbar>
   </div>
 </template>
@@ -97,6 +101,7 @@ import { computed } from 'vue';
 import { CustomEvmNetwork } from '@/providers/ethereum/types/custom-evm-network';
 import PlusSmallIcon from '@/ui/action/icons/common/plus-small-icon.vue';
 import { NetworkNames } from '@enkryptcom/types';
+import Loader from '@action/icons/common/loader.vue';
 
 const emit = defineEmits<{
   (e: 'update:pinNetwork', network: string, isPinned: boolean): void;
@@ -160,8 +165,14 @@ const setNetworkLists = async () => {
   allTestNets.value = allNetworksTestNets;
 };
 
+/** -------------------
+ * Load all networks
+ * ------------------- */
+const isLoaded = ref(false);
+
 onBeforeMount(async () => {
   await setNetworkLists();
+  isLoaded.value = true;
 });
 
 /** -------------------
@@ -231,6 +242,13 @@ const isHasScroll = () => {
   width: 100%;
   height: auto;
   box-sizing: border-box;
+  &__loading {
+    width: 100%;
+    height: 350px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 
   &__header {
     width: 100%;
diff --git a/packages/extension/src/ui/action/views/asset-detail-view/index.vue b/packages/extension/src/ui/action/views/asset-detail-view/index.vue
index 1e484a44b..20353f0f7 100644
--- a/packages/extension/src/ui/action/views/asset-detail-view/index.vue
+++ b/packages/extension/src/ui/action/views/asset-detail-view/index.vue
@@ -39,6 +39,7 @@
             <sparkline-down v-if="token.priceChangePercentage < 0" />
 
             {{ token.priceChangePercentage.toFixed(2) }}%
+            <span class="asset-detail-view__last-24">Last 24h</span>
           </p>
         </div>
       </div>
@@ -156,6 +157,14 @@ const close = () => {
   height: auto;
   box-sizing: border-box;
 
+  &__last-24 {
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: 0.5px;
+    color: @grayPrimary;
+  }
+
   &__wrap {
     background: @white;
     box-shadow:
diff --git a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
index 473a908f3..af3692c3c 100644
--- a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
+++ b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
@@ -5,7 +5,9 @@
         <img :src="token.icon" @error="imageLoadError" />
       </div>
       <div class="assets-select-list__token-info-name">
-        <h4>{{ token.name }}</h4>
+        <h4>
+          {{ $filters.truncate(token.name, 25) }}
+        </h4>
         <p>
           {{ balance ? $filters.formatFloatingPointValue(balance).value : '~' }}
           <span>{{ token.symbol }}</span>
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
index 6e6e97184..20b93cc0a 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
@@ -4,11 +4,9 @@
       <a class="network-activity__action-item" @click="$emit('toggle:deposit')">
         <Deposit />Deposit
       </a>
-      <div class="network-activity__action-divider" />
       <a class="network-activity__action-item" @click="$emit('open:buyAction')">
         <Buy />Buy/Sell
       </a>
-      <div class="network-activity__action-divider" />
       <router-link
         :to="{
           name: 'send-transaction',
@@ -18,7 +16,6 @@
       >
         <Send />Send
       </router-link>
-      <div class="network-activity__action-divider" />
       <router-link
         class="network-activity__action-item"
         :to="{
@@ -51,7 +48,7 @@ defineEmits<{
 
 .network-activity {
   &__action {
-    padding: 4px 12px 8px 12px;
+    padding: 4px 16px 8px 16px;
     box-sizing: border-box;
 
     &-wrap {
@@ -59,42 +56,42 @@ defineEmits<{
       height: 72px;
       left: 12px;
       top: 0px;
-      background: @primary007;
       border-radius: 12px;
       display: flex;
-      justify-content: space-around;
+      justify-content: space-between;
       align-items: center;
       flex-direction: row;
-      padding: 4px;
-      box-sizing: border-box;
+      gap: 8px;
     }
     &-item {
+      background: @primary007;
       display: block;
       text-align: center;
       text-decoration: none;
       font-style: normal;
       font-weight: 400;
-      font-size: 14px;
-      line-height: 20px;
+      font-size: 12px;
+      line-height: 16px;
       text-align: center;
       letter-spacing: 0.5px;
       color: @primaryLabel;
       cursor: pointer;
-      height: 64px;
+      height: 72px;
       display: flex;
       justify-content: center;
       align-items: center;
       flex-direction: column;
       min-width: 100px;
       transition: background 300ms ease-in-out;
-      border-radius: 8px;
+      border-radius: 12px;
 
       &:hover {
-        background: rgba(0, 0, 0, 0.04);
+        background: @black004;
       }
 
       svg {
         margin-bottom: 0;
+        margin-bottom: 2px;
       }
     }
     &-divider {
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
index 1f81a6f8a..888fa1c89 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
@@ -111,11 +111,7 @@
               fromBase(activity.value, activity.token.decimals),
             ).value
           }}
-          <span>{{
-            activity.token.symbol.length > 40
-              ? activity.token.symbol.substring(0, 40) + '...'
-              : activity.token.symbol
-          }}</span>
+          <span>{{ $filters.truncate(activity.token.symbol, 40) }}</span>
         </h4>
         <p>$ {{ $filters.formatFiatValue(getFiatValue).value }}</p>
       </div>
@@ -287,7 +283,7 @@ onMounted(() => {
 .network-activity {
   &__transaction {
     height: 64px;
-    padding: 0 8px;
+    padding: 0 4px;
     position: relative;
     box-sizing: border-box;
     display: flex;
@@ -296,7 +292,7 @@ onMounted(() => {
     flex-direction: row;
     text-decoration: none;
     cursor: pointer;
-    margin: 0 12px;
+    margin: 0 16px;
     border-radius: 10px;
     transition: background 300ms ease-in-out;
 
diff --git a/packages/extension/src/ui/action/views/network-assets/components/network-assets-header.vue b/packages/extension/src/ui/action/views/network-assets/components/network-assets-header.vue
index 6a16ded59..bd3d6f943 100644
--- a/packages/extension/src/ui/action/views/network-assets/components/network-assets-header.vue
+++ b/packages/extension/src/ui/action/views/network-assets/components/network-assets-header.vue
@@ -18,7 +18,7 @@
 @import '@action/styles/theme.less';
 .network-assets {
   &__header {
-    padding: 10px 16px 2px 16px;
+    padding: 10px 20px 2px 20px;
     position: relative;
     display: flex;
     justify-content: space-between;
diff --git a/packages/extension/src/ui/action/views/network-assets/components/network-assets-item.vue b/packages/extension/src/ui/action/views/network-assets/components/network-assets-item.vue
index 5399a6303..3a9b45b2b 100644
--- a/packages/extension/src/ui/action/views/network-assets/components/network-assets-item.vue
+++ b/packages/extension/src/ui/action/views/network-assets/components/network-assets-item.vue
@@ -202,7 +202,7 @@ const toggleDetail = () => {
     border-radius: 10px;
     transition: background 300ms ease-in-out;
     text-decoration: none;
-    margin: 0 12px;
+    margin: 0 16px;
     cursor: pointer;
 
     &:hover {
diff --git a/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue b/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
index 459434762..b086aa495 100644
--- a/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
+++ b/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
@@ -15,6 +15,7 @@
 
 <script setup lang="ts">
 import { computed, ref, onMounted } from 'vue';
+
 const isFocus = ref(false);
 const swapAmountInput = ref(null);
 
@@ -52,12 +53,15 @@ const props = defineProps({
     },
   },
 });
+
 onMounted(() => {
   if (swapAmountInput.value && props.autofocus) {
     (swapAmountInput.value as HTMLInputElement).focus();
   }
 });
+
 const emit = defineEmits(['update:value']);
+
 const textValue = computed({
   get: () => props.value,
   set: value => {
@@ -66,15 +70,24 @@ const textValue = computed({
     emit('update:value', fValue);
   },
 });
+
 const changeFocus = () => {
   isFocus.value = !isFocus.value;
   props.changeFocus(isFocus.value);
 };
+
 const onlyNumber = ($event: KeyboardEvent) => {
   const keyCode = $event.keyCode ? $event.keyCode : $event.which;
-  if ((keyCode < 48 || keyCode > 57) && keyCode !== 46) {
-    $event.preventDefault();
+  // Numeric
+  if (keyCode >= /* 0 */ 48 && keyCode <= /* 9 */ 57) {
+    return;
+  }
+  // Only allow a single period
+  if (keyCode === /* '.' */ 46 && textValue.value.indexOf('.') === -1) {
+    return;
   }
+  // Alphabetical (/non-numeric) or mulitple periods. Don't propagate change
+  $event.preventDefault();
 };
 </script>
 
diff --git a/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue b/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
index 6e17c5560..6f1be6c1c 100644
--- a/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
+++ b/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
@@ -4,7 +4,9 @@
       <img :src="token.logoURI" alt="" @error="imageLoadError" />
     </div>
     <div class="swap-token-select__info">
-      <h5>{{ token.name }}</h5>
+      <h5>
+        {{ $filters.truncate(token.name, 25) }}
+      </h5>
       <p>
         {{
           tokenBalance
diff --git a/packages/swap/src/providers/paraswap/index.ts b/packages/swap/src/providers/paraswap/index.ts
index a3ee7f010..0dd39ed94 100644
--- a/packages/swap/src/providers/paraswap/index.ts
+++ b/packages/swap/src/providers/paraswap/index.ts
@@ -198,7 +198,7 @@ class ParaSwap extends ProviderClass {
       .then((res) => res.json())
       .then(async (response: ParaswapResponseType) => {
         if (response.error) {
-          console.error(response.error);
+          console.error("Error in swap response from ParaSwap", response.error);
           return Promise.resolve(null);
         }
         const transactions: EVMTransaction[] = [];
@@ -245,7 +245,7 @@ class ParaSwap extends ProviderClass {
         };
       })
       .catch((e) => {
-        console.error(e);
+        console.error("Error generating swap from ParaSwap", e);
         return Promise.resolve(null);
       });
   }
@@ -283,6 +283,18 @@ class ParaSwap extends ProviderClass {
       .then((j) => j.json())
       .then(async (jsonRes) => {
         if (!jsonRes) return null;
+        // Note: sometimes `jsonRes.priceRoute` is undefined and "error" is set instead
+        if (!jsonRes.priceRoute) {
+          if (jsonRes.error) {
+            // Sometimes ParaSwap returns this error: "No routes found with enough liquidity"
+            throw new Error(`ParaSwap error getting prices: ${jsonRes.error}`);
+          } else {
+            // Didn't have the expected "priceRoute" property
+            throw new Error(
+              `ParaSwap error getting prices, no "priceRoute" property on response: ${JSON.stringify(jsonRes)}`,
+            );
+          }
+        }
         const res: ParaswpQuoteResponse = jsonRes.priceRoute;
         const transactions: EVMTransaction[] = [];
         if (options.fromToken.address !== NATIVE_TOKEN_ADDRESS) {
@@ -320,7 +332,7 @@ class ParaSwap extends ProviderClass {
         return response;
       })
       .catch((e) => {
-        console.error(e);
+        console.error("Error getting quote from ParaSwap", e);
         return Promise.resolve(null);
       });
   }
diff --git a/packages/swap/src/providers/rango/index.ts b/packages/swap/src/providers/rango/index.ts
index aaa4f5651..e4bc0c549 100644
--- a/packages/swap/src/providers/rango/index.ts
+++ b/packages/swap/src/providers/rango/index.ts
@@ -311,6 +311,13 @@ class Rango extends ProviderClass {
   async init(tokenList?: TokenType[]): Promise<void> {
     logger.info(`init: Initialising against ${tokenList?.length} tokens...`);
 
+    if (!Rango.isNetworkSupportedByEnkrypt(this.network)) {
+      logger.info(
+        `init: Enkrypt does not support network on Rango: ${this.network}`,
+      );
+      return;
+    }
+
     const [rangoMeta, swaplist] = await Promise.all([
       rangoClient.meta({
         excludeNonPopulars: true,
@@ -429,10 +436,16 @@ class Rango extends ProviderClass {
     return matchingRangoBlockchain;
   }
 
+  static isNetworkSupportedByEnkrypt(
+    supportedNetworkName: SupportedNetworkName,
+  ): boolean {
+    return supportedNetworkInfoByName.has(supportedNetworkName);
+  }
+
   /**
    * Is this network supported by both enkrypt and rango?
    */
-  static isNetworkSupported(
+  static isNetworkSupportedByEnkryptAndRango(
     supportedNetworkName: SupportedNetworkName,
     rangoBlockchains: ReadonlyArray<BlockchainMeta>,
   ): boolean {
diff --git a/packages/swap/src/providers/rango/supported.ts b/packages/swap/src/providers/rango/supported.ts
index 0b4f5fb10..272300fd6 100644
--- a/packages/swap/src/providers/rango/supported.ts
+++ b/packages/swap/src/providers/rango/supported.ts
@@ -1,4 +1,4 @@
-import { SupportedNetworkName, } from '../../types'
+import { SupportedNetworkName } from "../../types";
 
 export type SupportedNetworkInfo = {
   /** Standard base10 chain ID, can be obtained from `https://chainlist.org` */
@@ -179,4 +179,3 @@ export const supportedNetworkByRangoBlockchain = new Map<
     },
   ]),
 );
-
diff --git a/packages/swap/tests/changelly.test.ts b/packages/swap/tests/changelly.test.ts
index 3f9708c42..b1f9ade80 100644
--- a/packages/swap/tests/changelly.test.ts
+++ b/packages/swap/tests/changelly.test.ts
@@ -51,9 +51,7 @@ describe("Changelly Provider", () => {
       (swap?.transactions[0] as EVMTransaction).data.startsWith("0xa9059cbb"),
     ).to.be.eq(true);
     const status = await changelly.getStatus(
-      (
-        await swap!.getStatusObject({ transactions: [] })
-      ).options,
+      (await swap!.getStatusObject({ transactions: [] })).options,
     );
     expect(status).to.be.eq("pending");
   });