diff --git a/@shared/api/internal.ts b/@shared/api/internal.ts
index 2e91ad488..2a4f4c4bf 100644
--- a/@shared/api/internal.ts
+++ b/@shared/api/internal.ts
@@ -518,13 +518,15 @@ export const getSorobanTokenBalance = async (
 export const getAccountBalancesStandalone = async ({
   publicKey,
   networkDetails,
+  isMainnet,
 }: {
   publicKey: string;
   networkDetails: NetworkDetails;
-}): Promise<AccountBalancesInterface> => {
+  isMainnet: boolean;
+}) => {
   const { network, networkUrl, networkPassphrase } = networkDetails;
 
-  let balances: any = null;
+  let balances = null;
   let isFunded = null;
   let subentryCount = 0;
 
@@ -532,7 +534,10 @@ export const getAccountBalancesStandalone = async ({
     const server = stellarSdkServer(networkUrl, networkPassphrase);
     const accountSummary = await server.accounts().accountId(publicKey).call();
 
-    const displayableBalances = makeDisplayableBalances(accountSummary);
+    const displayableBalances = await makeDisplayableBalances(
+      accountSummary,
+      isMainnet,
+    );
     const sponsor = accountSummary.sponsor
       ? { sponsor: accountSummary.sponsor }
       : {};
@@ -556,20 +561,19 @@ export const getAccountBalancesStandalone = async ({
     // eslint-disable-next-line no-plusplus
     for (let i = 0; i < Object.keys(resp.balances).length; i++) {
       const k = Object.keys(resp.balances)[i];
-      const v: any = resp.balances[k];
-      if (v.liquidity_pool_id) {
+      const v = resp.balances[k];
+      if (v.liquidityPoolId) {
         const server = stellarSdkServer(networkUrl, networkPassphrase);
         // eslint-disable-next-line no-await-in-loop
         const lp = await server
           .liquidityPools()
-          .liquidityPoolId(v.liquidity_pool_id)
+          .liquidityPoolId(v.liquidityPoolId)
           .call();
         balances[k] = {
           ...balances[k],
-          liquidityPoolId: v.liquidity_pool_id,
+          liquidityPoolId: v.liquidityPoolId,
           reserves: lp.reserves,
         };
-        delete balances[k].liquidity_pool_id;
       }
     }
     isFunded = true;
@@ -1172,14 +1176,10 @@ export const saveAllowList = async ({
 export const saveSettings = async ({
   isDataSharingAllowed,
   isMemoValidationEnabled,
-  isSafetyValidationEnabled,
-  isValidatingSafeAssetsEnabled,
   isNonSSLEnabled,
 }: {
   isDataSharingAllowed: boolean;
   isMemoValidationEnabled: boolean;
-  isSafetyValidationEnabled: boolean;
-  isValidatingSafeAssetsEnabled: boolean;
   isNonSSLEnabled: boolean;
 }): Promise<Settings & IndexerSettings> => {
   let response = {
@@ -1188,13 +1188,12 @@ export const saveSettings = async ({
     networkDetails: MAINNET_NETWORK_DETAILS,
     networksList: DEFAULT_NETWORKS,
     isMemoValidationEnabled: true,
-    isSafetyValidationEnabled: true,
-    isValidatingSafeAssetsEnabled: true,
     isRpcHealthy: false,
     userNotification: { enabled: false, message: "" },
     settingsState: SettingsState.IDLE,
     isSorobanPublicEnabled: false,
     isNonSSLEnabled: false,
+    isBlockaidAnnounced: false,
     error: "",
   };
 
@@ -1202,8 +1201,6 @@ export const saveSettings = async ({
     response = await sendMessageToBackground({
       isDataSharingAllowed,
       isMemoValidationEnabled,
-      isSafetyValidationEnabled,
-      isValidatingSafeAssetsEnabled,
       isNonSSLEnabled,
       type: SERVICE_TYPES.SAVE_SETTINGS,
     });
@@ -1351,16 +1348,9 @@ export const loadSettings = (): Promise<
     type: SERVICE_TYPES.LOAD_SETTINGS,
   });
 
-export const getBlockedDomains = async () => {
-  const resp = await sendMessageToBackground({
-    type: SERVICE_TYPES.GET_BLOCKED_DOMAINS,
-  });
-  return resp;
-};
-
-export const getBlockedAccounts = async () => {
+export const getMemoRequiredAccounts = async () => {
   const resp = await sendMessageToBackground({
-    type: SERVICE_TYPES.GET_BLOCKED_ACCOUNTS,
+    type: SERVICE_TYPES.GET_MEMO_REQUIRED_ACCOUNTS,
   });
   return resp;
 };
@@ -1460,3 +1450,63 @@ export const modifyAssetsList = async ({
 
   return { assetsLists: response.assetsLists, error: response.error };
 };
+
+export const simulateTokenTransfer = async (args: {
+  address: string;
+  publicKey: string;
+  memo: string;
+  params: {
+    publicKey: string;
+    destination: string;
+    amount: number;
+  };
+  networkDetails: NetworkDetails;
+  transactionFee: string;
+}) => {
+  const { address, publicKey, memo, params, networkDetails } = args;
+  const options = {
+    method: "POST",
+    headers: {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      address,
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      pub_key: publicKey,
+      memo,
+      params,
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      network_url: networkDetails.sorobanRpcUrl,
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      network_passphrase: networkDetails.networkPassphrase,
+    }),
+  };
+  const res = await fetch(`${INDEXER_URL}/simulate-token-transfer`, options);
+  const response = await res.json();
+  return {
+    ok: res.ok,
+    response,
+  };
+};
+
+export const saveIsBlockaidAnnounced = async ({
+  isBlockaidAnnounced,
+}: {
+  isBlockaidAnnounced: boolean;
+}) => {
+  let response = {
+    error: "",
+    isBlockaidAnnounced: false,
+  };
+
+  response = await sendMessageToBackground({
+    type: SERVICE_TYPES.SAVE_IS_BLOCKAID_ANNOUNCED,
+    isBlockaidAnnounced,
+  });
+
+  return {
+    isBlockaidAnnounced: response.isBlockaidAnnounced,
+    error: response.error,
+  };
+};
diff --git a/@shared/api/package.json b/@shared/api/package.json
index 811a34b31..a81a415f0 100644
--- a/@shared/api/package.json
+++ b/@shared/api/package.json
@@ -4,6 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
+    "@blockaid/client": "^0.25.0",
     "@stellar/js-xdr": "^3.1.1",
     "bignumber.js": "^9.1.1",
     "prettier": "^2.0.5",
diff --git a/@shared/api/types.ts b/@shared/api/types.ts
index ec4b219b8..405371f3e 100644
--- a/@shared/api/types.ts
+++ b/@shared/api/types.ts
@@ -1,5 +1,6 @@
 import BigNumber from "bignumber.js";
 import { AssetType as SdkAssetType, Horizon } from "stellar-sdk";
+import Blockaid from "@blockaid/client";
 
 import { SERVICE_TYPES, EXTERNAL_SERVICE_TYPES } from "../constants/services";
 import { APPLICATION_STATE } from "../constants/applicationState";
@@ -75,8 +76,7 @@ export interface Response {
   recentAddresses: string[];
   hardwareWalletType: WalletType;
   bipPath: string;
-  blockedDomains: BlockedDomains;
-  blockedAccounts: BlockedAccount[];
+  memoRequiredAccounts: MemoRequiredAccount[];
   assetDomain: string;
   contractId: string;
   tokenId: string;
@@ -90,13 +90,10 @@ export interface Response {
   isMergeSelected: boolean;
   recommendedFee: string;
   isNonSSLEnabled: boolean;
+  isBlockaidAnnounced: boolean;
 }
 
-export interface BlockedDomains {
-  [key: string]: boolean;
-}
-
-export interface BlockedAccount {
+export interface MemoRequiredAccount {
   address: string;
   name: string;
   domain: string | null;
@@ -144,10 +141,9 @@ export enum AccountType {
 export interface Preferences {
   isDataSharingAllowed: boolean;
   isMemoValidationEnabled: boolean;
-  isSafetyValidationEnabled: boolean;
-  isValidatingSafeAssetsEnabled: boolean;
   networksList: NetworkDetails[];
   isNonSSLEnabled: boolean;
+  isBlockaidAnnounced: boolean;
   error: string;
 }
 
@@ -237,9 +233,27 @@ export interface Balance {
   total: BigNumber;
   buyingLiabilities: string;
   sellingLiabilities: string;
+  liquidityPoolId?: string;
+  reserves?: Horizon.HorizonApi.Reserve[];
+  contractId?: string;
+  blockaidData: BlockAidScanAssetResult;
+}
+
+export type BlockAidScanAssetResult = Blockaid.TokenScanResponse;
+export interface BlockAidScanAssetResultIndex {
+  [key: string]: Blockaid.TokenScanResponse.AttackTypes &
+    Blockaid.TokenScanResponse.Fees &
+    Blockaid.TokenScanResponse.BasicMetadataToken &
+    Blockaid.TokenScanResponse.FinancialStats &
+    Blockaid.TokenScanResponse.TradingLimits;
 }
 
+export type BlockAidScanSiteResult = Blockaid.SiteScanResponse;
+export type BlockAidScanTxResult = Blockaid.StellarTransactionScanResponse;
+export type BlockAidBulkScanAssetResult = Blockaid.TokenBulkScanResponse;
+
 export interface AssetBalance extends Balance {
+  limit: BigNumber;
   token: AssetToken;
   sponsor?: string;
 }
@@ -250,8 +264,10 @@ export interface NativeBalance extends Balance {
 }
 
 export interface TokenBalance extends AssetBalance {
-  decimals: number;
   name: string;
+  symbol: string;
+  decimals: number;
+  total: BigNumber;
 }
 
 export interface BalanceMap {
diff --git a/@shared/constants/services.ts b/@shared/constants/services.ts
index 1672668c7..ddade5db5 100644
--- a/@shared/constants/services.ts
+++ b/@shared/constants/services.ts
@@ -33,8 +33,7 @@ export enum SERVICE_TYPES {
   CACHE_ASSET_ICON = "CACHE_ASSET_ICON",
   GET_CACHED_ASSET_DOMAIN = "GET_CACHED_ASSET_DOMAIN",
   CACHE_ASSET_DOMAIN = "CACHE_ASSET_DOMAIN",
-  GET_BLOCKED_ACCOUNTS = "GET_BLOCKED_ACCOUNTS",
-  GET_BLOCKED_DOMAINS = "GET_BLOCKED_DOMAINS",
+  GET_MEMO_REQUIRED_ACCOUNTS = "GET_MEMO_REQUIRED_ACCOUNTS",
   ADD_CUSTOM_NETWORK = "ADD_CUSTOM_NETWORK",
   CHANGE_NETWORK = "CHANGE_NETWORK",
   REMOVE_CUSTOM_NETWORK = "REMOVE_CUSTOM_NETWORK",
@@ -48,6 +47,7 @@ export enum SERVICE_TYPES {
   MIGRATE_ACCOUNTS = "MIGRATE_ACCOUNTS",
   ADD_ASSETS_LIST = "ADD_ASSETS_LIST",
   MODIFY_ASSETS_LIST = "MODIFY_ASSETS_LIST",
+  SAVE_IS_BLOCKAID_ANNOUNCED = "SAVE_IS_BLOCKAID_ANNOUNCED",
 }
 
 export enum EXTERNAL_SERVICE_TYPES {
diff --git a/@shared/helpers/stellar.ts b/@shared/helpers/stellar.ts
index 9c9824110..fcce5f435 100644
--- a/@shared/helpers/stellar.ts
+++ b/@shared/helpers/stellar.ts
@@ -2,12 +2,17 @@ import BigNumber from "bignumber.js";
 import * as StellarSdk from "stellar-sdk";
 import * as StellarSdkNext from "stellar-sdk-next";
 
-import { BalanceMap } from "@shared/api/types";
+import {
+  BalanceMap,
+  AssetBalance,
+  BlockAidScanAssetResult,
+} from "@shared/api/types";
 import {
   BASE_RESERVE,
   BASE_RESERVE_MIN_COUNT,
   NetworkDetails,
 } from "@shared/constants/stellar";
+import { INDEXER_URL } from "@shared/constants/mercury";
 
 export const CUSTOM_NETWORK = "STANDALONE";
 
@@ -42,93 +47,131 @@ export function getBalanceIdentifier(
   }
 }
 
-export function makeDisplayableBalances(
+export const defaultBlockaidScanAssetResult: BlockAidScanAssetResult = {
+  /* eslint-disable @typescript-eslint/naming-convention */
+  address: "",
+  chain: "stellar",
+  attack_types: {},
+  fees: {},
+  malicious_score: "0.0",
+  metadata: {},
+  financial_stats: {},
+  trading_limits: {},
+  result_type: "Benign",
+  features: [{ description: "", feature_id: "METADATA", type: "Benign" }],
+  /* eslint-enable @typescript-eslint/naming-convention */
+};
+
+export const makeDisplayableBalances = async (
   accountDetails: StellarSdk.Horizon.ServerApi.AccountRecord,
-): BalanceMap {
+  isMainnet: boolean,
+) => {
   const { balances, subentry_count, num_sponsored, num_sponsoring } =
     accountDetails;
 
-  const displayableBalances = Object.values(balances).reduce(
-    (memo, balance) => {
-      const identifier = getBalanceIdentifier(balance);
-      const total = new BigNumber(balance.balance);
-
-      let sellingLiabilities = new BigNumber(0);
-      let buyingLiabilities = new BigNumber(0);
-      let available;
-
-      if ("selling_liabilities" in balance) {
-        sellingLiabilities = new BigNumber(balance.selling_liabilities);
-        available = total.minus(sellingLiabilities);
-      }
-
-      if ("buying_liabilities" in balance) {
-        buyingLiabilities = new BigNumber(balance.buying_liabilities);
-      }
+  const displayableBalances = {} as BalanceMap;
 
-      if (identifier === "native") {
-        // define the native balance line later
-        return {
-          ...memo,
-          native: {
-            token: {
-              type: "native",
-              code: "XLM",
-            },
-            total,
-            available,
-            sellingLiabilities,
-            buyingLiabilities,
-            minimumBalance: new BigNumber(BASE_RESERVE_MIN_COUNT)
-              .plus(subentry_count)
-              .plus(num_sponsoring)
-              .minus(num_sponsored)
-              .times(BASE_RESERVE)
-              .plus(sellingLiabilities),
-          },
-        };
-      }
+  let blockaidScanResults: { [key: string]: BlockAidScanAssetResult } = {};
 
-      const liquidityPoolBalance =
-        balance as StellarSdk.Horizon.HorizonApi.BalanceLineLiquidityPool;
-      if (identifier.includes(":lp")) {
-        return {
-          ...memo,
-          [identifier]: {
-            liquidity_pool_id: liquidityPoolBalance.liquidity_pool_id,
-            total,
-            limit: new BigNumber(liquidityPoolBalance.limit),
-          },
-        };
+  if (isMainnet) {
+    const url = new URL(`${INDEXER_URL}/scan-asset-bulk`);
+    for (const balance of balances) {
+      const balanceId = getBalanceIdentifier(balance);
+      if (balanceId !== "native" && !balanceId.includes(":lp")) {
+        url.searchParams.append("asset_ids", balanceId.replace(":", "-"));
       }
+    }
+
+    try {
+      const response = await fetch(url.href);
+      const data = await response.json();
+      blockaidScanResults = data.data.results;
+    } catch (e) {
+      console.error(e);
+    }
+  }
 
-      const assetBalance =
-        balance as StellarSdk.Horizon.HorizonApi.BalanceLineAsset;
-      const assetSponsor = assetBalance.sponsor
-        ? { sponsor: assetBalance.sponsor }
-        : {};
-
-      return {
-        ...memo,
-        [identifier]: {
-          token: {
-            type: assetBalance.asset_type,
-            code: assetBalance.asset_code,
-            issuer: {
-              key: assetBalance.asset_issuer,
-            },
-          },
-          sellingLiabilities,
-          buyingLiabilities,
-          total,
-          limit: new BigNumber(assetBalance.limit),
-          available: total.minus(sellingLiabilities),
-          ...assetSponsor,
+  for (let i = 0; i < balances.length; i++) {
+    const balance = balances[i];
+    const identifier = getBalanceIdentifier(balance);
+    const total = new BigNumber(balance.balance);
+
+    let sellingLiabilities = "0";
+    let buyingLiabilities = "0";
+    let available = new BigNumber("0");
+
+    if ("selling_liabilities" in balance) {
+      sellingLiabilities = new BigNumber(
+        balance.selling_liabilities,
+      ).toString();
+      available = total.minus(sellingLiabilities);
+    }
+
+    if ("buying_liabilities" in balance) {
+      buyingLiabilities = new BigNumber(balance.buying_liabilities).toString();
+    }
+
+    if (identifier === "native") {
+      // define the native balance line later
+
+      displayableBalances.native = {
+        token: {
+          type: "native",
+          code: "XLM",
         },
+        total,
+        available,
+        sellingLiabilities,
+        buyingLiabilities,
+        minimumBalance: new BigNumber(BASE_RESERVE_MIN_COUNT)
+          .plus(subentry_count)
+          .plus(num_sponsoring)
+          .minus(num_sponsored)
+          .times(BASE_RESERVE)
+          .plus(sellingLiabilities),
+        blockaidData: defaultBlockaidScanAssetResult,
       };
-    },
-    {},
-  );
+      continue;
+    }
+
+    const liquidityPoolBalance =
+      balance as StellarSdk.Horizon.HorizonApi.BalanceLineLiquidityPool;
+    if (identifier.includes(":lp")) {
+      displayableBalances[identifier] = {
+        liquidityPoolId: liquidityPoolBalance.liquidity_pool_id,
+        total,
+        limit: new BigNumber(liquidityPoolBalance.limit),
+      } as AssetBalance;
+      continue;
+    }
+
+    const assetBalance =
+      balance as StellarSdk.Horizon.HorizonApi.BalanceLineAsset;
+    const assetSponsor = assetBalance.sponsor
+      ? { sponsor: assetBalance.sponsor }
+      : {};
+
+    displayableBalances[identifier] = {
+      token: {
+        type: assetBalance.asset_type,
+        code: assetBalance.asset_code,
+        issuer: {
+          key: assetBalance.asset_issuer,
+        },
+      },
+      sellingLiabilities,
+      buyingLiabilities,
+      total,
+      limit: new BigNumber(assetBalance.limit),
+      available: total.minus(sellingLiabilities),
+      blockaidData:
+        blockaidScanResults[identifier.replace(":", "-")] ||
+        defaultBlockaidScanAssetResult,
+      ...assetSponsor,
+    };
+
+    continue;
+  }
 
-  return displayableBalances as BalanceMap;
-}
+  return displayableBalances;
+};
diff --git a/docs/docs/guide/account.md b/docs/docs/guide/account.md
new file mode 100644
index 000000000..b334e2c96
--- /dev/null
+++ b/docs/docs/guide/account.md
@@ -0,0 +1,21 @@
+---
+id: account
+title: Account & Network Settings
+slug: /account
+---
+
+## Adding a new account
+
+In order to use another account that is derived from your seed phrase to Freighter, you can do the following:
+
+- From the account balances page, you can click on the "accounts" dropdown from the identicon in the upper left corner of the screen in order to open the account options.
+- From the options page, you can "Import a Stellar secret key" if you already have your secret key or you can "Create new Stellar wallet" if you want to generate one. Please note - accounts imported by secret key may not be derived from your seed phrase.
+- After importing or generating a new account, you will land on the "account balances" screen where you should see an unfunded account unless you have used the account previously.
+
+## Custom RPC
+
+Freighter configures it's own RPCs for the base networks, but you can configure a "custom network" in order to bring your own [Horizon instance](https://developers.stellar.org/docs/data/horizon) and/or [RPC instance](https://github.com/stellar/soroban-rpc) into Freighter as a data source.
+
+You can click on the on current network using the tab in the upper right corner of the screen, and select "Add custom network" from the dropdown.
+At this point you can configure a custom network to be used in Freighter.
+You should get your network settings(passphrase, friendbot URL, etc) from your Horizon/RPC provider.
diff --git a/docs/docs/guide/addAsset.md b/docs/docs/guide/addAsset.md
new file mode 100644
index 000000000..405ffe5b6
--- /dev/null
+++ b/docs/docs/guide/addAsset.md
@@ -0,0 +1,14 @@
+---
+id: addAsset
+title: Adding an Asset
+slug: /add-asset
+---
+
+## Adding a new asset to your account
+
+If you would like to add an asset to your account balances, you can do that by clicking "Manage Assets" on the account balances screen.
+This will navigate you to a screen where you can see your current assets and an "Add Asset" button. You can click that to find and add another asset.
+
+If you don't find your asset by name, you can also enter the asset details in manually by providing the issuer's public key or the asset contract's ID in the case of [SEP-41 tokens.](https://developers.stellar.org/docs/tokens/stellar-asset-contract)
+
+Once you've found and confirmed your asset, you can click "Add Asset" to add it to your account balances screen.
diff --git a/docs/docs/guide/advancedSettings.md b/docs/docs/guide/advancedSettings.md
new file mode 100644
index 000000000..e1da3dd3e
--- /dev/null
+++ b/docs/docs/guide/advancedSettings.md
@@ -0,0 +1,24 @@
+---
+id: advancedSettings
+title: Advanced Settings
+slug: /adavnced-settings
+---
+
+## Navigating to advanced settings
+
+In order to enable experimental mode, you can do the following:
+
+- Open Freighter, and click on "Settings"(the cog) on our bottom navigation bar.
+- Click on the "Security" menu item
+- Click on "Advanced Settings", and read the disclaimer. If you want to proceed, then click "I understand, continue"
+
+## Settings
+
+**Use Futurenet**
+This setting enables access to the Futurenet network and disables access to Pubnet.
+
+**Enable Blind Signing on Ledger**
+This can be used to sign arbitrary transaction hashes without having to decode them first. Ledger will not display the transaction details in the device display prior to signing so make sure you only interact with applications you know and trust.
+
+**Connect to domain without SSL certificate**
+Allow Freighter to connect to domains that do not have an SSL certificate on Mainnet. SSL certificates provide an encrypted network connection and also provide proof of ownership of the domain. Use caution when connecting to domains without an SSL certificate.
diff --git a/docs/docs/guide/introduction.md b/docs/docs/guide/introduction.md
index e1c43524c..6ae673964 100644
--- a/docs/docs/guide/introduction.md
+++ b/docs/docs/guide/introduction.md
@@ -5,9 +5,12 @@ title: Introduction
 
 ## Welcome to Freighter
 
-The User Guide will cover:
+The Guide will cover:
 
 - Installing the extension and Freighter-API
 - Integrating with Freighter
+- Creating/importing accounts & network settings
+- Adding assets to your wallet and making payments
+- Signing transaction XDR
 
 Once you've installed the extension and the API, and you've familiarized yourself with how to integrate, head down to the Playground to test your connection with the extension.
diff --git a/docs/docs/guide/makePayment.md b/docs/docs/guide/makePayment.md
new file mode 100644
index 000000000..2b48b2bef
--- /dev/null
+++ b/docs/docs/guide/makePayment.md
@@ -0,0 +1,16 @@
+---
+id: makePayment
+title: Make a payment
+slug: /make-payment
+---
+
+## Making a payment
+
+You can make a payment from your account in Freighter to another account by clicking on the "send" button from the homescreen or by clicking into any balance in your account, and clicking "send" on the balance detail screen.
+
+To complete a payment, follow these steps -
+
+- Enter a recipient address, or select a "recent address" if you have a history of payments.
+- Choose your payment asset and amount. You can select any asset in your balances to make a payment. Please note that if your recipient does not have a trustline open to the asset, the transaction will be rejected. You can also enter in an amount to send to the recipient, with an optional "set max" option which will send them your entire balance of that asset (unless it is XLM, in which case you need to maintain a base reserve).
+- Set your desired transaction fee, timeout, and memo. Freighter will provide you with an estimate for an appropriate fee but you can choose to change it. Some exchanges(like [Binance](https://support.binance.us/hc/en-us/articles/360052205274-Memos-on-Binance-US)) require the use of memos in order to properly interact with keys that they control. You can set a memo at this step.
+- Confirm the transaction details and observe any potential warnings about your transaction before submitting to the network.
diff --git a/docs/docs/guide/signXdr.md b/docs/docs/guide/signXdr.md
new file mode 100644
index 000000000..bd71b0c18
--- /dev/null
+++ b/docs/docs/guide/signXdr.md
@@ -0,0 +1,20 @@
+---
+id: signXdr
+title: Sign XDR
+slug: /sign-xdr
+---
+
+## Signing XDR
+
+You trigger an "xdr signing" workflow by utilizing the [signTransaction API](https://docs.freighter.app/docs/playground/signTransaction).
+The API takes an xdr string and network options as input and triggers a modal where you can review transaction/operation details and sign the transaction. Freighter will return the signed transaction to the application that called the API after user confirmation.
+
+You can serialize an assembled transaction to a base64 encoded xdr string using [the stellar-sdk](https://stellar.github.io/js-stellar-sdk/AssembledTransaction.html#toXDR).
+
+### Signing details
+
+During the transaction/operation review, you can review signing details at different fidelities.
+
+- Summary: The first tab is the summary tab which lays out high level trasnsction/operation details.
+- Operation Details: The second tab exposes information about the operations in the transaction and optionally walks through the invocation chain and highlights authorizations.
+- Raw XDR: The last tab lets you copy the raw XDR to be used outside of Freighter.
diff --git a/docs/docs/playground/components/SignMessageDemo.tsx b/docs/docs/playground/components/SignMessageDemo.tsx
index d4806e6f1..597cf1f20 100644
--- a/docs/docs/playground/components/SignMessageDemo.tsx
+++ b/docs/docs/playground/components/SignMessageDemo.tsx
@@ -30,7 +30,6 @@ export const SignMessageDemo = () => {
     if (signedMessageObj.error) {
       setResult(JSON.stringify(signedMessageObj.error));
     } else {
-      console.log(signedMessageObj);
       setResult(JSON.stringify(signedMessageObj.signedMessage));
       setSignerAddressResult(signedMessageObj.signerAddress);
     }
diff --git a/docs/sidebars.js b/docs/sidebars.js
index eaf81369f..7dc46a21f 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -14,19 +14,24 @@ const playgroundPaths = [
 ];
 
 const GUIDE_BASE_PATH = "guide";
-const guidePaths = [
-  "introduction",
-  "gettingStarted",
-  "usingFreighterWebApp",
-  "usingFreighterBrowser",
+const introPaths = ["introduction", "gettingStarted"];
+const userGuidePaths = [
+  "account",
+  "advancedSettings",
+  "addAsset",
+  "makePayment",
+  "signXdr",
 ];
+const techGuidePaths = ["usingFreighterWebApp", "usingFreighterBrowser"];
 
 const constructPaths = (paths, basePath) =>
   paths.map((path) => `${basePath}/${path}`);
 
 module.exports = {
   someSidebar: {
-    "User Guide": constructPaths(guidePaths, GUIDE_BASE_PATH),
+    Introduction: constructPaths(introPaths, GUIDE_BASE_PATH),
+    "User Guide": constructPaths(userGuidePaths, GUIDE_BASE_PATH),
+    "Technical Guide": constructPaths(techGuidePaths, GUIDE_BASE_PATH),
     Playground: constructPaths(playgroundPaths, PLAYGROUND_BASE_PATH),
   },
 };
diff --git a/extension/e2e-tests/addAsset.test.ts b/extension/e2e-tests/addAsset.test.ts
index fdca9ddb3..7e8a37d95 100644
--- a/extension/e2e-tests/addAsset.test.ts
+++ b/extension/e2e-tests/addAsset.test.ts
@@ -1,5 +1,6 @@
 import { test, expect, expectPageToHaveScreenshot } from "./test-fixtures";
 import { loginToTestAccount, PASSWORD } from "./helpers/login";
+import { TEST_TOKEN_ADDRESS } from "./helpers/test-token";
 
 test("Adding unverified Soroban token", async ({ page, extensionId }) => {
   test.slow();
@@ -15,13 +16,11 @@ test("Adding unverified Soroban token", async ({ page, extensionId }) => {
   await expect(page.getByText("Your assets")).toBeVisible();
   await page.getByText("Add an asset").click({ force: true });
   await page.getByText("Add manually").click({ force: true });
-  await page
-    .getByTestId("search-token-input")
-    .fill("CAHX2LUNQ4YKNJTDEFW2LSFOXDAL4QI4736RV52ZUGCIRJK5U7MWQWW6");
+  await page.getByTestId("search-token-input").fill(TEST_TOKEN_ADDRESS);
   await expect(page.getByTestId("asset-notification")).toHaveText(
     "Not on your listsFreighter uses asset lists to check assets you interact with. You can define your own assets lists in Settings.",
   );
-  await expect(page.getByTestId("ManageAssetCode")).toHaveText("E2E Token");
+  await expect(page.getByTestId("ManageAssetCode")).toHaveText("E2E");
   await expect(page.getByTestId("ManageAssetRowButton")).toHaveText("Add");
   await page.getByTestId("ManageAssetRowButton").click({ force: true });
 
diff --git a/extension/e2e-tests/helpers/login.ts b/extension/e2e-tests/helpers/login.ts
index 214b61384..ea528b888 100644
--- a/extension/e2e-tests/helpers/login.ts
+++ b/extension/e2e-tests/helpers/login.ts
@@ -22,6 +22,7 @@ export const loginAndFund = async ({ page, extensionId }) => {
   });
 
   await page.goto(`chrome-extension://${extensionId}/index.html#/account`);
+  // await page.getByTestId("BlockaidAnnouncement__accept").click();
   await expect(page.getByTestId("network-selector-open")).toBeVisible({
     timeout: 10000,
   });
@@ -75,6 +76,7 @@ export const loginToTestAccount = async ({ page, extensionId }) => {
   });
 
   await page.goto(`chrome-extension://${extensionId}/index.html#/account`);
+  // await page.getByTestId("BlockaidAnnouncement__accept").click();
   await expect(page.getByTestId("network-selector-open")).toBeVisible({
     timeout: 50000,
   });
diff --git a/extension/e2e-tests/helpers/test-token.ts b/extension/e2e-tests/helpers/test-token.ts
new file mode 100644
index 000000000..ce274d84f
--- /dev/null
+++ b/extension/e2e-tests/helpers/test-token.ts
@@ -0,0 +1,2 @@
+export const TEST_TOKEN_ADDRESS =
+  "CA5F3Q3KQWGG5J4U6OBCJEFVG4B5JVMHFRGQGMLNZXTEMO7YEO6UYMMD";
diff --git a/extension/e2e-tests/loadAccount.test.ts b/extension/e2e-tests/loadAccount.test.ts
new file mode 100644
index 000000000..f989b05a2
--- /dev/null
+++ b/extension/e2e-tests/loadAccount.test.ts
@@ -0,0 +1,29 @@
+import { test, expect, expectPageToHaveScreenshot } from "./test-fixtures";
+import { loginToTestAccount } from "./helpers/login";
+
+test("Load accounts on standalone network", async ({ page, extensionId }) => {
+  test.slow();
+  await loginToTestAccount({ page, extensionId });
+  await page.getByTestId("network-selector-open").click();
+  await page.getByText("Add custom network").click();
+  await expect(page.getByText("Add Custom Network")).toBeVisible();
+  await expectPageToHaveScreenshot({
+    page,
+    screenshot: "network-form-page.png",
+  });
+  await page.getByTestId("NetworkForm__networkName").fill("test standalone");
+  await page
+    .getByTestId("NetworkForm__networkUrl")
+    .fill("https://horizon-testnet.stellar.org");
+  await page
+    .getByTestId("NetworkForm__sorobanRpcUrl")
+    .fill("https://soroban-testnet.stellar.org/");
+  await page
+    .getByTestId("NetworkForm__networkPassphrase")
+    .fill("Test SDF Network ; September 2015");
+  await page.getByTestId("NetworkForm__add").click();
+  await expect(page.getByTestId("account-view")).toBeVisible({
+    timeout: 30000,
+  });
+  await expect(page.getByTestId("account-assets")).toContainText("XLM");
+});
diff --git a/extension/e2e-tests/loadAccount.test.ts-snapshots/network-form-page-chromium-darwin.png b/extension/e2e-tests/loadAccount.test.ts-snapshots/network-form-page-chromium-darwin.png
new file mode 100644
index 000000000..52e9279bf
Binary files /dev/null and b/extension/e2e-tests/loadAccount.test.ts-snapshots/network-form-page-chromium-darwin.png differ
diff --git a/extension/e2e-tests/sendPayment.test.ts b/extension/e2e-tests/sendPayment.test.ts
index 058e5f5d8..bc59800ed 100644
--- a/extension/e2e-tests/sendPayment.test.ts
+++ b/extension/e2e-tests/sendPayment.test.ts
@@ -1,5 +1,6 @@
 import { test, expect, expectPageToHaveScreenshot } from "./test-fixtures";
 import { loginAndFund, loginToTestAccount, PASSWORD } from "./helpers/login";
+import { TEST_TOKEN_ADDRESS } from "./helpers/test-token";
 
 test("Send XLM payment to G address", async ({ page, extensionId }) => {
   test.slow();
@@ -78,9 +79,7 @@ test("Send XLM payment to C address", async ({ page, extensionId }) => {
   // send XLM to C address
   await page.getByTitle("Send Payment").click({ force: true });
   await expect(page.getByText("Send To")).toBeVisible();
-  await page
-    .getByTestId("send-to-input")
-    .fill("CAHX2LUNQ4YKNJTDEFW2LSFOXDAL4QI4736RV52ZUGCIRJK5U7MWQWW6");
+  await page.getByTestId("send-to-input").fill(TEST_TOKEN_ADDRESS);
   await page.getByText("Continue").click({ force: true });
 
   await expect(page.getByText("Send XLM")).toBeVisible();
@@ -172,9 +171,7 @@ test("Send SAC to C address", async ({ page, extensionId }) => {
 
   // send SAC to C address
   await page.getByTitle("Send Payment").click({ force: true });
-  await page
-    .getByTestId("send-to-input")
-    .fill("CAHX2LUNQ4YKNJTDEFW2LSFOXDAL4QI4736RV52ZUGCIRJK5U7MWQWW6");
+  await page.getByTestId("send-to-input").fill(TEST_TOKEN_ADDRESS);
   await page.getByText("Continue").click({ force: true });
 
   await page.getByTestId("send-amount-asset-select").click({ force: true });
@@ -227,17 +224,13 @@ test("Send token payment to C address", async ({ page, extensionId }) => {
   await expect(page.getByText("Your assets")).toBeVisible();
   await page.getByText("Add an asset").click({ force: true });
   await page.getByText("Add manually").click({ force: true });
-  await page
-    .getByTestId("search-token-input")
-    .fill("CAHX2LUNQ4YKNJTDEFW2LSFOXDAL4QI4736RV52ZUGCIRJK5U7MWQWW6");
+  await page.getByTestId("search-token-input").fill(TEST_TOKEN_ADDRESS);
   await page.getByTestId("ManageAssetRowButton").click({ force: true });
   await page.getByTestId("add-asset").dispatchEvent("click");
 
   // send E2E token to C address
   await page.getByTitle("Send Payment").click({ force: true });
-  await page
-    .getByTestId("send-to-input")
-    .fill("CAHX2LUNQ4YKNJTDEFW2LSFOXDAL4QI4736RV52ZUGCIRJK5U7MWQWW6");
+  await page.getByTestId("send-to-input").fill(TEST_TOKEN_ADDRESS);
   await page.getByText("Continue").click({ force: true });
 
   await page.getByTestId("send-amount-asset-select").click({ force: true });
diff --git a/extension/src/background/constants/apiUrls.ts b/extension/src/background/constants/apiUrls.ts
index 3ae431ac2..53ba60a57 100644
--- a/extension/src/background/constants/apiUrls.ts
+++ b/extension/src/background/constants/apiUrls.ts
@@ -1,5 +1,2 @@
-export const STELLAR_EXPERT_BLOCKED_ACCOUNTS_URL =
-  "https://api.stellar.expert/explorer/directory?limit=20000000&tag[]=malicious&tag[]=unsafe&tag[]=memo-required";
-
-export const STELLAR_EXPERT_BLOCKED_DOMAINS_URL =
-  "https://api.stellar.expert/explorer/directory/blocked-domains?limit=1000";
+export const STELLAR_EXPERT_MEMO_REQUIRED_ACCOUNTS_URL =
+  "https://api.stellar.expert/explorer/directory?limit=20000000&tag[]=memo-required";
diff --git a/extension/src/background/helpers/account.ts b/extension/src/background/helpers/account.ts
index 158925f9f..62cc32682 100644
--- a/extension/src/background/helpers/account.ts
+++ b/extension/src/background/helpers/account.ts
@@ -4,8 +4,6 @@ import {
   KEY_ID_LIST,
   KEY_ID,
   IS_VALIDATING_MEMO_ID,
-  IS_VALIDATING_SAFETY_ID,
-  IS_VALIDATING_SAFE_ASSETS_ID,
   NETWORK_ID,
   NETWORKS_LIST_ID,
   IS_EXPERIMENTAL_MODE_ID,
@@ -13,6 +11,7 @@ import {
   ASSETS_LISTS_ID,
   IS_HASH_SIGNING_ENABLED_ID,
   IS_NON_SSL_ENABLED_ID,
+  IS_BLOCKAID_ANNOUNCED_ID,
 } from "constants/localStorageTypes";
 import { DEFAULT_NETWORKS, NetworkDetails } from "@shared/constants/stellar";
 import { DEFAULT_ASSETS_LISTS } from "@shared/constants/soroban/token";
@@ -92,12 +91,6 @@ export const getAllowList = async () => {
 export const getIsMemoValidationEnabled = async () =>
   (await localStore.getItem(IS_VALIDATING_MEMO_ID)) ?? true;
 
-export const getIsSafetyValidationEnabled = async () =>
-  (await localStore.getItem(IS_VALIDATING_SAFETY_ID)) ?? true;
-
-export const getIsValidatingSafeAssetsEnabled = async () =>
-  (await localStore.getItem(IS_VALIDATING_SAFE_ASSETS_ID)) ?? true;
-
 export const getIsExperimentalModeEnabled = async () =>
   (await localStore.getItem(IS_EXPERIMENTAL_MODE_ID)) ?? false;
 
@@ -161,6 +154,16 @@ export const getIsNonSSLEnabled = async () => {
   return isNonSSLEnabled;
 };
 
+export const getIsBlockaidAnnounced = async () => {
+  if (!(await localStore.getItem(IS_BLOCKAID_ANNOUNCED_ID))) {
+    await localStore.setItem(IS_BLOCKAID_ANNOUNCED_ID, false);
+  }
+  const isBlockaidAnnounced =
+    (await localStore.getItem(IS_BLOCKAID_ANNOUNCED_ID)) ?? false;
+
+  return isBlockaidAnnounced;
+};
+
 export const getIsRpcHealthy = async (networkDetails: NetworkDetails) => {
   let rpcHealth = { status: "" };
   if (isCustomNetwork(networkDetails)) {
diff --git a/extension/src/background/helpers/dataStorage.ts b/extension/src/background/helpers/dataStorage.ts
index cddc8d1b6..0f3f5e55e 100644
--- a/extension/src/background/helpers/dataStorage.ts
+++ b/extension/src/background/helpers/dataStorage.ts
@@ -10,6 +10,7 @@ import {
   ASSETS_LISTS_ID,
   IS_HASH_SIGNING_ENABLED_ID,
   IS_NON_SSL_ENABLED_ID,
+  // IS_BLOCKAID_ANNOUNCED_ID,
 } from "constants/localStorageTypes";
 import {
   DEFAULT_NETWORKS,
@@ -251,6 +252,21 @@ export const addIsNonSSLEnabled = async () => {
   }
 };
 
+export const removeStellarExpertData = async () => {
+  const localStore = dataStorageAccess(browserLocalStorage);
+  const storageVersion = (await localStore.getItem(STORAGE_VERSION)) as string;
+
+  if (!storageVersion || semver.lt(storageVersion, "4.3.0")) {
+    await localStore.remove([
+      "cachedBlockedAccountsId",
+      "cachedBlockedAccountsId_date",
+      "cachedBlockedDomainsId",
+      "cachedBlockedDomainsId_date",
+    ]);
+    await migrateDataStorageVersion("4.3.0");
+  }
+};
+
 export const versionedMigration = async () => {
   // sequentially call migrations in order to enforce smooth schema upgrades
 
@@ -263,6 +279,7 @@ export const versionedMigration = async () => {
   await addAssetsLists();
   await addIsHashSigningEnabled();
   await addIsNonSSLEnabled();
+  await removeStellarExpertData();
 };
 
 // Updates storage version
diff --git a/extension/src/background/messageListener/freighterApiMessageListener.ts b/extension/src/background/messageListener/freighterApiMessageListener.ts
index 44a281982..d679d0932 100644
--- a/extension/src/background/messageListener/freighterApiMessageListener.ts
+++ b/extension/src/background/messageListener/freighterApiMessageListener.ts
@@ -23,18 +23,17 @@ import {
   MAINNET_NETWORK_DETAILS,
   NetworkDetails,
 } from "@shared/constants/stellar";
-import { STELLAR_EXPERT_BLOCKED_ACCOUNTS_URL } from "background/constants/apiUrls";
+import { STELLAR_EXPERT_MEMO_REQUIRED_ACCOUNTS_URL } from "background/constants/apiUrls";
 import { POPUP_HEIGHT, POPUP_WIDTH } from "constants/dimensions";
 import {
   ALLOWLIST_ID,
-  CACHED_BLOCKED_ACCOUNTS_ID,
+  CACHED_MEMO_REQUIRED_ACCOUNTS_ID,
 } from "constants/localStorageTypes";
 import { TRANSACTION_WARNING } from "constants/transaction";
 
 import {
   getIsMainnet,
   getIsMemoValidationEnabled,
-  getIsSafetyValidationEnabled,
   getNetworkDetails,
 } from "background/helpers/account";
 import { isSenderAllowed } from "background/helpers/allowListAuthorization";
@@ -164,8 +163,8 @@ export const freighterApiMessageListener = (
       );
 
       const directoryLookupJson = await cachedFetch(
-        STELLAR_EXPERT_BLOCKED_ACCOUNTS_URL,
-        CACHED_BLOCKED_ACCOUNTS_ID,
+        STELLAR_EXPERT_MEMO_REQUIRED_ACCOUNTS_URL,
+        CACHED_MEMO_REQUIRED_ACCOUNTS_ID,
       );
       const accountData = directoryLookupJson?._embedded?.records || [];
 
@@ -183,10 +182,8 @@ export const freighterApiMessageListener = (
 
       const isValidatingMemo =
         (await getIsMemoValidationEnabled()) && isMainnet;
-      const isValidatingSafety =
-        (await getIsSafetyValidationEnabled()) && isMainnet;
 
-      if (isValidatingMemo || isValidatingSafety) {
+      if (isValidatingMemo) {
         _operations.forEach((operation: StellarSdk.Operation) => {
           accountData.forEach(
             ({ address, tags }: { address: string; tags: string[] }) => {
@@ -198,16 +195,8 @@ export const freighterApiMessageListener = (
 
                 /* if the user has opted out of validation, remove applicable tags */
                 if (!isValidatingMemo) {
-                  collectedTags.filter(
-                    (tag) => tag !== TRANSACTION_WARNING.memoRequired,
-                  );
-                }
-                if (!isValidatingSafety) {
                   collectedTags = collectedTags.filter(
-                    (tag) => tag !== TRANSACTION_WARNING.unsafe,
-                  );
-                  collectedTags = collectedTags.filter(
-                    (tag) => tag !== TRANSACTION_WARNING.malicious,
+                    (tag) => tag !== TRANSACTION_WARNING.memoRequired,
                   );
                 }
                 flaggedKeys[operation.destination] = {
diff --git a/extension/src/background/messageListener/popupMessageListener.ts b/extension/src/background/messageListener/popupMessageListener.ts
index 247439d8b..f3550856e 100644
--- a/extension/src/background/messageListener/popupMessageListener.ts
+++ b/extension/src/background/messageListener/popupMessageListener.ts
@@ -26,8 +26,7 @@ import { calculateSenderMinBalance } from "@shared/helpers/migration";
 import {
   Account,
   Response as Request,
-  BlockedDomains,
-  BlockedAccount,
+  MemoRequiredAccount,
   MigratableAccount,
 } from "@shared/api/types";
 import { MessageResponder } from "background/types";
@@ -41,20 +40,18 @@ import {
   CACHED_ASSET_DOMAINS_ID,
   DATA_SHARING_ID,
   IS_VALIDATING_MEMO_ID,
-  IS_VALIDATING_SAFETY_ID,
-  IS_VALIDATING_SAFE_ASSETS_ID,
   IS_EXPERIMENTAL_MODE_ID,
   KEY_DERIVATION_NUMBER_ID,
   KEY_ID,
   KEY_ID_LIST,
   RECENT_ADDRESSES,
-  CACHED_BLOCKED_DOMAINS_ID,
-  CACHED_BLOCKED_ACCOUNTS_ID,
+  CACHED_MEMO_REQUIRED_ACCOUNTS_ID,
   NETWORK_ID,
   NETWORKS_LIST_ID,
   TOKEN_ID_LIST,
   IS_HASH_SIGNING_ENABLED_ID,
   IS_NON_SSL_ENABLED_ID,
+  IS_BLOCKAID_ANNOUNCED_ID,
 } from "constants/localStorageTypes";
 import {
   FUTURENET_NETWORK_DETAILS,
@@ -71,8 +68,6 @@ import {
   getAllowList,
   getKeyIdList,
   getIsMemoValidationEnabled,
-  getIsSafetyValidationEnabled,
-  getIsValidatingSafeAssetsEnabled,
   getIsExperimentalModeEnabled,
   getIsHashSigningEnabled,
   getIsHardwareWalletActive,
@@ -83,6 +78,7 @@ import {
   getNetworksList,
   getAssetsLists,
   getIsNonSSLEnabled,
+  getIsBlockaidAnnounced,
   HW_PREFIX,
   getBipPath,
   subscribeTokenBalance,
@@ -117,10 +113,7 @@ import {
   passwordSelector,
   setMigratedMnemonicPhrase,
 } from "background/ducks/session";
-import {
-  STELLAR_EXPERT_BLOCKED_DOMAINS_URL,
-  STELLAR_EXPERT_BLOCKED_ACCOUNTS_URL,
-} from "background/constants/apiUrls";
+import { STELLAR_EXPERT_MEMO_REQUIRED_ACCOUNTS_URL } from "background/constants/apiUrls";
 import {
   AssetsListKey,
   DEFAULT_ASSETS_LISTS,
@@ -1214,24 +1207,11 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
   };
 
   const saveSettings = async () => {
-    const {
-      isDataSharingAllowed,
-      isMemoValidationEnabled,
-      isSafetyValidationEnabled,
-      isValidatingSafeAssetsEnabled,
-      isNonSSLEnabled,
-    } = request;
+    const { isDataSharingAllowed, isMemoValidationEnabled, isNonSSLEnabled } =
+      request;
 
     await localStore.setItem(DATA_SHARING_ID, isDataSharingAllowed);
     await localStore.setItem(IS_VALIDATING_MEMO_ID, isMemoValidationEnabled);
-    await localStore.setItem(
-      IS_VALIDATING_SAFETY_ID,
-      isSafetyValidationEnabled,
-    );
-    await localStore.setItem(
-      IS_VALIDATING_SAFE_ASSETS_ID,
-      isValidatingSafeAssetsEnabled,
-    );
     await localStore.setItem(IS_NON_SSL_ENABLED_ID, isNonSSLEnabled);
 
     const networkDetails = await getNetworkDetails();
@@ -1242,8 +1222,6 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
       allowList: await getAllowList(),
       isDataSharingAllowed,
       isMemoValidationEnabled: await getIsMemoValidationEnabled(),
-      isSafetyValidationEnabled: await getIsSafetyValidationEnabled(),
-      isValidatingSafeAssetsEnabled: await getIsValidatingSafeAssetsEnabled(),
       networkDetails,
       networksList: await getNetworksList(),
       isRpcHealthy,
@@ -1303,13 +1281,12 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     const isHashSigningEnabled = await getIsHashSigningEnabled();
     const assetsLists = await getAssetsLists();
     const isNonSSLEnabled = await getIsNonSSLEnabled();
+    const isBlockaidAnnounced = await getIsBlockaidAnnounced();
 
     return {
       allowList: await getAllowList(),
       isDataSharingAllowed,
       isMemoValidationEnabled: await getIsMemoValidationEnabled(),
-      isSafetyValidationEnabled: await getIsSafetyValidationEnabled(),
-      isValidatingSafeAssetsEnabled: await getIsValidatingSafeAssetsEnabled(),
       isExperimentalModeEnabled: await getIsExperimentalModeEnabled(),
       isHashSigningEnabled,
       networkDetails: await getNetworkDetails(),
@@ -1319,6 +1296,7 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
       userNotification,
       assetsLists,
       isNonSSLEnabled,
+      isBlockaidAnnounced,
     };
   };
 
@@ -1373,35 +1351,15 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     await localStore.setItem(CACHED_ASSET_DOMAINS_ID, assetDomainCache);
   };
 
-  const getBlockedDomains = async () => {
+  const getMemoRequiredAccounts = async () => {
     try {
       const resp = await cachedFetch(
-        STELLAR_EXPERT_BLOCKED_DOMAINS_URL,
-        CACHED_BLOCKED_DOMAINS_ID,
+        STELLAR_EXPERT_MEMO_REQUIRED_ACCOUNTS_URL,
+        CACHED_MEMO_REQUIRED_ACCOUNTS_ID,
       );
-      const blockedDomains = (resp?._embedded?.records || []).reduce(
-        (bd: BlockedDomains, obj: { domain: string }) => {
-          const map = bd;
-          map[obj.domain] = true;
-          return map;
-        },
-        {},
-      );
-      return { blockedDomains };
-    } catch (e) {
-      console.error(e);
-      return new Error("Error getting blocked domains");
-    }
-  };
-
-  const getBlockedAccounts = async () => {
-    try {
-      const resp = await cachedFetch(
-        STELLAR_EXPERT_BLOCKED_ACCOUNTS_URL,
-        CACHED_BLOCKED_ACCOUNTS_ID,
-      );
-      const blockedAccounts: BlockedAccount[] = resp?._embedded?.records || [];
-      return { blockedAccounts };
+      const memoRequiredAccounts: MemoRequiredAccount[] =
+        resp?._embedded?.records || [];
+      return { memoRequiredAccounts };
     } catch (e) {
       console.error(e);
       return new Error("Error getting blocked accounts");
@@ -1774,6 +1732,14 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     return { assetsLists: await getAssetsLists() };
   };
 
+  const saveIsBlockaidAnnounced = async () => {
+    const { isBlockaidAnnounced } = request;
+
+    await localStore.setItem(IS_BLOCKAID_ANNOUNCED_ID, isBlockaidAnnounced);
+
+    return { isBlockaidAnnounced: await getIsBlockaidAnnounced() };
+  };
+
   const messageResponder: MessageResponder = {
     [SERVICE_TYPES.CREATE_ACCOUNT]: createAccount,
     [SERVICE_TYPES.FUND_ACCOUNT]: fundAccount,
@@ -1815,17 +1781,17 @@ export const popupMessageListener = (request: Request, sessionStore: Store) => {
     [SERVICE_TYPES.CACHE_ASSET_ICON]: cacheAssetIcon,
     [SERVICE_TYPES.GET_CACHED_ASSET_DOMAIN]: getCachedAssetDomain,
     [SERVICE_TYPES.CACHE_ASSET_DOMAIN]: cacheAssetDomain,
-    [SERVICE_TYPES.GET_BLOCKED_DOMAINS]: getBlockedDomains,
     [SERVICE_TYPES.RESET_EXP_DATA]: resetExperimentalData,
     [SERVICE_TYPES.ADD_TOKEN_ID]: addTokenId,
     [SERVICE_TYPES.GET_TOKEN_IDS]: getTokenIds,
     [SERVICE_TYPES.REMOVE_TOKEN_ID]: removeTokenId,
-    [SERVICE_TYPES.GET_BLOCKED_ACCOUNTS]: getBlockedAccounts,
+    [SERVICE_TYPES.GET_MEMO_REQUIRED_ACCOUNTS]: getMemoRequiredAccounts,
     [SERVICE_TYPES.GET_MIGRATABLE_ACCOUNTS]: getMigratableAccounts,
     [SERVICE_TYPES.GET_MIGRATED_MNEMONIC_PHRASE]: getMigratedMnemonicPhrase,
     [SERVICE_TYPES.MIGRATE_ACCOUNTS]: migrateAccounts,
     [SERVICE_TYPES.ADD_ASSETS_LIST]: addAssetsList,
     [SERVICE_TYPES.MODIFY_ASSETS_LIST]: modifyAssetsList,
+    [SERVICE_TYPES.SAVE_IS_BLOCKAID_ANNOUNCED]: saveIsBlockaidAnnounced,
   };
 
   return messageResponder[request.type]();
diff --git a/extension/src/constants/localStorageTypes.ts b/extension/src/constants/localStorageTypes.ts
index 757fe3f53..75f3494c6 100644
--- a/extension/src/constants/localStorageTypes.ts
+++ b/extension/src/constants/localStorageTypes.ts
@@ -5,13 +5,10 @@ export const APPLICATION_ID = "applicationState";
 export const DATA_SHARING_ID = "dataSharingStatus";
 export const KEY_DERIVATION_NUMBER_ID = "keyDerivationNumber";
 export const ACCOUNT_NAME_LIST_ID = "accountNameList";
-export const CACHED_BLOCKED_ACCOUNTS_ID = "cachedBlockedAccountsId";
-export const CACHED_BLOCKED_DOMAINS_ID = "cachedBlockedDomainsId";
+export const CACHED_MEMO_REQUIRED_ACCOUNTS_ID = "cachedMemoRequiredAccountsId";
 export const CACHED_ASSET_ICONS_ID = "cachedAssetIconsId";
 export const CACHED_ASSET_DOMAINS_ID = "cachedAssetDomainsId";
 export const IS_VALIDATING_MEMO_ID = "isValidatingMemo";
-export const IS_VALIDATING_SAFETY_ID = "isValidatingSafety";
-export const IS_VALIDATING_SAFE_ASSETS_ID = "isValidatingSafeAssets";
 export const IS_EXPERIMENTAL_MODE_ID = "isExperimentalMode";
 export const RECENT_ADDRESSES = "recentAddresses";
 export const NETWORK_ID = "network";
@@ -23,3 +20,4 @@ export const HAS_ACCOUNT_SUBSCRIPTION = "hasAccountSubscription";
 export const ASSETS_LISTS_ID = "assetsLists";
 export const IS_HASH_SIGNING_ENABLED_ID = "isHashSigningEnabled";
 export const IS_NON_SSL_ENABLED_ID = "isNonSSLEnabled";
+export const IS_BLOCKAID_ANNOUNCED_ID = "isBlockaidAnnounced";
diff --git a/extension/src/constants/transaction.ts b/extension/src/constants/transaction.ts
index 7db5044b9..cab5560c1 100644
--- a/extension/src/constants/transaction.ts
+++ b/extension/src/constants/transaction.ts
@@ -36,8 +36,6 @@ export enum OPERATION_TYPES {
 }
 
 export enum TRANSACTION_WARNING {
-  malicious = "malicious",
-  unsafe = "unsafe",
   memoRequired = "memo-required",
 }
 
diff --git a/extension/src/popup/__testHelpers__/index.tsx b/extension/src/popup/__testHelpers__/index.tsx
index 593074759..f2e545075 100644
--- a/extension/src/popup/__testHelpers__/index.tsx
+++ b/extension/src/popup/__testHelpers__/index.tsx
@@ -12,6 +12,7 @@ import { Balances } from "@shared/api/types";
 
 import { reducer as auth } from "popup/ducks/accountServices";
 import { reducer as settings } from "popup/ducks/settings";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 import {
   reducer as transactionSubmission,
   initialState as transactionSubmissionInitialState,
@@ -82,6 +83,7 @@ export const mockBalances = {
       decimals: 7,
       total: new BigNumber("1000000000"),
       available: new BigNumber("1000000000"),
+      blockaidData: defaultBlockaidScanAssetResult,
     },
     ["USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM"]: {
       token: {
@@ -92,11 +94,16 @@ export const mockBalances = {
       },
       total: new BigNumber("100"),
       available: new BigNumber("100"),
+      blockaidData: {
+        result_type: "Spam",
+        features: [{ description: "" }],
+      },
     },
     native: {
       token: { type: "native", code: "XLM" },
       total: new BigNumber("50"),
       available: new BigNumber("50"),
+      blockaidData: defaultBlockaidScanAssetResult,
     },
   } as any as Balances,
   isFunded: true,
diff --git a/extension/src/popup/assets/blockaid-logo.svg b/extension/src/popup/assets/blockaid-logo.svg
new file mode 100644
index 000000000..97832a487
--- /dev/null
+++ b/extension/src/popup/assets/blockaid-logo.svg
@@ -0,0 +1,17 @@
+<svg width="96" height="20" viewBox="0 0 96 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="SVG Export 2" clip-path="url(#clip0_2051_34896)">
+<path id="Vector" d="M18.5146 18.6619V0H22.0706V18.6619H18.5146Z" fill="white"/>
+<path id="Vector_2" d="M30.2428 19.0537C26.0854 19.0537 23.2354 15.9739 23.2354 11.9805C23.2354 7.9871 26.0854 4.90723 30.2428 4.90723C34.4002 4.90723 37.2503 7.9871 37.2503 11.9805C37.2503 15.9739 34.4002 19.0537 30.2428 19.0537ZM30.2428 16.3393C32.413 16.3393 33.642 14.5905 33.642 11.9805C33.642 9.37044 32.413 7.59559 30.2428 7.59559C28.0465 7.59559 26.8437 9.37044 26.8437 11.9805C26.8437 14.5905 28.0465 16.3393 30.2428 16.3393Z" fill="white"/>
+<path id="Vector_3" d="M44.6033 19.0537C40.3675 19.0537 37.7266 15.9739 37.7266 11.9805C37.7266 7.9871 40.3413 4.90723 44.4203 4.90723C47.8979 4.90723 50.0419 6.91698 50.5126 9.81415H47.035C46.7997 8.63962 45.8845 7.7522 44.5772 7.7522C42.4331 7.7522 41.3349 9.39654 41.3349 11.9805C41.3349 14.5122 42.3547 16.2088 44.5249 16.2088C45.963 16.2088 46.9827 15.4519 47.218 13.938H50.6433C50.408 16.783 48.1855 19.0537 44.6033 19.0537Z" fill="white"/>
+<path id="Vector_4" d="M60.5097 18.6619L56.7445 12.5544L55.2018 14.1465V18.6619H51.6719V0H55.2018V10.3358L59.9606 5.27232H64.2226L59.2807 10.3619L64.8239 18.6619H60.5097Z" fill="white"/>
+<path id="Vector_5" d="M73.4849 18.6615C73.2757 18.4005 73.145 17.7741 73.0665 17.1738H73.0142C72.3344 18.1917 71.367 18.9747 69.066 18.9747C66.3205 18.9747 64.3857 17.5392 64.3857 14.8769C64.3857 11.9276 66.7912 10.988 69.772 10.5703C71.9945 10.2571 73.0142 10.0744 73.0142 9.05652C73.0142 8.0908 72.256 7.46438 70.7656 7.46438C69.0921 7.46438 68.2816 8.0647 68.177 9.34363H65.0132C65.1178 6.99457 66.8696 4.93262 70.7917 4.93262C74.8184 4.93262 76.4395 6.73356 76.4395 9.86564V16.6779C76.4395 17.6958 76.5964 18.2961 76.9101 18.531V18.6615H73.4849ZM69.9289 16.4952C71.9683 16.4952 73.0927 15.2424 73.0927 13.9373V11.9276C72.4651 12.293 71.4977 12.5018 70.6087 12.7106C68.7522 13.1282 67.8371 13.5458 67.8371 14.7986C67.8371 16.0515 68.6738 16.4952 69.9289 16.4952Z" fill="white"/>
+<path id="Vector_6" d="M78.1777 18.6619V5.27232H81.7337V18.6619H78.1777ZM78.1777 3.18427V0H81.7337V3.18427H78.1777Z" fill="white"/>
+<path id="Vector_7" d="M88.5216 19.0534C85.1486 19.0534 82.8477 16.3129 82.8477 11.9802C82.8477 7.80408 85.2271 4.90691 88.5739 4.90691C90.4565 4.90691 91.6331 5.76823 92.3652 6.89056H92.4437V0H95.9997V18.6619H92.5744V16.9132H92.5221C91.7377 18.1921 90.4042 19.0534 88.5216 19.0534ZM89.306 16.078C91.424 16.078 92.5221 14.5119 92.5221 12.0585C92.5221 9.50062 91.6854 7.77798 89.4106 7.77798C87.4496 7.77798 86.456 9.50062 86.456 11.9802C86.456 14.5641 87.4757 16.078 89.306 16.078Z" fill="white"/>
+<path id="Vector_8" fill-rule="evenodd" clip-rule="evenodd" d="M12.9552 3.04555H0.175949V0.00390625H12.9552C15.3474 0.00390625 17.2867 1.94037 17.2867 4.32912C17.2867 6.71787 15.3474 8.65433 12.9552 8.65433H3.68766C3.33332 8.65433 3.04608 8.94116 3.04608 9.29498C3.04608 9.6488 3.33332 9.93563 3.68766 9.93563H12.9556C15.3476 9.93563 17.2867 11.8719 17.2867 14.2604C17.2867 16.649 15.3476 18.5853 12.9556 18.5853H0.175949V15.5436H12.9556C13.6653 15.5436 14.2407 14.9691 14.2407 14.2604C14.2407 13.5518 13.6653 12.9773 12.9556 12.9773H3.68766C1.65102 12.9773 0 11.3286 0 9.29498C0 7.2613 1.65102 5.61268 3.68766 5.61268H12.9552C13.6651 5.61268 14.2407 5.03801 14.2407 4.32912C14.2407 3.62022 13.6651 3.04555 12.9552 3.04555Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2051_34896">
+<rect width="96" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/extension/src/popup/assets/icon-invalid.svg b/extension/src/popup/assets/icon-invalid.svg
deleted file mode 100644
index db6e74a9f..000000000
--- a/extension/src/popup/assets/icon-invalid.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.8 5.2L5.2 8.8M5.2 5.2L8.8 8.8M4.516 1H9.484L13 4.516V9.484L9.484 13H4.516L1 9.484V4.516L4.516 1Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/extension/src/popup/assets/icon-shield-blockaid.svg b/extension/src/popup/assets/icon-shield-blockaid.svg
new file mode 100644
index 000000000..2735e94a8
--- /dev/null
+++ b/extension/src/popup/assets/icon-shield-blockaid.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<path id="Vector" d="M6.99967 1.45805V12.5414M11.6663 6.99972C11.6663 9.86298 8.5432 11.9455 7.40684 12.6084C7.27769 12.6837 7.21312 12.7214 7.12199 12.741C7.05127 12.7561 6.94808 12.7561 6.87736 12.741C6.78623 12.7214 6.72166 12.6837 6.59251 12.6084C5.45615 11.9455 2.33301 9.86298 2.33301 6.99972V4.20999C2.33301 3.74361 2.33301 3.51042 2.40928 3.30997C2.47667 3.13289 2.58616 2.97488 2.72831 2.84961C2.88921 2.70781 3.10756 2.62593 3.54424 2.46217L6.67196 1.28928C6.79323 1.2438 6.85387 1.22107 6.91625 1.21205C6.97158 1.20406 7.02777 1.20406 7.0831 1.21205C7.14548 1.22107 7.20612 1.2438 7.32739 1.28928L10.4551 2.46217C10.8918 2.62593 11.1101 2.70781 11.271 2.84961C11.4132 2.97488 11.5227 3.13289 11.5901 3.30997C11.6663 3.51042 11.6663 3.74361 11.6663 4.20999V6.99972Z" stroke="#707070" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/extension/src/popup/assets/icon-shield-plus.svg b/extension/src/popup/assets/icon-shield-plus.svg
new file mode 100644
index 000000000..8f134b025
--- /dev/null
+++ b/extension/src/popup/assets/icon-shield-plus.svg
@@ -0,0 +1,3 @@
+<svg width="11" height="12" viewBox="0 0 11 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Vector" d="M5.5 7.25018V4.25018M4 5.75018H7M9.5 6.00018C9.5 8.4544 6.82302 10.2394 5.849 10.8076C5.7383 10.8722 5.68295 10.9045 5.60484 10.9212C5.54422 10.9342 5.45578 10.9342 5.39516 10.9212C5.31705 10.9045 5.2617 10.8722 5.15101 10.8076C4.17698 10.2394 1.5 8.4544 1.5 6.00018V3.60898C1.5 3.20922 1.5 3.00935 1.56538 2.83753C1.62314 2.68575 1.71699 2.55032 1.83883 2.44294C1.97675 2.3214 2.1639 2.25122 2.5382 2.11085L5.2191 1.10552C5.32305 1.06654 5.37502 1.04705 5.42849 1.03932C5.47592 1.03247 5.52408 1.03247 5.57151 1.03932C5.62498 1.04705 5.67695 1.06654 5.7809 1.10552L8.4618 2.11085C8.8361 2.25122 9.02325 2.3214 9.16117 2.44294C9.28301 2.55032 9.37686 2.68575 9.43462 2.83753C9.5 3.00935 9.5 3.20922 9.5 3.60898V6.00018Z" stroke="#707070" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/extension/src/popup/assets/icon-warning-asset-blockaid.svg b/extension/src/popup/assets/icon-warning-asset-blockaid.svg
new file mode 100644
index 000000000..cbde7c008
--- /dev/null
+++ b/extension/src/popup/assets/icon-warning-asset-blockaid.svg
@@ -0,0 +1,10 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon" clip-path="url(#clip0_2109_6460)">
+<path id="Vector" d="M3.99935 2.66699V4.00033M3.99935 5.33366H4.00268M7.33268 4.00033C7.33268 5.84128 5.8403 7.33366 3.99935 7.33366C2.1584 7.33366 0.666016 5.84128 0.666016 4.00033C0.666016 2.15938 2.1584 0.666992 3.99935 0.666992C5.8403 0.666992 7.33268 2.15938 7.33268 4.00033Z" stroke="#E5484D" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_2109_6460">
+<rect width="8" height="8" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/extension/src/popup/assets/icon-warning-blockaid-yellow.svg b/extension/src/popup/assets/icon-warning-blockaid-yellow.svg
new file mode 100644
index 000000000..0d53f312b
--- /dev/null
+++ b/extension/src/popup/assets/icon-warning-blockaid-yellow.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<path id="Vector" d="M7 4.66667V7M7 9.33333H7.00583M4.55 12.25H9.45C10.4301 12.25 10.9201 12.25 11.2945 12.0593C11.6238 11.8915 11.8915 11.6238 12.0593 11.2945C12.25 10.9201 12.25 10.4301 12.25 9.45V4.55C12.25 3.56991 12.25 3.07986 12.0593 2.70552C11.8915 2.37623 11.6238 2.10852 11.2945 1.94074C10.9201 1.75 10.4301 1.75 9.45 1.75H4.55C3.56991 1.75 3.07986 1.75 2.70552 1.94074C2.37623 2.10852 2.10852 2.37623 1.94074 2.70552C1.75 3.07986 1.75 3.56991 1.75 4.55V9.45C1.75 10.4301 1.75 10.9201 1.94074 11.2945C2.10852 11.6238 2.37623 11.8915 2.70552 12.0593C3.07986 12.25 3.56991 12.25 4.55 12.25Z" stroke="#FFB224" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/extension/src/popup/assets/icon-warning-blockaid.svg b/extension/src/popup/assets/icon-warning-blockaid.svg
new file mode 100644
index 000000000..4f329c349
--- /dev/null
+++ b/extension/src/popup/assets/icon-warning-blockaid.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon">
+<path id="Vector" d="M7 4.66667V7M7 9.33333H7.00583M4.55 12.25H9.45C10.4301 12.25 10.9201 12.25 11.2945 12.0593C11.6238 11.8915 11.8915 11.6238 12.0593 11.2945C12.25 10.9201 12.25 10.4301 12.25 9.45V4.55C12.25 3.56991 12.25 3.07986 12.0593 2.70552C11.8915 2.37623 11.6238 2.10852 11.2945 1.94074C10.9201 1.75 10.4301 1.75 9.45 1.75H4.55C3.56991 1.75 3.07986 1.75 2.70552 1.94074C2.37623 2.10852 2.10852 2.37623 1.94074 2.70552C1.75 3.07986 1.75 3.56991 1.75 4.55V9.45C1.75 10.4301 1.75 10.9201 1.94074 11.2945C2.10852 11.6238 2.37623 11.8915 2.70552 12.0593C3.07986 12.25 3.56991 12.25 4.55 12.25Z" stroke="#E5484D" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/extension/src/popup/components/ModalInfo/index.tsx b/extension/src/popup/components/ModalInfo/index.tsx
index 46230bf5d..aad6e3c83 100644
--- a/extension/src/popup/components/ModalInfo/index.tsx
+++ b/extension/src/popup/components/ModalInfo/index.tsx
@@ -1,44 +1,131 @@
 import React from "react";
 import classNames from "classnames";
 import { Card, Icon } from "@stellar/design-system";
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
 
 import { PunycodedDomain } from "popup/components/PunycodedDomain";
-import { MaliciousDomainWarning } from "../WarningMessages";
+import { AssetIcon } from "popup/components/account/AccountAssets";
+import { transactionSubmissionSelector } from "popup/ducks/transactionSubmission";
+import IconShieldPlus from "popup/assets/icon-shield-plus.svg";
+import { BlockAidSiteScanLabel } from "../WarningMessages";
 
 import "./styles.scss";
 
+export type PillType = "Connection" | "Trustline" | "Transaction";
+
+interface PillyCopyProps {
+  pillType: PillType;
+}
+
+const PillCopy = ({ pillType }: PillyCopyProps) => {
+  const { t } = useTranslation();
+
+  if (pillType === "Transaction") {
+    return (
+      <>
+        <Icon.Link />
+        <div>{t("Transaction Request")}</div>
+      </>
+    );
+  }
+
+  if (pillType === "Trustline") {
+    return (
+      <>
+        <img src={IconShieldPlus} alt="Add trustline icon" />
+        <div>{t("Add Asset trustline")}</div>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <Icon.Link />
+      <div>{t("Connection Request")}</div>
+    </>
+  );
+};
+
 interface ModalInfoProps {
   children: React.ReactNode;
+  code: string;
+  issuer: string;
+  image: string;
+  pillType: PillType;
   domain: string;
-  subject: string;
+  asset: string;
   variant?: "default" | "malicious";
 }
 
 export const ModalInfo = ({
   children,
+  code,
+  issuer,
+  image,
+  pillType,
   domain,
-  subject,
+  asset,
   variant = "default",
 }: ModalInfoProps) => {
   const cardClasses = classNames("ModalInfo--card", {
     Malicious: variant === "malicious",
   });
+  const { assetIcons } = useSelector(transactionSubmissionSelector);
+
   return (
     <div className={cardClasses}>
       <Card variant="secondary">
-        <PunycodedDomain domain={domain} />
+        <div className="ModalInfo__icon">
+          <AssetIcon
+            assetIcons={assetIcons}
+            icon={image}
+            code={code}
+            issuerKey={issuer}
+            isSuspicious={false}
+            isModal
+          />
+        </div>
+        <div className="ModalInfo__asset">{asset}</div>
+        <div className="ModalInfo__domain">{domain}</div>
         <div className="ModalInfo--connection-request">
           <div className="ModalInfo--connection-request-pill">
-            <Icon.Link />
-            <p>Connection Request</p>
+            <PillCopy pillType={pillType} />
           </div>
         </div>
-        {variant === "malicious" && (
-          <MaliciousDomainWarning message="This app is likely malicious. Signing messages or transactions from this app could result in losing your assets." />
-        )}
-        <div className="ModalInfo--subject">{subject}</div>
         {children}
       </Card>
     </div>
   );
 };
+
+interface DomainScanModalInfoProps {
+  children: React.ReactNode;
+  domain: string;
+  subject: string;
+  isMalicious: boolean;
+  scanStatus: "hit" | "miss";
+}
+
+export const DomainScanModalInfo = ({
+  children,
+  domain,
+  subject,
+  isMalicious,
+  scanStatus,
+}: DomainScanModalInfoProps) => (
+  <div className="ModalInfo--card">
+    <Card variant="secondary">
+      <PunycodedDomain domain={domain} />
+      <div className="ModalInfo--connection-request">
+        <div className="ModalInfo--connection-request-pill">
+          <Icon.Link />
+          <p>Connection Request</p>
+        </div>
+      </div>
+      <BlockAidSiteScanLabel isMalicious={isMalicious} status={scanStatus} />
+      <div className="ModalInfo--subject">{subject}</div>
+      {children}
+    </Card>
+  </div>
+);
diff --git a/extension/src/popup/components/ModalInfo/styles.scss b/extension/src/popup/components/ModalInfo/styles.scss
index 34ec65861..ad2bee8f1 100644
--- a/extension/src/popup/components/ModalInfo/styles.scss
+++ b/extension/src/popup/components/ModalInfo/styles.scss
@@ -1,23 +1,26 @@
 .ModalInfo {
-  &--card.Malicious {
-    .Card {
-      .PunycodedDomain {
-        .PunycodedDomain__domain {
-          color: var(--color-red-50);
-        }
-      }
-    }
-  }
-
   &--connection-request {
     display: flex;
     justify-content: center;
     margin-bottom: 0.75rem;
   }
 
+  &--subject {
+    font-size: 0.75rem;
+    color: #a0a0a0;
+    background-color: #1c1c1c;
+    border-radius: 6px;
+    line-height: 1rem;
+    margin-bottom: 1.5rem;
+    padding-bottom: 1.5rem;
+    padding: 0.5rem;
+  }
+
   &--connection-request-pill {
     display: flex;
     align-items: center;
+    font-size: 0.75rem;
+    gap: 0.5rem;
     padding: 0 0.5rem;
     background-color: var(--color-gray-20);
     color: var(--color-gray-70);
@@ -32,15 +35,30 @@
     }
   }
 
-  &--subject {
-    font-size: 0.75rem;
-    color: #a0a0a0;
-    background-color: #1c1c1c;
-    border-radius: 6px;
-    line-height: 1rem;
-    margin-bottom: 1.5rem;
-    padding-bottom: 1.5rem;
-    padding: 0.5rem;
+  &__icon {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 0.5rem;
+  }
+
+  &__asset {
+    align-items: center;
+    color: var(--color-red-70);
+    display: flex;
+    font-size: 0.875rem;
+    font-weight: var(--font-weight-semi-bold);
+    justify-content: center;
+    line-height: 1.25rem;
     text-align: center;
   }
+
+  &__domain {
+    align-items: center;
+    color: var(--color-gray-70);
+    display: flex;
+    font-size: 0.75rem;
+    justify-content: center;
+    line-height: 1.125rem;
+    margin-bottom: 0.5rem;
+  }
 }
diff --git a/extension/src/popup/components/WarningMessages/index.tsx b/extension/src/popup/components/WarningMessages/index.tsx
index 5d2391ca8..296be4fcb 100644
--- a/extension/src/popup/components/WarningMessages/index.tsx
+++ b/extension/src/popup/components/WarningMessages/index.tsx
@@ -13,7 +13,11 @@ import {
 } from "stellar-sdk";
 import { captureException } from "@sentry/browser";
 
-import { ActionStatus } from "@shared/api/types";
+import {
+  ActionStatus,
+  BlockAidScanAssetResult,
+  BlockAidScanTxResult,
+} from "@shared/api/types";
 import { getTokenDetails } from "@shared/api/internal";
 import { TokenArgsDisplay } from "@shared/api/helpers/soroban";
 
@@ -30,6 +34,7 @@ import {
   settingsSelector,
   settingsNetworkDetailsSelector,
 } from "popup/ducks/settings";
+import { ModalInfo } from "popup/components/ModalInfo";
 import {
   ManageAssetRow,
   NewAssetFlags,
@@ -49,30 +54,49 @@ import { getManageAssetXDR } from "popup/helpers/getManageAssetXDR";
 import { METRIC_NAMES } from "popup/constants/metricsNames";
 import { emitMetric } from "helpers/metrics";
 import IconShieldCross from "popup/assets/icon-shield-cross.svg";
-import IconInvalid from "popup/assets/icon-invalid.svg";
 import IconWarning from "popup/assets/icon-warning.svg";
 import IconUnverified from "popup/assets/icon-unverified.svg";
 import IconNewAsset from "popup/assets/icon-new-asset.svg";
+import IconShieldBlockaid from "popup/assets/icon-shield-blockaid.svg";
+import IconWarningBlockaid from "popup/assets/icon-warning-blockaid.svg";
+import IconWarningBlockaidYellow from "popup/assets/icon-warning-blockaid-yellow.svg";
 import { getVerifiedTokens } from "popup/helpers/searchAsset";
+import { isAssetSuspicious, isBlockaidWarning } from "popup/helpers/blockaid";
 import { CopyValue } from "../CopyValue";
 
 import "./styles.scss";
 
-const DirectoryLink = () => {
-  const { t } = useTranslation();
-  return (
-    <a href="https://stellar.expert/directory" target="_blank" rel="noreferrer">
-      stellar.expert's {t("directory")}
-    </a>
-  );
-};
-
 export enum WarningMessageVariant {
   default = "",
   highAlert = "high-alert",
   warning = "warning",
 }
 
+interface WarningMessageHeaderProps {
+  header: string;
+  icon: React.ReactNode;
+  variant: WarningMessageVariant;
+  children?: React.ReactNode;
+}
+
+const WarningMessageHeader = ({
+  header,
+  icon,
+  variant,
+  children,
+}: WarningMessageHeaderProps) => (
+  <div
+    className={`WarningMessage__infoBlock WarningMessage__infoBlock--${variant}`}
+    data-testid="WarningMessage"
+  >
+    <div className="WarningMessage__header">
+      {icon}
+      <div>{header}</div>
+      {children}
+    </div>
+  </div>
+);
+
 interface WarningMessageProps {
   header: string;
   children: React.ReactNode;
@@ -96,20 +120,19 @@ export const WarningMessage = ({
   }: {
     children?: React.ReactNode;
   }) => (
-    <div
-      className={`WarningMessage__infoBlock WarningMessage__infoBlock--${variant}`}
-      data-testid="WarningMessage"
-    >
-      <div className="WarningMessage__header">
-        {variant ? (
+    <WarningMessageHeader
+      header={header}
+      icon={
+        variant ? (
           <Icon.Warning className="WarningMessage__icon" />
         ) : (
           <Icon.Info className="WarningMessage__default-icon" />
-        )}
-        <div>{header}</div>
-        {headerChildren}
-      </div>
-    </div>
+        )
+      }
+      variant={variant}
+    >
+      {headerChildren}
+    </WarningMessageHeader>
   );
 
   return isWarningActive ? (
@@ -145,47 +168,7 @@ export const WarningMessage = ({
   );
 };
 
-const DangerousAccountWarning = ({
-  isUnsafe,
-  isMalicious,
-}: {
-  isUnsafe: boolean;
-  isMalicious: boolean;
-}) => {
-  const { t } = useTranslation();
-
-  if (isMalicious) {
-    return (
-      <WarningMessage
-        header="Malicious account detected"
-        variant={WarningMessageVariant.highAlert}
-      >
-        <p>
-          {t("An account you’re interacting with is tagged as malicious on")}{" "}
-          <DirectoryLink />.
-        </p>
-        <p>{t("For your safety, signing this transaction is disabled")}</p>
-      </WarningMessage>
-    );
-  }
-  if (isUnsafe) {
-    return (
-      <WarningMessage
-        header="Unsafe account"
-        variant={WarningMessageVariant.warning}
-      >
-        <p>
-          {t("An account you’re interacting with is tagged as unsafe on")}{" "}
-          <DirectoryLink />. {t("Please proceed with caution.")}
-        </p>
-      </WarningMessage>
-    );
-  }
-
-  return null;
-};
-
-const MemoWarningMessage = ({
+export const MemoWarningMessage = ({
   isMemoRequired,
 }: {
   isMemoRequired: boolean;
@@ -213,18 +196,20 @@ const MemoWarningMessage = ({
 };
 
 interface FlaggedWarningMessageProps {
-  isUnsafe: boolean;
   isMemoRequired: boolean;
-  isMalicious: boolean;
+  isSuspicious: boolean;
+  blockaidData: BlockAidScanAssetResult;
 }
 
 export const FlaggedWarningMessage = ({
-  isUnsafe,
   isMemoRequired,
-  isMalicious,
+  isSuspicious,
+  blockaidData,
 }: FlaggedWarningMessageProps) => (
   <>
-    <DangerousAccountWarning isUnsafe={isUnsafe} isMalicious={isMalicious} />
+    {isSuspicious ? (
+      <BlockaidAssetScanLabel blockaidData={blockaidData} />
+    ) : null}
     <MemoWarningMessage isMemoRequired={isMemoRequired} />
   </>
 );
@@ -272,7 +257,63 @@ export const BackupPhraseWarningMessage = () => {
   );
 };
 
+const BlockaidByLine = () => {
+  const { t } = useTranslation();
+  return (
+    <div className="ScamAssetWarning__footer">
+      <img src={IconShieldBlockaid} alt="icon shield blockaid" />
+      {t("Powered by ")}
+      <a rel="noreferrer" href="https://www.blockaid.io/" target="_blank">
+        Blockaid
+      </a>
+    </div>
+  );
+};
+
+interface BlockaidAssetWarningProps {
+  blockaidData: BlockAidScanAssetResult;
+}
+
+export const BlockaidAssetWarning = ({
+  blockaidData,
+}: BlockaidAssetWarningProps) => {
+  const { t } = useTranslation();
+  const isWarning = isBlockaidWarning(blockaidData.result_type);
+
+  return (
+    <div
+      className={`ScamAssetWarning__box ${
+        isWarning ? "ScamAssetWarning__box--isWarning" : ""
+      }`}
+      data-testid="ScamAssetWarning__box"
+    >
+      <div className="Icon">
+        <img
+          className="ScamAssetWarning__box__icon"
+          src={isWarning ? IconWarningBlockaidYellow : IconWarningBlockaid}
+          alt="icon warning blockaid"
+        />
+      </div>
+      <div>
+        <div className="ScamAssetWarning__description">
+          {t(
+            `This token was flagged as ${blockaidData.result_type} by Blockaid. Interacting with this token may result in loss of funds and is not recommended for the following reasons`,
+          )}
+          :
+          <ul className="ScamAssetWarning__list">
+            {blockaidData.features &&
+              blockaidData.features.map((f) => (
+                <li key={f.feature_id}>{f.description}</li>
+              ))}
+          </ul>
+        </div>
+      </div>
+    </div>
+  );
+};
+
 export const ScamAssetWarning = ({
+  pillType,
   isSendWarning = false,
   domain,
   code,
@@ -281,7 +322,9 @@ export const ScamAssetWarning = ({
   onClose,
   // eslint-disable-next-line
   onContinue = () => {},
+  blockaidData,
 }: {
+  pillType: "Connection" | "Trustline" | "Transaction";
   isSendWarning?: boolean;
   domain: string;
   code: string;
@@ -289,11 +332,11 @@ export const ScamAssetWarning = ({
   image: string;
   onClose: () => void;
   onContinue?: () => void;
+  blockaidData: BlockAidScanAssetResult;
 }) => {
   const { t } = useTranslation();
   const dispatch: AppDispatch = useDispatch();
   const warningRef = useRef<HTMLDivElement>(null);
-  const { isValidatingSafeAssetsEnabled } = useSelector(settingsSelector);
   const { recommendedFee } = useNetworkFees();
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
   const publicKey = useSelector(publicKeySelector);
@@ -380,63 +423,37 @@ export const ScamAssetWarning = ({
       document.querySelector("#modal-root")!,
     )
   ) : (
-    <div className="ScamAssetWarning">
+    <div className="ScamAssetWarning" data-testid="ScamAssetWarning">
       <View.Content>
-        <div className="ScamAssetWarning__wrapper" ref={warningRef}>
-          <div className="ScamAssetWarning__header">Warning</div>
-          <div className="ScamAssetWarning__description">
-            {t(
-              "This asset was tagged as fraudulent by stellar.expert, a reliable community-maintained directory.",
-            )}
-          </div>
-          <div className="ScamAssetWarning__row">
-            <ManageAssetRow
-              code={code}
-              issuer={issuer}
-              image={image}
-              domain={domain}
-            />
-          </div>
-          <div className="ScamAssetWarning__bottom-content">
+        <ModalInfo
+          code={code}
+          issuer={issuer}
+          domain={domain}
+          image={image}
+          variant={isAssetSuspicious(blockaidData) ? "malicious" : "default"}
+          asset={code}
+          pillType={pillType}
+        >
+          <div className="ScamAssetWarning__wrapper" ref={warningRef}>
             <div>
-              {isSendWarning ? (
-                <Notification
+              <BlockaidAssetWarning blockaidData={blockaidData} />
+            </div>
+            <div className="ScamAssetWarning__btns">
+              {!isSendWarning && (
+                <Button
+                  data-testid="ScamAsset__add-asset"
+                  size="md"
+                  isFullWidth
+                  onClick={handleSubmit}
+                  type="button"
                   variant="error"
-                  title={t("Not recommended asset")}
+                  isLoading={
+                    isSubmitting || submitStatus === ActionStatus.PENDING
+                  }
                 >
-                  <p>
-                    {t(
-                      "Trading or sending this asset is not recommended. Projects related to this asset may be fraudulent even if the creators say otherwise.",
-                    )}
-                  </p>
-                </Notification>
-              ) : (
-                <Notification variant="error" title={t("Blocked asset")}>
-                  <div>
-                    <p>
-                      {isValidatingSafeAssetsEnabled
-                        ? t(
-                            "Freighter automatically blocked this asset. Projects related to this asset may be fraudulent even if the creators say otherwise.",
-                          )
-                        : t(
-                            "Projects related to this asset may be fraudulent even if the creators say otherwise. ",
-                          )}
-                    </p>
-                    <p>
-                      {t("You can")}{" "}
-                      {`${
-                        isValidatingSafeAssetsEnabled
-                          ? t("disable")
-                          : t("enable")
-                      }`}{" "}
-                      {t("this alert by going to")}{" "}
-                      <strong>{t("Settings > Preferences")}</strong>
-                    </p>
-                  </div>
-                </Notification>
+                  {t("Add anyway")}
+                </Button>
               )}
-            </div>
-            <div className="ScamAssetWarning__btns">
               <Button
                 size="md"
                 isFullWidth
@@ -444,15 +461,16 @@ export const ScamAssetWarning = ({
                 type="button"
                 onClick={closeOverlay}
               >
-                {isValidatingSafeAssetsEnabled ? t("Got it") : t("Cancel")}
+                {t("Cancel")}
               </Button>
               {isSendWarning && (
                 <Button
+                  data-testid="ScamAsset__send"
                   size="md"
                   isFullWidth
                   onClick={onContinue}
                   type="button"
-                  variant="primary"
+                  variant="error"
                   isLoading={
                     isSubmitting || submitStatus === ActionStatus.PENDING
                   }
@@ -460,23 +478,9 @@ export const ScamAssetWarning = ({
                   {t("Continue")}
                 </Button>
               )}
-              {!isValidatingSafeAssetsEnabled && !isSendWarning && (
-                <Button
-                  size="md"
-                  isFullWidth
-                  onClick={handleSubmit}
-                  type="button"
-                  variant="primary"
-                  isLoading={
-                    isSubmitting || submitStatus === ActionStatus.PENDING
-                  }
-                >
-                  {t("Add anyway")}
-                </Button>
-              )}
             </div>{" "}
           </div>
-        </div>
+        </ModalInfo>
       </View.Content>
     </div>
   );
@@ -507,7 +511,7 @@ export const NewAssetWarning = ({
   const isHardwareWallet = !!useSelector(hardwareWalletTypeSelector);
   const [isTrustlineErrorShowing, setIsTrustlineErrorShowing] = useState(false);
 
-  const { isRevocable, isNewAsset, isInvalidDomain } = newAssetFlags;
+  const { isRevocable, isInvalidDomain } = newAssetFlags;
 
   useEffect(
     () => () => {
@@ -631,23 +635,6 @@ export const NewAssetWarning = ({
                 </div>
               </div>
             )}
-            <div>
-              {isNewAsset && (
-                <div className="NewAssetWarning__flag">
-                  <div className="NewAssetWarning__flag__icon">
-                    <img src={IconInvalid} alt="new asset" />
-                  </div>
-                  <div className="NewAssetWarning__flag__content">
-                    <div className="NewAssetWarning__flag__header">
-                      {t("New Asset")}
-                    </div>
-                    <div className="NewAssetWarning__flag__description">
-                      {t("This is a relatively new asset.")}
-                    </div>
-                  </div>
-                </div>
-              )}
-            </div>
             <div>
               {isInvalidDomain && (
                 <div className="NewAssetWarning__flag">
@@ -1077,30 +1064,300 @@ export const SSLWarningMessage = ({ url }: { url: string }) => {
   );
 };
 
-export const MaliciousDomainWarning = ({ message }: { message: string }) => (
-  <div className="MaliciousDomainWarning">
-    <div className="Icon">
-      <Icon.Warning className="WarningMessage__icon" />
+export const BlockAidMaliciousLabel = () => {
+  const { t } = useTranslation();
+  return (
+    <div
+      className="ScanLabel ScanMalicious"
+      data-testid="blockaid-malicious-label"
+    >
+      <div className="Icon">
+        <Icon.Warning className="WarningMessage__icon" />
+      </div>
+      <p className="Message">{t("This site was flagged as malicious")}</p>
     </div>
-    <p className="Message">{message}</p>
-  </div>
-);
+  );
+};
 
-export const BlockAidMissWarning = () => {
+export const BlockAidBenignLabel = () => {
   const { t } = useTranslation();
+  return (
+    <div className="ScanLabel ScanBenign" data-testid="blockaid-benign-label">
+      <div className="Icon">
+        <Icon.Warning className="WarningMessage__icon" />
+      </div>
+      <p className="Message">{t("This site has been scanned and verified")}</p>
+    </div>
+  );
+};
 
+export const BlockAidMissLabel = () => {
+  const { t } = useTranslation();
   return (
-    <WarningMessage
-      header="Blockaid has not seen this domain"
-      variant={WarningMessageVariant.default}
+    <div className="ScanLabel ScanMiss" data-testid="blockaid-miss-label">
+      <div className="Icon">
+        <Icon.Warning className="WarningMessage__icon" />
+      </div>
+      <p className="Message">
+        {t("Unable to scan site for malicious behavior")}
+      </p>
+    </div>
+  );
+};
+
+export const BlockAidSiteScanLabel = ({
+  status,
+  isMalicious,
+}: {
+  status: "hit" | "miss";
+  isMalicious: boolean;
+}) => {
+  if (status === "miss") {
+    return <BlockAidMissLabel />;
+  }
+
+  if (isMalicious) {
+    return <BlockAidMaliciousLabel />;
+  }
+
+  // benign case should not show anything for now
+  return <React.Fragment />;
+};
+
+export const BlockaidTxScanLabel = ({
+  scanResult,
+}: {
+  scanResult: BlockAidScanTxResult;
+}) => {
+  const { t } = useTranslation();
+  const { simulation, validation } = scanResult;
+
+  if (simulation && "error" in simulation) {
+    return (
+      <WarningMessage
+        header="This transaction is expected to fail"
+        variant={WarningMessageVariant.warning}
+      >
+        <div>
+          <p>{t(simulation.error)}</p>
+        </div>
+      </WarningMessage>
+    );
+  }
+
+  let message = null;
+  if (validation && "result_type" in validation) {
+    switch (validation.result_type) {
+      case "Malicious": {
+        message = {
+          header: "This transaction was flagged as malicious",
+          variant: WarningMessageVariant.highAlert,
+          message: validation.description,
+        };
+        return (
+          <WarningMessage header={message.header} variant={message.variant}>
+            <div>
+              <p>{t(message.message)}</p>
+            </div>
+          </WarningMessage>
+        );
+      }
+
+      case "Warning": {
+        message = {
+          header: "This transaction was flagged as suspicious",
+          variant: WarningMessageVariant.warning,
+          message: validation.description,
+        };
+        return (
+          <WarningMessage header={message.header} variant={message.variant}>
+            <div>
+              <p>{t(message.message)}</p>
+            </div>
+          </WarningMessage>
+        );
+      }
+
+      case "Benign":
+      default:
+    }
+  }
+  return <></>;
+};
+
+export const BlockaidAssetScanLabel = ({
+  blockaidData,
+}: {
+  blockaidData: BlockAidScanAssetResult;
+}) => {
+  const isWarning = isBlockaidWarning(blockaidData.result_type);
+
+  return (
+    <BlockaidWarningModal
+      header={`This asset was flagged as ${blockaidData.result_type}`}
+      description={blockaidData.features?.map((f) => f.description) || []}
+      isWarning={isWarning}
+      isAsset
+    />
+  );
+};
+
+interface BlockaidWarningModalProps {
+  header: string;
+  description: string[];
+  handleCloseClick?: () => void;
+  isActive?: boolean;
+  isWarning: boolean;
+  isAsset?: boolean;
+}
+
+export const BlockaidWarningModal = ({
+  handleCloseClick,
+  header,
+  description,
+  isActive = false,
+  isWarning,
+  isAsset = false,
+}: BlockaidWarningModalProps) => {
+  const { t } = useTranslation();
+  const [isModalActive, setIsModalActive] = useState(isActive);
+  const variant = isWarning
+    ? WarningMessageVariant.warning
+    : WarningMessageVariant.highAlert;
+
+  const WarningInfoBlock = () => (
+    <WarningMessageHeader
+      header={header}
+      icon={
+        <img
+          src={isWarning ? IconWarningBlockaidYellow : IconWarningBlockaid}
+          alt="icon warning blockaid"
+        />
+      }
+      variant={variant}
+    >
+      <div className="WarningMessage__link-wrapper">
+        <Icon.ChevronRight className="WarningMessage__link-icon" />
+      </div>
+    </WarningMessageHeader>
+  );
+
+  const truncatedDescription = (desc: string) => {
+    const arr = desc.split(" ");
+
+    return arr.map((word) => {
+      if (word.length > 30) {
+        return (
+          <>
+            <CopyValue
+              value={word}
+              displayValue={`${word.slice(0, 4)}...${word.slice(-4)}`}
+            />{" "}
+          </>
+        );
+      }
+
+      return <span>{word} </span>;
+    });
+  };
+
+  return isModalActive ? (
+    <>
+      <WarningInfoBlock />
+      {createPortal(
+        <div className="BlockaidWarningModal">
+          <LoadingBackground isActive />
+          <div className="BlockaidWarningModal__modal">
+            <div
+              className={`BlockaidWarningModal__modal__icon ${
+                isWarning ? "BlockaidWarningModal__modal__icon--isWarning" : ""
+              }`}
+            >
+              <img
+                className="BlockaidWarningModal__modal__image"
+                src={
+                  isWarning ? IconWarningBlockaidYellow : IconWarningBlockaid
+                }
+                alt="icon warning blockaid"
+              />
+            </div>
+
+            <div className="BlockaidWarningModal__modal__title">{header}</div>
+            <div className="BlockaidWarningModal__modal__description">
+              {t(
+                `${header} by Blockaid. Interacting with this ${
+                  isAsset ? "token" : "transaction"
+                } may result in loss of funds and is not recommended for the following reasons`,
+              )}
+              :
+              <ul className="ScamAssetWarning__list">
+                {description.map((d) => (
+                  <li key={d.replace(" ", "-")}>{truncatedDescription(d)}</li>
+                ))}
+              </ul>
+            </div>
+            <div className="BlockaidWarningModal__modal__byline">
+              <BlockaidByLine />
+            </div>
+
+            <Button
+              size="md"
+              variant="secondary"
+              isFullWidth
+              type="button"
+              onClick={() =>
+                handleCloseClick ? handleCloseClick() : setIsModalActive(false)
+              }
+            >
+              {t("Got it")}
+            </Button>
+          </div>
+        </div>,
+        document.querySelector("#modal-root")!,
+      )}
+    </>
+  ) : (
+    <div
+      className="WarningMessage__activate-button"
+      onClick={() => setIsModalActive(true)}
+      data-testid="BlockaidWarningModal__button"
     >
+      <WarningInfoBlock />
+    </div>
+  );
+};
+
+export const BlockaidMaliciousTxInternalWarning = ({
+  description,
+}: {
+  description: string;
+}) => {
+  const { t } = useTranslation();
+
+  return (
+    <div className="ScamAssetWarning__box" data-testid="ScamAssetWarning__box">
+      <div className="Icon">
+        <img
+          className="ScamAssetWarning__box__icon"
+          src={IconWarningBlockaid}
+          alt="icon warning blockaid"
+        />
+      </div>
       <div>
-        <p>
+        <div className="ScamAssetWarning__description">
           {t(
-            "Proceed with caution. Blockaid is unable to provide a risk assesment for this domain at this time.",
+            "This transaction was flagged by Blockaid for the following reasons",
           )}
-        </p>
+          :<div>{description}</div>
+        </div>
+        <div className="ScamAssetWarning__footer">
+          <img src={IconShieldBlockaid} alt="icon shield blockaid" />
+          {t("Powered by ")}
+          <a rel="noreferrer" href="https://www.blockaid.io/" target="_blank">
+            Blockaid
+          </a>
+        </div>
       </div>
-    </WarningMessage>
+    </div>
   );
 };
diff --git a/extension/src/popup/components/WarningMessages/styles.scss b/extension/src/popup/components/WarningMessages/styles.scss
index 93681a2a0..a8a3312f9 100644
--- a/extension/src/popup/components/WarningMessages/styles.scss
+++ b/extension/src/popup/components/WarningMessages/styles.scss
@@ -41,6 +41,7 @@
     padding: 0.5rem;
 
     &--high-alert {
+      border-color: #671e22;
       background: rgba(241, 50, 50, 0.32);
 
       .WarningMessage__icon {
@@ -93,6 +94,7 @@
 
   &__children-wrapper {
     flex-grow: 1;
+    word-break: break-word;
 
     a {
       color: var(--color-white);
@@ -109,17 +111,38 @@
   bottom: 0;
   left: 0;
 
+  .Button {
+    white-space: nowrap !important;
+  }
+
   .View__inset {
     padding-bottom: 1rem;
   }
 
+  &__box {
+    display: flex;
+    background-color: var(--color-red-20);
+    border: 1px solid #671e22;
+    border-radius: 6px;
+    margin-bottom: 1.5rem;
+    padding: 0.5rem;
+
+    &__icon {
+      margin: 0.125rem 0.375rem 0 0;
+    }
+
+    &--isWarning {
+      background-color: var(--color-yellow-20);
+      border: 1px solid #573300;
+    }
+  }
+
   &__wrapper {
     z-index: calc(var(--z-index--scam-warning) + 1);
     height: 100%;
     bottom: 0;
     display: flex;
     flex-direction: column;
-    background: var(--color-gray-00);
     transition: bottom var(--dropdown-animation);
     border-top-right-radius: 1rem;
     border-top-left-radius: 1rem;
@@ -134,13 +157,35 @@
   }
 
   &__description {
-    font-size: 0.875rem;
-    line-height: 1.375rem;
-    margin: 0.5rem 0 2rem 0;
+    font-size: 0.75rem;
+    line-height: 1.125rem;
+    margin-bottom: 0.375rem;
+    word-break: break-word;
   }
 
-  &__bottom-content {
-    margin-top: auto;
+  &__list {
+    font-size: 0.75rem !important;
+    line-height: 1.125rem !important;
+    margin-left: 0.5rem !important;
+
+    .CopyValue {
+      svg {
+        width: 0.5rem;
+        height: 0.5rem;
+      }
+
+      .Value {
+        margin-left: 0.125rem;
+      }
+    }
+  }
+
+  &__footer {
+    color: var(--color-gray-70);
+    display: flex;
+    font-size: 0.75rem;
+    gap: 0.25rem;
+    line-height: 1.125rem;
   }
 
   &__row {
@@ -193,13 +238,13 @@
 
   .View__inset {
     padding-bottom: 1rem;
+    background: var(--color-gray-00);
   }
 
   &__wrapper {
     z-index: calc(var(--z-index--scam-warning) + 1);
     display: flex;
     flex-direction: column;
-    background: var(--color-gray-00);
     transition: bottom var(--dropdown-animation);
     border-top-right-radius: 1rem;
     border-top-left-radius: 1rem;
@@ -417,20 +462,16 @@
   overflow-wrap: break-word;
 }
 
-.MaliciousDomainWarning {
+.ScanLabel {
   display: flex;
-  background-color: var(--color-red-20);
-  border: 1px solid #671e22;
   border-radius: 6px;
   margin-bottom: 10px;
   padding: 0.5rem;
   padding-left: 0.25rem;
 
   .Icon {
+    height: 16px;
     margin-right: 5px;
-    .WarningMessage__icon {
-      color: var(--color-red-60);
-    }
   }
 
   .Message {
@@ -438,3 +479,88 @@
     line-height: 1rem;
   }
 }
+
+.ScanMalicious {
+  background-color: var(--color-red-20);
+  border: 1px solid #671e22;
+
+  .Icon {
+    .WarningMessage__icon {
+      color: var(--color-red-60);
+    }
+  }
+}
+
+.ScanBenign {
+  background-color: var(--color-green-40);
+  border: 1px solid var(--color-green-50);
+
+  .Icon {
+    .WarningMessage__icon {
+      color: var(--color-green-50);
+    }
+  }
+}
+
+.ScanMiss {
+  border: 1px solid var(--color-grey-40);
+
+  .Icon {
+    .WarningMessage__icon {
+      color: var(--color-grey-40);
+    }
+  }
+}
+
+.BlockaidWarningModal {
+  height: 100vh;
+  width: 100vw;
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &__modal {
+    background: var(--color-gray-10);
+    border-radius: 0.5rem;
+    border: 1px solid var(--color-gray-40);
+    padding: 1rem;
+    width: 312px;
+    z-index: 2;
+
+    &__icon {
+      background-color: rgba(241, 50, 50, 0.32);
+      border-radius: 100px;
+      display: flex;
+      width: 2rem;
+      height: 2rem;
+      padding: 0.375rem;
+      margin-bottom: 0.5rem;
+
+      &--isWarning {
+        background-color: rgba(94, 58, 4, 0.32);
+      }
+    }
+
+    &__image {
+      height: 1.25rem;
+      width: 1.25rem;
+    }
+
+    &__title {
+      display: flex;
+      line-height: 1.5rem;
+      margin-bottom: 1rem;
+    }
+
+    &__description {
+      font-size: 0.75rem;
+      line-height: 1.125rem;
+      margin-bottom: 1rem;
+    }
+
+    &__byline {
+      margin-bottom: 1rem;
+    }
+  }
+}
diff --git a/extension/src/popup/components/__tests__/HistoryItem.test.tsx b/extension/src/popup/components/__tests__/HistoryItem.test.tsx
new file mode 100644
index 000000000..a905c4b5d
--- /dev/null
+++ b/extension/src/popup/components/__tests__/HistoryItem.test.tsx
@@ -0,0 +1,76 @@
+import React from "react";
+import { render, waitFor, screen } from "@testing-library/react";
+
+import { HistoryItem } from "popup/components/accountHistory/HistoryItem";
+import { TESTNET_NETWORK_DETAILS } from "@shared/constants/stellar";
+import * as sorobanHelpers from "popup/helpers/soroban";
+import * as internalApi from "@shared/api/internal";
+
+describe("HistoryItem", () => {
+  afterAll(() => {
+    jest.clearAllMocks();
+  });
+  jest
+    .spyOn(sorobanHelpers, "getAttrsFromSorobanHorizonOp")
+    .mockImplementation(() => {
+      return {
+        to: "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+        from: "GCGORBD5DB4JDIKVIA536CJE3EWMWZ6KBUBWZWRQM7Y3NHFRCLOKYVAL",
+        contractId: "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC",
+        fnName: "transfer",
+        amount: "100000000",
+      };
+    });
+  jest.spyOn(internalApi, "getTokenDetails").mockImplementation(() => {
+    return Promise.resolve({
+      decimals: 7,
+      name: "native",
+      symbol: "XLM",
+    });
+  });
+  it("renders SAC transfers as payments", async () => {
+    const props = {
+      accountBalances: {
+        balances: {
+          native: {
+            token: {
+              code: "XLM",
+            },
+            decimals: 7,
+          },
+        } as any,
+        isFunded: true,
+        subentryCount: 0,
+      },
+      operation: {
+        account: "GCGORBD5DB4JDIKVIA536CJE3EWMWZ6KBUBWZWRQM7Y3NHFRCLOKYVAL",
+        amount: "10",
+        asset_code: "XLM",
+        created_at: Date.now(),
+        id: "op-id",
+        to: "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+        from: "GCGORBD5DB4JDIKVIA536CJE3EWMWZ6KBUBWZWRQM7Y3NHFRCLOKYVAL",
+        starting_balance: "10",
+        type: "invokeHostFunction",
+        type_i: 24,
+        transaction_attr: {
+          operation_count: 1,
+        },
+        isCreateExternalAccount: false,
+        isPayment: false,
+        isSwap: false,
+      } as any,
+      publicKey: "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+      url: "example.com",
+      networkDetails: TESTNET_NETWORK_DETAILS,
+      setDetailViewProps: () => null,
+      setIsDetailViewShowing: () => null,
+    };
+    render(<HistoryItem {...props} />);
+    await waitFor(() => screen.getByTestId("history-item"));
+    expect(screen.getByTestId("history-item")).toBeDefined();
+    expect(screen.getByTestId("history-item-body-component")).toHaveTextContent(
+      "+10 XLM",
+    );
+  });
+});
diff --git a/extension/src/popup/components/account/AccountAssets/index.tsx b/extension/src/popup/components/account/AccountAssets/index.tsx
index cf446e955..71ff7876f 100644
--- a/extension/src/popup/components/account/AccountAssets/index.tsx
+++ b/extension/src/popup/components/account/AccountAssets/index.tsx
@@ -1,15 +1,17 @@
 import React, { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { BigNumber } from "bignumber.js";
 import isEmpty from "lodash/isEmpty";
 import { Asset, Horizon } from "stellar-sdk";
 
-import { AssetIcons } from "@shared/api/types";
+import { AssetIcons, AssetType } from "@shared/api/types";
 import { retryAssetIcon } from "@shared/api/internal";
 
 import { getCanonicalFromAsset } from "helpers/stellar";
 import { isSorobanIssuer } from "popup/helpers/account";
 import { formatTokenAmount } from "popup/helpers/soroban";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
+import { formatAmount } from "popup/helpers/formatters";
+
 import StellarLogo from "popup/assets/stellar-logo.png";
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
 import { transactionSubmissionSelector } from "popup/ducks/transactionSubmission";
@@ -18,7 +20,6 @@ import ImageMissingIcon from "popup/assets/image-missing.svg?react";
 import IconSoroban from "popup/assets/icon-soroban.svg?react";
 
 import "./styles.scss";
-import { formatAmount } from "popup/helpers/formatters";
 
 const getIsXlm = (code: string) => code === "XLM";
 
@@ -40,6 +41,8 @@ export const AssetIcon = ({
   isLPShare = false,
   isSorobanToken = false,
   icon,
+  isSuspicious = false,
+  isModal = false,
 }: {
   assetIcons: AssetIcons;
   code: string;
@@ -48,6 +51,8 @@ export const AssetIcon = ({
   isLPShare?: boolean;
   isSorobanToken?: boolean;
   icon?: string;
+  isSuspicious?: boolean;
+  isModal?: boolean;
 }) => {
   /*
     We load asset icons in 2 ways:
@@ -103,16 +108,24 @@ export const AssetIcon = ({
   // If we're waiting on the icon lookup (Method 1), just return the loader until this re-renders with `assetIcons`. We can't do anything until we have it.
   if (isFetchingAssetIcons) {
     return (
-      <div className="AccountAssets__asset--logo AccountAssets__asset--loading" />
+      <div
+        data-testid="AccountAssets__asset--loading"
+        className="AccountAssets__asset--logo AccountAssets__asset--loading"
+      >
+        <ScamAssetIcon isScamAsset={isSuspicious} />
+      </div>
     );
   }
 
   // if we have an asset path, start loading the path in an `<img>`
   return canonicalAsset || isXlm || imgSrc ? (
     <div
+      data-testid={`AccountAssets__asset--loading-${code}`}
       className={`AccountAssets__asset--logo ${
         hasError ? "AccountAssets__asset--error" : ""
-      } ${isLoading ? "AccountAssets__asset--loading" : ""}`}
+      } ${isLoading ? "AccountAssets__asset--loading" : ""} ${
+        isModal ? "AccountAssets__asset--modal" : ""
+      }`}
     >
       <img
         alt={`${code} logo`}
@@ -129,18 +142,24 @@ export const AssetIcon = ({
           setIsLoading(false);
         }}
       />
+      <ScamAssetIcon isScamAsset={isSuspicious} />
     </div>
   ) : (
     // the image path wasn't found, show a default broken image icon
-    <div className="AccountAssets__asset--logo AccountAssets__asset--error">
+    <div
+      className={`AccountAssets__asset--logo AccountAssets__asset--error ${
+        isModal ? "AccountAssets__asset--modal" : ""
+      }`}
+    >
       <ImageMissingIcon />
+      <ScamAssetIcon isScamAsset={isSuspicious} />
     </div>
   );
 };
 
 interface AccountAssetsProps {
   assetIcons: AssetIcons;
-  sortedBalances: any[];
+  sortedBalances: AssetType[];
   setSelectedAsset?: (selectedAsset: string) => void;
 }
 
@@ -152,9 +171,6 @@ export const AccountAssets = ({
   const [assetIcons, setAssetIcons] = useState(inputAssetIcons);
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
   const [hasIconFetchRetried, setHasIconFetchRetried] = useState(false);
-  const { assetDomains, blockedDomains } = useSelector(
-    transactionSubmissionSelector,
-  );
 
   useEffect(() => {
     setAssetIcons(inputAssetIcons);
@@ -211,39 +227,39 @@ export const AccountAssets = ({
 
   return (
     <>
-      {sortedBalances.map((rb: any) => {
-        let issuer;
+      {sortedBalances.map((rb) => {
+        let isLP = false;
+        let issuer = {
+          key: "",
+        };
         let code = "";
         let amountUnit;
         if (rb.liquidityPoolId) {
-          issuer = "lp";
+          isLP = true;
           code = getLPShareCode(rb.reserves as Horizon.HorizonApi.Reserve[]);
           amountUnit = "shares";
-        } else if (rb.contractId) {
+        } else if (rb.contractId && "symbol" in rb) {
           issuer = {
             key: rb.contractId,
           };
           code = rb.symbol;
           amountUnit = rb.symbol;
         } else {
-          issuer = rb.token.issuer;
+          if ("issuer" in rb.token && rb.token) {
+            issuer = rb.token.issuer;
+          }
           code = rb.token.code;
           amountUnit = rb.token.code;
         }
 
-        const isLP = issuer === "lp";
-        const canonicalAsset = getCanonicalFromAsset(
-          code,
-          issuer?.key as string,
-        );
+        const canonicalAsset = getCanonicalFromAsset(code, issuer?.key);
 
-        const assetDomain = assetDomains[canonicalAsset];
-        const isScamAsset = !!blockedDomains.domains[assetDomain];
+        const isSuspicious = isAssetSuspicious(rb.blockaidData);
 
-        const bigTotal = new BigNumber(rb.total as string);
-        const amountVal = rb.contractId
-          ? formatTokenAmount(bigTotal, rb.decimals as number)
-          : bigTotal.toFixed();
+        const amountVal =
+          rb.contractId && "decimals" in rb
+            ? formatTokenAmount(rb.total, rb.decimals)
+            : rb.total.toFixed();
 
         return (
           <div
@@ -263,9 +279,9 @@ export const AccountAssets = ({
                 issuerKey={issuer?.key}
                 retryAssetIconFetch={retryAssetIconFetch}
                 isLPShare={!!rb.liquidityPoolId}
+                isSuspicious={isSuspicious}
               />
               <span className="asset-code">{code}</span>
-              <ScamAssetIcon isScamAsset={isScamAsset} />
             </div>
             <div className="AccountAssets__copy-right">
               <div className="asset-amount" data-testid="asset-amount">
diff --git a/extension/src/popup/components/account/AccountAssets/styles.scss b/extension/src/popup/components/account/AccountAssets/styles.scss
index 3f286e706..ad9479189 100644
--- a/extension/src/popup/components/account/AccountAssets/styles.scss
+++ b/extension/src/popup/components/account/AccountAssets/styles.scss
@@ -17,6 +17,7 @@ $loader-light-color: #444961;
       margin-right: 1rem;
       max-width: 2rem;
       max-height: 2rem;
+      position: relative;
 
       img {
         width: 100%;
@@ -62,6 +63,11 @@ $loader-light-color: #444961;
         height: 1rem;
         width: 1rem;
       }
+
+      .ScamAssetIcon img {
+        height: 100%;
+        width: 100%;
+      }
     }
 
     &--loading {
@@ -83,7 +89,8 @@ $loader-light-color: #444961;
       }
     }
 
-    &--no-margin {
+    &--no-margin,
+    &--modal {
       margin: 0;
     }
   }
diff --git a/extension/src/popup/components/account/AssetDetail/index.tsx b/extension/src/popup/components/account/AssetDetail/index.tsx
index f65235bc1..8355c4aab 100644
--- a/extension/src/popup/components/account/AssetDetail/index.tsx
+++ b/extension/src/popup/components/account/AssetDetail/index.tsx
@@ -2,10 +2,11 @@ import React, { useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { BigNumber } from "bignumber.js";
 import { useTranslation } from "react-i18next";
-import { IconButton, Icon, Notification } from "@stellar/design-system";
+import { IconButton, Icon } from "@stellar/design-system";
 
 import { HorizonOperation, AssetType } from "@shared/api/types";
 import { NetworkDetails } from "@shared/constants/stellar";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 import {
   getAvailableBalance,
   getIsPayment,
@@ -43,10 +44,11 @@ import {
   transactionSubmissionSelector,
 } from "popup/ducks/transactionSubmission";
 import { AppDispatch } from "popup/App";
-import { useIsOwnedScamAsset } from "popup/helpers/useIsOwnedScamAsset";
 import StellarLogo from "popup/assets/stellar-logo.png";
 import { formatAmount } from "popup/helpers/formatters";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
 import { Loading } from "popup/components/Loading";
+import { BlockaidAssetWarning } from "popup/components/WarningMessages";
 
 import "./styles.scss";
 
@@ -74,14 +76,13 @@ export const AssetDetail = ({
 
   const canonical = getAssetFromCanonical(selectedAsset);
   const isSorobanAsset = canonical.issuer && isSorobanIssuer(canonical.issuer);
-  const isOwnedScamAsset = useIsOwnedScamAsset(
-    canonical.code,
-    canonical.issuer,
-  );
 
   const { accountBalances: balances } = useSelector(
     transactionSubmissionSelector,
   );
+  const isSuspicious = isAssetSuspicious(
+    balances.balances?.[selectedAsset].blockaidData,
+  );
 
   const balance = getRawBalance(accountBalances, selectedAsset)!;
 
@@ -163,7 +164,9 @@ export const AssetDetail = ({
           )}
           <div className="AssetDetail__total">
             <div
-              className="AssetDetail__total__copy"
+              className={`AssetDetail__total__copy ${
+                isSuspicious ? "AssetDetail__total__copy--isSuspicious" : ""
+              }`}
               data-testid="asset-detail-available-copy"
             >
               {displayTotal}
@@ -184,59 +187,55 @@ export const AssetDetail = ({
               />
             </div>
           </div>
-          <div className="AssetDetail__actions">
-            {balance?.total && new BigNumber(balance?.total).toNumber() > 0 ? (
-              <>
-                <PillButton
-                  onClick={() => {
-                    dispatch(saveAsset(selectedAsset));
-                    if (isContract) {
-                      dispatch(saveIsToken(true));
-                    } else {
-                      dispatch(saveIsToken(false));
-                    }
-                    navigateTo(ROUTES.sendPayment);
-                  }}
-                >
-                  {t("SEND")}
-                </PillButton>
-                {!isSorobanAsset && (
+          {isSuspicious ? null : (
+            <div className="AssetDetail__actions">
+              {balance?.total &&
+              new BigNumber(balance?.total).toNumber() > 0 ? (
+                <>
                   <PillButton
                     onClick={() => {
                       dispatch(saveAsset(selectedAsset));
-                      navigateTo(ROUTES.swap);
+                      if (isContract) {
+                        dispatch(saveIsToken(true));
+                      } else {
+                        dispatch(saveIsToken(false));
+                      }
+                      navigateTo(ROUTES.sendPayment);
                     }}
                   >
-                    {t("SWAP")}
+                    {t("SEND")}
                   </PillButton>
-                )}
-              </>
-            ) : (
-              <PillButton
-                onClick={() => {
-                  dispatch(saveDestinationAsset(selectedAsset));
-                  navigateTo(ROUTES.swap);
-                }}
-              >
-                {t("SWAP")}
-              </PillButton>
-            )}
-          </div>
+                  {!isSorobanAsset && (
+                    <PillButton
+                      onClick={() => {
+                        dispatch(saveAsset(selectedAsset));
+                        navigateTo(ROUTES.swap);
+                      }}
+                    >
+                      {t("SWAP")}
+                    </PillButton>
+                  )}
+                </>
+              ) : (
+                <PillButton
+                  onClick={() => {
+                    dispatch(saveDestinationAsset(selectedAsset));
+                    navigateTo(ROUTES.swap);
+                  }}
+                >
+                  {t("SWAP")}
+                </PillButton>
+              )}
+            </div>
+          )}
           <div className="AssetDetail__scam-warning">
-            {isOwnedScamAsset && (
-              <Notification variant="error" title={t("Error")}>
-                <div>
-                  <p>
-                    This asset was tagged as fraudulent by stellar.expert, a
-                    reliable community-maintained directory.
-                  </p>
-                  <p>
-                    Trading or sending this asset is not recommended. Projects
-                    related to this asset may be fraudulent even if the creators
-                    say otherwise.
-                  </p>
-                </div>
-              </Notification>
+            {isSuspicious && (
+              <BlockaidAssetWarning
+                blockaidData={
+                  balances.balances?.[selectedAsset].blockaidData ||
+                  defaultBlockaidScanAssetResult
+                }
+              />
             )}
           </div>
 
diff --git a/extension/src/popup/components/account/AssetDetail/styles.scss b/extension/src/popup/components/account/AssetDetail/styles.scss
index aba05a1e7..35fedcd0e 100644
--- a/extension/src/popup/components/account/AssetDetail/styles.scss
+++ b/extension/src/popup/components/account/AssetDetail/styles.scss
@@ -44,15 +44,21 @@
   }
 
   &__total {
+    margin-bottom: 1.5rem;
+
     &__copy {
       align-items: center;
       display: flex;
       font-size: 2rem;
-      font-weight: var(--font-weight-light);
+      font-weight: var(--font-weight-medium);
       justify-content: center;
       line-height: 150%;
-      margin: 2.5rem 0 0.5rem 0;
+      margin: -0.25rem 0 0.5rem 0;
       text-align: center;
+
+      &--isSuspicious {
+        color: var(--color-red-70);
+      }
     }
   }
 
@@ -60,7 +66,7 @@
     display: flex;
     gap: 0.5rem;
     justify-content: center;
-    margin: 2rem 0 2.5rem 0;
+    margin: 0.5rem 0 2.5rem 0;
   }
 
   &__empty {
diff --git a/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx b/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
new file mode 100644
index 000000000..8f2360260
--- /dev/null
+++ b/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
@@ -0,0 +1,92 @@
+import React from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useTranslation } from "react-i18next";
+import { Button, Icon, Paragraph } from "@stellar/design-system";
+
+import { AppDispatch } from "popup/App";
+
+import { LoadingBackground } from "popup/basics/LoadingBackground";
+import {
+  settingsSelector,
+  saveIsBlockaidAnnounced,
+} from "popup/ducks/settings";
+import { openTab } from "popup/helpers/navigate";
+
+import BlockaidLogo from "popup/assets/blockaid-logo.svg";
+
+import "./styles.scss";
+
+export const BlockaidAnnouncement = () => {
+  const { t } = useTranslation();
+  const dispatch: AppDispatch = useDispatch();
+  const { isBlockaidAnnounced } = useSelector(settingsSelector);
+
+  const handleLearnMore = () => {
+    openTab("https://blockaid.io");
+  };
+
+  const handleCloseModal = () => {
+    dispatch(saveIsBlockaidAnnounced({ isBlockaidAnnounced: true }));
+  };
+
+  return isBlockaidAnnounced ? null : (
+    <>
+      <LoadingBackground isActive />
+      <div className="BlockaidAnnouncement">
+        <div className="BlockaidAnnouncement__modal">
+          <div className="BlockaidAnnouncement__modal__title">
+            <div>{t("Freighter is adding a new layer of protection")}</div>
+            <div className="BlockaidAnnouncement__modal__close">
+              <Icon.Close onClick={handleCloseModal} />
+            </div>
+          </div>
+          <div className="BlockaidAnnouncement__modal__image">
+            <img src={BlockaidLogo} alt="Blockaid Logo" />
+          </div>
+          <div className="BlockaidAnnouncement__modal__description">
+            <Paragraph size="sm">
+              {t("Freighter now uses Blockaid to keep your accounts safer.")}
+            </Paragraph>
+            <Paragraph size="sm">{t("By default it will verify")}:</Paragraph>
+          </div>
+          <div className="BlockaidAnnouncement__modal__list">
+            <ul>
+              <li>{t("The domains you interact with")}</li>
+              <li>{t("The assets you interact with")}</li>
+              <li>{t("The accounts you interact with")}</li>
+              <li>
+                {t(
+                  "The operations and functions executed in transactions and smart contracts",
+                )}
+              </li>
+            </ul>
+          </div>
+
+          <div className="BlockaidAnnouncement__modal__buttons">
+            <Button
+              size="md"
+              isFullWidth
+              variant="secondary"
+              type="button"
+              onClick={handleLearnMore}
+              icon={<Icon.ExternalLink />}
+              iconPosition="right"
+            >
+              {t("Learn more")}
+            </Button>
+            <Button
+              data-testid="BlockaidAnnouncement__accept"
+              size="md"
+              variant="primary"
+              isFullWidth
+              type="button"
+              onClick={handleCloseModal}
+            >
+              {t("Got it")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/extension/src/popup/components/account/BlockaidAnnouncement/styles.scss b/extension/src/popup/components/account/BlockaidAnnouncement/styles.scss
new file mode 100644
index 000000000..887092b10
--- /dev/null
+++ b/extension/src/popup/components/account/BlockaidAnnouncement/styles.scss
@@ -0,0 +1,50 @@
+.BlockaidAnnouncement {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &__modal {
+    background: var(--color-gray-10);
+    border-radius: 0.5rem;
+    border: 1px solid var(--color-gray-40);
+    padding: 1rem;
+    width: 312px;
+    z-index: 2;
+
+    &__title {
+      display: flex;
+      line-height: 1.5rem;
+      margin-bottom: 1.5rem;
+    }
+
+    &__close {
+      cursor: pointer;
+    }
+
+    &__image {
+      margin-bottom: 0.5rem;
+    }
+
+    &__description {
+      color: var(--color-gray-70);
+    }
+
+    &__list {
+      color: var(--color-gray-70);
+
+      ul {
+        font-size: 0.875rem !important;
+        margin-left: 1rem !important;
+      }
+    }
+
+    &__buttons {
+      display: flex;
+      column-gap: 1rem;
+      margin-top: 1rem;
+    }
+  }
+}
diff --git a/extension/src/popup/components/account/ScamAssetIcon/index.tsx b/extension/src/popup/components/account/ScamAssetIcon/index.tsx
index 57b9392aa..8622efef9 100644
--- a/extension/src/popup/components/account/ScamAssetIcon/index.tsx
+++ b/extension/src/popup/components/account/ScamAssetIcon/index.tsx
@@ -1,10 +1,10 @@
 import React from "react";
-import IconWarning from "popup/assets/icon-warning-red.svg";
+import IconWarning from "popup/assets/icon-warning-asset-blockaid.svg";
 import "./styles.scss";
 
 export const ScamAssetIcon = ({ isScamAsset }: { isScamAsset: boolean }) =>
   isScamAsset ? (
-    <span className="ScamAssetIcon">
+    <span className="ScamAssetIcon" data-testid="ScamAssetIcon">
       {isScamAsset && <img src={IconWarning} alt="warning" />}
     </span>
   ) : null;
diff --git a/extension/src/popup/components/account/ScamAssetIcon/styles.scss b/extension/src/popup/components/account/ScamAssetIcon/styles.scss
index 7d48d55f3..eba06e844 100644
--- a/extension/src/popup/components/account/ScamAssetIcon/styles.scss
+++ b/extension/src/popup/components/account/ScamAssetIcon/styles.scss
@@ -1,5 +1,13 @@
 .ScamAssetIcon {
-  margin-left: 0.25rem;
   display: flex;
   align-items: center;
+  background: var(--color-red-40);
+  border-radius: 1rem;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  padding: 0.25rem;
+  width: 50%;
+  height: 50%;
+  background-size: auto;
 }
diff --git a/extension/src/popup/components/accountHistory/AssetNetworkInfo/index.tsx b/extension/src/popup/components/accountHistory/AssetNetworkInfo/index.tsx
index 542e29375..fdaad5def 100644
--- a/extension/src/popup/components/accountHistory/AssetNetworkInfo/index.tsx
+++ b/extension/src/popup/components/accountHistory/AssetNetworkInfo/index.tsx
@@ -4,8 +4,6 @@ import { useSelector } from "react-redux";
 import { getIconUrlFromIssuer } from "@shared/api/helpers/getIconUrlFromIssuer";
 
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
-import { transactionSubmissionSelector } from "popup/ducks/transactionSubmission";
-import { ScamAssetIcon } from "popup/components/account/ScamAssetIcon";
 import { CopyValue } from "popup/components/CopyValue";
 import StellarLogo from "popup/assets/stellar-logo.png";
 import { displaySorobanId, isSorobanIssuer } from "popup/helpers/account";
@@ -28,9 +26,7 @@ export const AssetNetworkInfo = ({
   contractId,
 }: AssetNetworkInfoProps) => {
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
-  const { blockedDomains } = useSelector(transactionSubmissionSelector);
   const [networkIconUrl, setNetworkIconUrl] = useState("");
-  const isBlockedDomain = blockedDomains.domains[assetDomain];
 
   useEffect(() => {
     const fetchIconUrl = async () => {
@@ -55,9 +51,6 @@ export const AssetNetworkInfo = ({
   }, [assetCode, assetIssuer, networkDetails]);
 
   const decideNetworkIcon = () => {
-    if (isBlockedDomain) {
-      return <ScamAssetIcon isScamAsset={true} />;
-    }
     if (networkIconUrl || assetType === "native") {
       return <img src={networkIconUrl || StellarLogo} alt="Network icon" />;
     }
diff --git a/extension/src/popup/components/accountHistory/AssetNetworkInfo/styles.scss b/extension/src/popup/components/accountHistory/AssetNetworkInfo/styles.scss
index 870d92f72..ee8ca2d7d 100644
--- a/extension/src/popup/components/accountHistory/AssetNetworkInfo/styles.scss
+++ b/extension/src/popup/components/accountHistory/AssetNetworkInfo/styles.scss
@@ -1,5 +1,6 @@
 .AssetNetworkInfo {
   &__network {
+    color: var(--color-gray-70);
     align-items: center;
     display: flex;
     justify-content: center;
diff --git a/extension/src/popup/components/accountHistory/HistoryItem/index.tsx b/extension/src/popup/components/accountHistory/HistoryItem/index.tsx
index 646a85dd9..2e4f9d792 100644
--- a/extension/src/popup/components/accountHistory/HistoryItem/index.tsx
+++ b/extension/src/popup/components/accountHistory/HistoryItem/index.tsx
@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 // In order to allow that rule we need to refactor this to use the correct Horizon types and narrow operation types
 
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useCallback } from "react";
 import { captureException } from "@sentry/browser";
 import camelCase from "lodash/camelCase";
 import { Icon, Loader } from "@stellar/design-system";
 import { BigNumber } from "bignumber.js";
 import { useTranslation } from "react-i18next";
+import { Asset } from "stellar-sdk";
 
 import { OPERATION_TYPES } from "constants/transaction";
 import { SorobanTokenInterface } from "@shared/constants/soroban/token";
@@ -16,6 +17,7 @@ import { emitMetric } from "helpers/metrics";
 import {
   formatTokenAmount,
   getAttrsFromSorobanHorizonOp,
+  isContractId,
 } from "popup/helpers/soroban";
 import { formatAmount } from "popup/helpers/formatters";
 
@@ -136,6 +138,8 @@ export const HistoryItem = ({
 
   const renderBodyComponent = () => BodyComponent;
   const renderIcon = () => IconComponent;
+  /* eslint-disable react-hooks/exhaustive-deps */
+  const translations = useCallback(t, []);
 
   useEffect(() => {
     const buildHistoryItem = async () => {
@@ -146,17 +150,20 @@ export const HistoryItem = ({
           </>,
         );
         setRowText(
-          t(`{{srcAssetCode}} for {{destAssetCode}}`, {
+          translations(`{{srcAssetCode}} for {{destAssetCode}}`, {
             srcAssetCode,
             destAssetCode,
           }),
         );
         setTxDetails((_state) => ({
           ..._state,
-          headerTitle: t(`Swapped {{srcAssetCode}} for {{destAssetCode}}`, {
-            srcAssetCode,
-            destAssetCode,
-          }),
+          headerTitle: translations(
+            `Swapped {{srcAssetCode}} for {{destAssetCode}}`,
+            {
+              srcAssetCode,
+              destAssetCode,
+            },
+          ),
           operationText: `+${new BigNumber(amount)} ${destAssetCode}`,
         }));
       } else if (isPayment) {
@@ -166,7 +173,7 @@ export const HistoryItem = ({
         setBodyComponent(
           <>
             {paymentDifference}
-            {formatAmount(new BigNumber(amount).toFixed(2, 1))} {destAssetCode}
+            {formatAmount(new BigNumber(amount).toString())} {destAssetCode}
           </>,
         );
         setIconComponent(
@@ -179,13 +186,15 @@ export const HistoryItem = ({
         setRowText(destAssetCode);
         setDateText(
           (_dateText) =>
-            `${_isRecipient ? t("Received") : t("Sent")} \u2022 ${date}`,
+            `${
+              _isRecipient ? translations("Received") : translations("Sent")
+            } \u2022 ${date}`,
         );
         setTxDetails((_state) => ({
           ..._state,
           isRecipient: _isRecipient,
           headerTitle: `${
-            _isRecipient ? t("Received") : t("Sent")
+            _isRecipient ? translations("Received") : translations("Sent")
           } ${destAssetCode}`,
           operationText: `${paymentDifference}${new BigNumber(
             amount,
@@ -197,10 +206,10 @@ export const HistoryItem = ({
         );
         setIconComponent(<Icon.ArrowUp className="HistoryItem__icon--sent" />);
         setRowText("XLM");
-        setDateText((_dateText) => `${t("Sent")} \u2022 ${date}`);
+        setDateText((_dateText) => `${translations("Sent")} \u2022 ${date}`);
         setTxDetails((_state) => ({
           ..._state,
-          headerTitle: t("Create Account"),
+          headerTitle: translations("Create Account"),
           isPayment: true,
           operation: {
             ...operation,
@@ -214,15 +223,28 @@ export const HistoryItem = ({
         const attrs = getAttrsFromSorobanHorizonOp(operation, networkDetails);
         const balances =
           accountBalances.balances || ({} as NonNullable<Balances>);
-        const tokenKey = Object.keys(balances).find(
-          (balanceKey) => attrs?.contractId === balanceKey.split(":")[1],
-        );
+
+        const tokenKey = Object.keys(balances).find((balanceKey) => {
+          const [code, issuer] =
+            balanceKey === "native" ? ["XLM"] : balanceKey.split(":");
+          const matchesIssuer = attrs?.contractId === issuer;
+
+          // if issuer if a G address or xlm, check for a SAC match
+          if ((issuer && !isContractId(issuer)) || code === "XLM") {
+            const sacAddress = new Asset(code, issuer).contractId(
+              networkDetails.networkPassphrase,
+            );
+            const matchesSac = attrs?.contractId === sacAddress;
+            return matchesSac;
+          }
+          return matchesIssuer;
+        });
 
         if (!attrs) {
           setRowText(operationString);
           setTxDetails((_state) => ({
             ..._state,
-            headerTitle: t("Transaction"),
+            headerTitle: translations("Transaction"),
             operationText: operationString,
           }));
         } else if (attrs.fnName === SorobanTokenInterface.mint) {
@@ -253,7 +275,7 @@ export const HistoryItem = ({
                 setRowText(operationString);
                 setTxDetails((_state) => ({
                   ..._state,
-                  headerTitle: t("Transaction"),
+                  headerTitle: translations("Transaction"),
                   operationText: operationString,
                 }));
               } else {
@@ -279,10 +301,12 @@ export const HistoryItem = ({
                 setDateText(
                   (_dateText) =>
                     `${
-                      isRecieving ? t("Received") : t("Minted")
+                      isRecieving
+                        ? translations("Received")
+                        : translations("Minted")
                     } \u2022 ${date}`,
                 );
-                setRowText(t(capitalize(attrs.fnName)));
+                setRowText(translations(capitalize(attrs.fnName)));
                 setTxDetails((_state) => ({
                   ..._state,
                   operation: {
@@ -290,7 +314,7 @@ export const HistoryItem = ({
                     from: attrs.from,
                     to: attrs.to,
                   },
-                  headerTitle: `${t(capitalize(attrs.fnName))} ${
+                  headerTitle: `${translations(capitalize(attrs.fnName))} ${
                     _token.symbol
                   }`,
                   isPayment: false,
@@ -302,7 +326,7 @@ export const HistoryItem = ({
             } catch (error) {
               console.error(error);
               captureException(`Error fetching token details: ${error}`);
-              setRowText(t(capitalize(attrs.fnName)));
+              setRowText(translations(capitalize(attrs.fnName)));
               setBodyComponent(
                 <>
                   {isRecieving && "+ "}
@@ -311,7 +335,11 @@ export const HistoryItem = ({
               );
               setDateText(
                 (_dateText) =>
-                  `${isRecieving ? t("Received") : t("Minted")} \u2022 ${date}`,
+                  `${
+                    isRecieving
+                      ? translations("Received")
+                      : translations("Minted")
+                  } \u2022 ${date}`,
               );
               setTxDetails((_state) => ({
                 ..._state,
@@ -320,7 +348,7 @@ export const HistoryItem = ({
                   from: attrs.from,
                   to: attrs.to,
                 },
-                headerTitle: t(capitalize(attrs.fnName)),
+                headerTitle: translations(capitalize(attrs.fnName)),
                 // manually set `isPayment` now that we've passed the above `isPayment` conditional
                 isPayment: false,
                 isRecipient: isRecieving,
@@ -343,9 +371,13 @@ export const HistoryItem = ({
 
             setDateText(
               (_dateText) =>
-                `${isRecieving ? t("Received") : t("Minted")} \u2022 ${date}`,
+                `${
+                  isRecieving
+                    ? translations("Received")
+                    : translations("Minted")
+                } \u2022 ${date}`,
             );
-            setRowText(t(capitalize(attrs.fnName)));
+            setRowText(translations(capitalize(attrs.fnName)));
             setTxDetails((_state) => ({
               ..._state,
               operation: {
@@ -353,7 +385,9 @@ export const HistoryItem = ({
                 from: attrs.from,
                 to: attrs.to,
               },
-              headerTitle: `${t(capitalize(attrs.fnName))} ${token.code}`,
+              headerTitle: `${translations(capitalize(attrs.fnName))} ${
+                token.code
+              }`,
               isPayment: false,
               isRecipient: isRecieving,
               operationText: `${formattedTokenAmount} ${token.code}`,
@@ -363,47 +397,77 @@ export const HistoryItem = ({
           setIconComponent(
             <Icon.ArrowUp className="HistoryItem__icon--sent" />,
           );
+          setIsLoading(true);
 
-          if (!tokenKey) {
-            // TODO: attempt to fetch token details, not stored
-            setRowText(operationString);
-            setTxDetails((_state) => ({
-              ..._state,
-              headerTitle: t("Transaction"),
-              operationText: operationString,
-            }));
-          } else {
-            const { token, decimals } = balances[tokenKey] as TokenBalance;
+          try {
+            const tokenDetailsResponse = await getTokenDetails({
+              contractId: attrs.contractId,
+              publicKey,
+              networkDetails,
+            });
+
+            if (!tokenDetailsResponse) {
+              setRowText(operationString);
+              setTxDetails((_state) => ({
+                ..._state,
+                headerTitle: translations("Transaction"),
+                operationText: operationString,
+              }));
+            }
+
+            const { symbol, decimals } = tokenDetailsResponse!;
+            const code = symbol === "native" ? "XLM" : symbol;
             const formattedTokenAmount = formatTokenAmount(
               new BigNumber(attrs.amount),
               decimals,
             );
+            const _isRecipient =
+              attrs.to === publicKey && attrs.from !== publicKey;
+            const paymentDifference = _isRecipient ? "+" : "-";
             setBodyComponent(
               <>
-                - {formattedTokenAmount} {token.code}
+                {paymentDifference}
+                {formattedTokenAmount} {code}
               </>,
             );
-
-            setDateText((_dateText) => `${t("Sent")} \u2022 ${date}`);
-            setRowText(t(capitalize(attrs.fnName)));
+            setIconComponent(
+              _isRecipient ? (
+                <Icon.ArrowDown className="HistoryItem__icon--received" />
+              ) : (
+                <Icon.ArrowUp className="HistoryItem__icon--sent" />
+              ),
+            );
+            setRowText(code);
+            setDateText(
+              (_dateText) =>
+                `${
+                  _isRecipient ? translations("Received") : translations("Sent")
+                } \u2022 ${date}`,
+            );
             setTxDetails((_state) => ({
               ..._state,
-              operation: {
-                ..._state.operation,
-                from: attrs.from,
-                to: attrs.to,
-              },
-              headerTitle: `${t(capitalize(attrs.fnName))} ${token.code}`,
-              isPayment: false,
-              isRecipient: false,
-              operationText: `${formattedTokenAmount} ${token.code}`,
+              isRecipient: _isRecipient,
+              headerTitle: `${
+                _isRecipient ? translations("Received") : translations("Sent")
+              } ${code}`,
+              operationText: `${paymentDifference}${formattedTokenAmount} ${code}`,
+            }));
+          } catch (error) {
+            // falls back to only showing contract ID
+            setRowText(operationString);
+            setTxDetails((_state) => ({
+              ..._state,
+              headerTitle: translations("Transaction"),
+              operationText: operationString,
             }));
+          } finally {
+            setIsLoading(false);
           }
         } else {
           setRowText(operationString);
           setTxDetails((_state) => ({
             ..._state,
-            headerTitle: t("Transaction"),
+            headerTitle: translations("Transaction"),
             operationText: operationString,
           }));
         }
@@ -411,7 +475,7 @@ export const HistoryItem = ({
         setRowText(operationString);
         setTxDetails((_state) => ({
           ..._state,
-          headerTitle: t("Transaction"),
+          headerTitle: translations("Transaction"),
           operationText: operationString,
         }));
       }
@@ -434,13 +498,14 @@ export const HistoryItem = ({
     publicKey,
     srcAssetCode,
     startingBalance,
-    t,
+    translations,
     to,
     accountBalances.balances,
   ]);
 
   return (
     <div
+      data-testid="history-item"
       className="HistoryItem"
       onClick={() => {
         emitMetric(METRIC_NAMES.historyOpenItem);
@@ -461,7 +526,12 @@ export const HistoryItem = ({
               <div className="HistoryItem__date">{dateText}</div>
             </div>
 
-            <div className="HistoryItem__payment">{renderBodyComponent()}</div>
+            <div
+              className="HistoryItem__payment"
+              data-testid="history-item-body-component"
+            >
+              {renderBodyComponent()}
+            </div>
           </>
         )}
       </div>
diff --git a/extension/src/popup/components/accountHistory/TransactionDetail/index.tsx b/extension/src/popup/components/accountHistory/TransactionDetail/index.tsx
index 0461b766b..b9e5e9472 100644
--- a/extension/src/popup/components/accountHistory/TransactionDetail/index.tsx
+++ b/extension/src/popup/components/accountHistory/TransactionDetail/index.tsx
@@ -13,6 +13,7 @@ import { emitMetric } from "helpers/metrics";
 import { openTab } from "popup/helpers/navigate";
 import { stroopToXlm } from "helpers/stellar";
 import { useAssetDomain } from "popup/helpers/useAssetDomain";
+import { useScanAsset } from "popup/helpers/blockaid";
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
 
 import { METRIC_NAMES } from "popup/constants/metricsNames";
@@ -78,8 +79,10 @@ export const TransactionDetail = ({
   const { assetDomain, error: assetError } = useAssetDomain({
     assetIssuer,
   });
+  const { scannedAsset } = useScanAsset(`${assetCode}-${assetIssuer}`);
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
   const showContent = assetIssuer && !assetDomain && !assetError;
+  const isMalicious = scannedAsset.result_type === "Malicious";
 
   return showContent ? (
     <Loading />
@@ -92,7 +95,11 @@ export const TransactionDetail = ({
       <View.Content>
         <div className="TransactionDetail__content">
           {isPayment ? (
-            <div className="TransactionDetail__header">
+            <div
+              className={`TransactionDetail__header ${
+                isMalicious ? "TransactionDetail__header--isMalicious" : ""
+              }`}
+            >
               {operationText}
               <AssetNetworkInfo
                 assetCode={assetCode || ""}
diff --git a/extension/src/popup/components/accountHistory/TransactionDetail/styles.scss b/extension/src/popup/components/accountHistory/TransactionDetail/styles.scss
index 43f50705a..814f8b70b 100644
--- a/extension/src/popup/components/accountHistory/TransactionDetail/styles.scss
+++ b/extension/src/popup/components/accountHistory/TransactionDetail/styles.scss
@@ -10,6 +10,10 @@
     font-weight: var(--font-weight-light);
     padding-bottom: 1.5rem;
     text-align: center;
+
+    &--isMalicious {
+      color: var(--color-red-70);
+    }
   }
 
   &__content {
diff --git a/extension/src/popup/components/manageAssets/AddAsset/index.tsx b/extension/src/popup/components/manageAssets/AddAsset/index.tsx
index 3276c9308..da3db2d6e 100644
--- a/extension/src/popup/components/manageAssets/AddAsset/index.tsx
+++ b/extension/src/popup/components/manageAssets/AddAsset/index.tsx
@@ -24,6 +24,11 @@ import {
   VerifiedTokenRecord,
 } from "popup/helpers/searchAsset";
 import { isContractId } from "popup/helpers/soroban";
+import {
+  isAssetSuspicious,
+  scanAsset,
+  scanAssetBulk,
+} from "popup/helpers/blockaid";
 
 import { AssetNotifcation } from "popup/components/AssetNotification";
 import { SubviewHeader } from "popup/components/SubviewHeader";
@@ -112,15 +117,21 @@ export const AddAsset = () => {
       if (!tokenDetailsResponse) {
         setAssetRows([]);
       } else {
+        const issuer = isSacContract
+          ? tokenDetailsResponse.name.split(":")[1] || ""
+          : contractId; // get the issuer name, if applicable ,
+        const scannedAsset = await scanAsset(
+          `${tokenDetailsResponse.symbol}-${issuer}`,
+          networkDetails,
+        );
         setAssetRows([
           {
             code: tokenDetailsResponse.symbol,
             contract: contractId,
-            issuer: isSacContract
-              ? tokenDetailsResponse.name.split(":")[1] || ""
-              : contractId, // get the issuer name, if applicable ,
+            issuer,
             domain: "",
             name: tokenDetailsResponse.name,
+            isSuspicious: isAssetSuspicious(scannedAsset),
           },
         ]);
       }
@@ -175,6 +186,8 @@ export const AddAsset = () => {
     const acct = await server.loadAccount(issuer);
     const homeDomain = acct.home_domain || "";
 
+    setIsSearching(true);
+
     try {
       assetDomainToml = await StellarToml.Resolver.resolve(homeDomain);
     } catch (e) {
@@ -190,13 +203,26 @@ export const AddAsset = () => {
       const tomlNetworkPassphrase =
         assetDomainToml.NETWORK_PASSPHRASE || Networks.PUBLIC;
 
+      type AssetRecord = StellarToml.Api.Currency & {
+        domain: string;
+      };
+
       if (tomlNetworkPassphrase === networkPassphrase) {
-        setAssetRows(
-          assetDomainToml.CURRENCIES.map((currency) => ({
-            ...currency,
-            domain: homeDomain,
-          })),
-        );
+        const assetsToScan: string[] = [];
+        const assetRecords: AssetRecord[] = [];
+        assetDomainToml.CURRENCIES.forEach((currency) => {
+          assetRecords.push({ ...currency, domain: homeDomain });
+          assetsToScan.push(`${currency.code}-${currency.issuer}`);
+        });
+        const scannedAssets = await scanAssetBulk(assetsToScan, networkDetails);
+        const scannedAssetRows = assetRecords.map((record: AssetRecord) => ({
+          ...record,
+          isSuspicious: isAssetSuspicious(
+            scannedAssets.results[`${record.code}-${record.issuer}`],
+          ),
+        }));
+
+        setAssetRows(scannedAssetRows);
         // no need for verification on classic assets
         setIsVerificationInfoShowing(false);
       } else {
diff --git a/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx b/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
index a8f44bd57..6798b5c53 100644
--- a/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
+++ b/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
@@ -20,6 +20,7 @@ import { View } from "popup/basics/layout/View";
 import { getCanonicalFromAsset } from "helpers/stellar";
 import { getAssetDomain } from "popup/helpers/getAssetDomain";
 import { getNativeContractDetails } from "popup/helpers/searchAsset";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
 
 import { Balances } from "@shared/api/types";
 
@@ -63,10 +64,16 @@ export const ChooseAsset = ({ balances }: ChooseAssetProps) => {
           continue;
         }
 
-        const {
-          token: { code, issuer },
-          contractId,
-        } = sortedBalances[i];
+        const { token, contractId, blockaidData } = sortedBalances[i];
+
+        const code = token.code || "";
+        let issuer = {
+          key: "",
+        };
+
+        if ("issuer" in token) {
+          issuer = token.issuer;
+        }
 
         // If we are in the swap flow and the asset has decimals (is a token), we skip it if Soroswap is not enabled
         if ("decimals" in sortedBalances[i] && isSwap && !isSoroswapEnabled) {
@@ -77,11 +84,11 @@ export const ChooseAsset = ({ balances }: ChooseAssetProps) => {
         if (code !== "XLM") {
           let domain = "";
 
-          if (issuer?.key) {
+          if (issuer.key) {
             try {
               // eslint-disable-next-line no-await-in-loop
               domain = await getAssetDomain(
-                issuer.key as string,
+                issuer.key,
                 networkDetails.networkUrl,
                 networkDetails.networkPassphrase,
               );
@@ -92,13 +99,11 @@ export const ChooseAsset = ({ balances }: ChooseAssetProps) => {
 
           collection.push({
             code,
-            issuer: issuer?.key || "",
-            image:
-              assetIcons[
-                getCanonicalFromAsset(code as string, issuer?.key as string)
-              ],
+            issuer: issuer.key,
+            image: assetIcons[getCanonicalFromAsset(code, issuer.key)],
             domain,
             contract: contractId,
+            isSuspicious: isAssetSuspicious(blockaidData),
           });
           // include native asset for asset dropdown selection
         } else if (!isManagingAssets) {
@@ -107,6 +112,7 @@ export const ChooseAsset = ({ balances }: ChooseAssetProps) => {
             issuer: "",
             image: "",
             domain: "",
+            isSuspicious: false,
           });
         }
       }
diff --git a/extension/src/popup/components/manageAssets/ManageAssetRowButton/index.tsx b/extension/src/popup/components/manageAssets/ManageAssetRowButton/index.tsx
index b86fc2e07..c746afd78 100644
--- a/extension/src/popup/components/manageAssets/ManageAssetRowButton/index.tsx
+++ b/extension/src/popup/components/manageAssets/ManageAssetRowButton/index.tsx
@@ -12,7 +12,7 @@ import { emitMetric } from "helpers/metrics";
 import { getCanonicalFromAsset } from "helpers/stellar";
 import { getManageAssetXDR } from "popup/helpers/getManageAssetXDR";
 import { checkForSuspiciousAsset } from "popup/helpers/checkForSuspiciousAsset";
-import { scanAsset } from "popup/helpers/blockaid";
+import { isAssetSuspicious, scanAsset } from "popup/helpers/blockaid";
 import { METRIC_NAMES } from "popup/constants/metricsNames";
 import {
   publicKeySelector,
@@ -91,9 +91,7 @@ export const ManageAssetRowButton = ({
   const [isTrustlineErrorShowing, setIsTrustlineErrorShowing] = useState(false);
   const [isSigningWithHardwareWallet, setIsSigningWithHardwareWallet] =
     useState(false);
-  const { blockedDomains, submitStatus } = useSelector(
-    transactionSubmissionSelector,
-  );
+  const { submitStatus } = useSelector(transactionSubmissionSelector);
   const walletType = useSelector(hardwareWalletTypeSelector);
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
   const publicKey = useSelector(publicKeySelector);
@@ -105,8 +103,6 @@ export const ManageAssetRowButton = ({
     networkDetails.networkPassphrase,
   );
 
-  const isBlockedDomain = (d: string) => blockedDomains.domains[d];
-
   const handleBackgroundClick = () => {
     setRowButtonShowing("");
   };
@@ -133,9 +129,6 @@ export const ManageAssetRowButton = ({
         }),
       );
 
-      setAssetSubmitting("");
-      setRowButtonShowing("");
-
       if (submitFreighterTransaction.fulfilled.match(submitResp)) {
         dispatch(
           getAccountBalances({
@@ -153,6 +146,9 @@ export const ManageAssetRowButton = ({
       if (submitFreighterTransaction.rejected.match(submitResp)) {
         setIsTrustlineErrorShowing(true);
       }
+
+      setAssetSubmitting("");
+      setRowButtonShowing("");
     }
   };
 
@@ -203,6 +199,7 @@ export const ManageAssetRowButton = ({
       image: "",
     },
   ) => {
+    setAssetSubmitting(canonicalAsset);
     const resp = await checkForSuspiciousAsset({
       code: assetRowData.code,
       issuer: assetRowData.issuer,
@@ -211,21 +208,26 @@ export const ManageAssetRowButton = ({
       networkDetails,
     });
 
-    await scanAsset(
+    const scannedAsset = await scanAsset(
       `${assetRowData.code}-${assetRowData.issuer}`,
       networkDetails,
     );
 
-    if (isBlockedDomain(assetRowData.domain) && !isTrustlineActive) {
+    if (isAssetSuspicious(scannedAsset) && !isTrustlineActive) {
       setShowBlockedDomainWarning(true);
-      setSuspiciousAssetData(assetRowData);
+      setSuspiciousAssetData({
+        ...assetRowData,
+        blockaidData: scannedAsset,
+      });
+      setAssetSubmitting("");
     } else if (
       !isTrustlineActive &&
-      (resp.isInvalidDomain || resp.isRevocable || resp.isNewAsset)
+      (resp.isInvalidDomain || resp.isRevocable)
     ) {
       setShowNewAssetWarning(true);
       setNewAssetFlags(resp);
       setSuspiciousAssetData(assetRowData);
+      setAssetSubmitting("");
     } else {
       changeTrustline(!isTrustlineActive, () =>
         Promise.resolve(navigateTo(ROUTES.account)),
@@ -302,19 +304,21 @@ export const ManageAssetRowButton = ({
     }
   }, [submitStatus, isSigningWithHardwareWallet]);
 
+  const isLoading =
+    (isActionPending && assetSubmitting === canonicalAsset) ||
+    assetSubmitting === canonicalAsset;
+
   return (
     <div className="ManageAssetRowButton">
       {isTrustlineActive ? (
         <div>
           <div
             className={`ManageAssetRowButton__ellipsis ${
-              isActionPending
-                ? `ManageAssetRowButton__ellipsis--is-pending`
-                : ""
+              isLoading ? `ManageAssetRowButton__ellipsis--is-pending` : ""
             }`}
             data-testid={`ManageAssetRowButton__ellipsis-${code}`}
             onClick={() => {
-              if (!isActionPending) {
+              if (!isLoading) {
                 setRowButtonShowing(
                   rowButtonShowing === canonicalAsset ? "" : canonicalAsset,
                 );
@@ -344,9 +348,7 @@ export const ManageAssetRowButton = ({
                   size="md"
                   variant="secondary"
                   disabled={isActionPending}
-                  isLoading={
-                    isActionPending && assetSubmitting === canonicalAsset
-                  }
+                  isLoading={isLoading}
                   onClick={() => {
                     if (isContract) {
                       handleTokenRowClick({
@@ -366,8 +368,7 @@ export const ManageAssetRowButton = ({
                   <div className="ManageAssetRowButton__label">
                     {t("Remove asset")}
                   </div>
-                  {isActionPending &&
-                  assetSubmitting === canonicalAsset ? null : (
+                  {isLoading ? null : (
                     <img src={IconRemove} alt="icon remove" />
                   )}
                 </Button>
@@ -387,7 +388,7 @@ export const ManageAssetRowButton = ({
           size="md"
           variant="secondary"
           disabled={isActionPending}
-          isLoading={isActionPending && assetSubmitting === canonicalAsset}
+          isLoading={isLoading}
           onClick={() => {
             setAssetSubmitting(canonicalAsset || contract);
             if (isContract) {
diff --git a/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx b/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
index 145a2c49a..59b870ada 100644
--- a/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
+++ b/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { StellarToml } from "stellar-sdk";
 import { useDispatch, useSelector } from "react-redux";
-import { ActionStatus } from "@shared/api/types";
+import { ActionStatus, BlockAidScanAssetResult } from "@shared/api/types";
 
 import { AppDispatch } from "popup/App";
 
@@ -13,6 +13,7 @@ import {
 } from "helpers/stellar";
 import { isContractId } from "popup/helpers/soroban";
 import { useNetworkFees } from "popup/helpers/useNetworkFees";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 
 import { LoadingBackground } from "popup/basics/LoadingBackground";
 import { ROUTES } from "popup/constants/routes";
@@ -30,7 +31,6 @@ import {
   NewAssetWarning,
   TokenWarning,
 } from "popup/components/WarningMessages";
-import { ScamAssetIcon } from "popup/components/account/ScamAssetIcon";
 
 import { ManageAssetRowButton } from "../ManageAssetRowButton";
 
@@ -40,12 +40,12 @@ export type ManageAssetCurrency = StellarToml.Api.Currency & {
   domain: string;
   contract?: string;
   icon?: string;
+  isSuspicious?: boolean;
 };
 
 export interface NewAssetFlags {
   isInvalidDomain: boolean;
   isRevocable: boolean;
-  isNewAsset: boolean;
 }
 
 interface ManageAssetRowsProps {
@@ -63,6 +63,7 @@ interface SuspiciousAssetData {
   issuer: string;
   image: string;
   isVerifiedToken?: boolean;
+  blockaidData: BlockAidScanAssetResult;
 }
 
 export const ManageAssetRows = ({
@@ -89,7 +90,6 @@ export const ManageAssetRows = ({
   const [showNewAssetWarning, setShowNewAssetWarning] = useState(false);
   const [showUnverifiedWarning, setShowUnverifiedWarning] = useState(false);
   const [newAssetFlags, setNewAssetFlags] = useState<NewAssetFlags>({
-    isNewAsset: false,
     isInvalidDomain: false,
     isRevocable: false,
   });
@@ -99,6 +99,7 @@ export const ManageAssetRows = ({
     issuer: "",
     image: "",
     isVerifiedToken: false,
+    blockaidData: defaultBlockaidScanAssetResult,
   } as SuspiciousAssetData);
   const [handleAddToken, setHandleAddToken] = useState(
     null as null | (() => () => Promise<void>),
@@ -126,10 +127,12 @@ export const ManageAssetRows = ({
       )}
       {showBlockedDomainWarning && (
         <ScamAssetWarning
+          pillType="Trustline"
           domain={suspiciousAssetData.domain}
           code={suspiciousAssetData.code}
           issuer={suspiciousAssetData.issuer}
           image={suspiciousAssetData.image}
+          blockaidData={suspiciousAssetData.blockaidData}
           onClose={() => {
             setShowBlockedDomainWarning(false);
           }}
@@ -170,6 +173,7 @@ export const ManageAssetRows = ({
               issuer = "",
               name = "",
               contract = "",
+              isSuspicious,
             }) => {
               if (!accountBalances.balances) {
                 return null;
@@ -194,6 +198,7 @@ export const ManageAssetRows = ({
                     image={image}
                     domain={domain}
                     name={name}
+                    isSuspicious={isSuspicious}
                   />
                   <ManageAssetRowButton
                     code={code}
@@ -238,6 +243,7 @@ interface AssetRowData {
   image?: string;
   domain: string;
   name?: string;
+  isSuspicious?: boolean;
 }
 
 export const ManageAssetRow = ({
@@ -246,10 +252,9 @@ export const ManageAssetRow = ({
   image = "",
   domain,
   name,
+  isSuspicious = false,
 }: AssetRowData) => {
-  const { blockedDomains } = useSelector(transactionSubmissionSelector);
   const canonicalAsset = getCanonicalFromAsset(code, issuer);
-  const isScamAsset = !!blockedDomains.domains[domain];
   const assetCode = name || code;
   const truncatedAssetCode =
     assetCode.length > 20 ? truncateString(assetCode) : assetCode;
@@ -260,11 +265,11 @@ export const ManageAssetRow = ({
         assetIcons={code !== "XLM" ? { [canonicalAsset]: image } : {}}
         code={code}
         issuerKey={issuer}
+        isSuspicious={isSuspicious}
       />
       <div className="ManageAssetRows__row__info">
         <div className="ManageAssetRows__row__info__header">
           <span data-testid="ManageAssetCode">{truncatedAssetCode}</span>
-          <ScamAssetIcon isScamAsset={isScamAsset} />
         </div>
         <div
           className="ManageAssetRows__domain"
diff --git a/extension/src/popup/components/manageAssets/SearchAsset/index.tsx b/extension/src/popup/components/manageAssets/SearchAsset/index.tsx
index d04d510c8..b1c5dc1aa 100644
--- a/extension/src/popup/components/manageAssets/SearchAsset/index.tsx
+++ b/extension/src/popup/components/manageAssets/SearchAsset/index.tsx
@@ -7,11 +7,15 @@ import { useTranslation } from "react-i18next";
 
 import { Button, Notification } from "@stellar/design-system";
 import { isCustomNetwork } from "@shared/helpers/stellar";
+import { INDEXER_URL } from "@shared/constants/mercury";
+import { BlockAidScanAssetResult } from "@shared/api/types";
 
 import { FormRows } from "popup/basics/Forms";
 import { ROUTES } from "popup/constants/routes";
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
 import { searchAsset } from "popup/helpers/searchAsset";
+import { isMainnet } from "helpers/stellar";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
 
 import { SubviewHeader } from "popup/components/SubviewHeader";
 import { View } from "popup/basics/layout/View";
@@ -27,6 +31,8 @@ const initialValues: FormValues = {
   asset: "",
 };
 
+const MAX_ASSETS_TO_SCAN = 10;
+
 const ResultsHeader = () => {
   const { t } = useTranslation();
 
@@ -85,22 +91,54 @@ export const SearchAsset = () => {
         },
       });
 
+      const assetRecords = resJson._embedded.records;
+
+      let blockaidScanResults: { [key: string]: BlockAidScanAssetResult } = {};
+
+      if (isMainnet(networkDetails)) {
+        // scan the first few assets to see if they are suspicious
+        // due to the length of time it takes to scan, we'll do it in consecutive chunks
+        const url = new URL(`${INDEXER_URL}/scan-asset-bulk`);
+        const firstSectionAssets = assetRecords.slice(0, MAX_ASSETS_TO_SCAN);
+        firstSectionAssets.forEach((record: AssetRecord) => {
+          const assetSplit = record.asset.split("-");
+          if (assetSplit[0] && assetSplit[1]) {
+            url.searchParams.append(
+              "asset_ids",
+              `${assetSplit[0]}-${assetSplit[1]}`,
+            );
+          }
+        });
+
+        try {
+          const response = await fetch(url.href);
+          const data = await response.json();
+          blockaidScanResults = data.data.results;
+        } catch (e) {
+          console.error(e);
+        }
+      }
+
       setIsSearching(false);
 
       setAssetRows(
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        resJson._embedded.records
+        assetRecords
           // only show records that have a domain and domains that don't have just whitespace
           .filter(
             (record: AssetRecord) => record.domain && /\S/.test(record.domain),
           )
           .map((record: AssetRecord) => {
             const assetSplit = record.asset.split("-");
+            const assetId = `${assetSplit[0]}-${assetSplit[1]}`;
             return {
               code: assetSplit[0],
               issuer: assetSplit[1],
               image: record?.tomlInfo?.image,
               domain: record.domain,
+              isSuspicious: blockaidScanResults[assetId]
+                ? isAssetSuspicious(blockaidScanResults[assetId])
+                : null,
             };
           }),
       );
@@ -112,6 +150,71 @@ export const SearchAsset = () => {
     setHasNoResults(!assetRows.length);
   }, [assetRows]);
 
+  useEffect(() => {
+    const firstNullSuspiciousIndex = assetRows.findIndex(
+      (r) => r.isSuspicious === null,
+    );
+
+    const fetchBlockaidResults = async (url: URL) => {
+      let blockaidScanResults: { [key: string]: BlockAidScanAssetResult } = {};
+      try {
+        const response = await fetch(url.href);
+        const data = await response.json();
+        blockaidScanResults = data.data.results;
+      } catch (e) {
+        console.error(e);
+      }
+
+      // take our scanned assets and update the assetRows with the new isSuspicious values
+      const assetRowsAddendum = assetRows
+        .slice(
+          firstNullSuspiciousIndex,
+          firstNullSuspiciousIndex + MAX_ASSETS_TO_SCAN,
+        )
+        .map((row) => {
+          const assetId = `${row.code}-${row.issuer}`;
+          return {
+            ...row,
+            isSuspicious: blockaidScanResults[assetId]
+              ? isAssetSuspicious(blockaidScanResults[assetId])
+              : row.isSuspicious,
+          };
+        });
+
+      // insert our newly scanned rows into the existing data
+      setAssetRows([
+        ...assetRows.slice(0, firstNullSuspiciousIndex),
+        ...assetRowsAddendum,
+        ...assetRows.slice(firstNullSuspiciousIndex + MAX_ASSETS_TO_SCAN),
+      ]);
+
+      return blockaidScanResults;
+    };
+
+    // if there are any assets with "null" (meaning we haven't scanned some assets yet), scan the next batch
+    if (
+      assetRows.length &&
+      isMainnet(networkDetails) &&
+      firstNullSuspiciousIndex !== -1
+    ) {
+      const url = new URL(`${INDEXER_URL}/scan-asset-bulk`);
+
+      // grab the next section of assets to scan
+      assetRows
+        .slice(
+          firstNullSuspiciousIndex,
+          firstNullSuspiciousIndex + MAX_ASSETS_TO_SCAN,
+        )
+        .forEach((row) => {
+          if (row.code && row.issuer && row.isSuspicious === null) {
+            url.searchParams.append("asset_ids", `${row.code}-${row.issuer}`);
+          }
+        });
+
+      fetchBlockaidResults(url);
+    }
+  }, [assetRows, networkDetails]);
+
   if (isCustomNetwork(networkDetails)) {
     return <Redirect to={ROUTES.addAsset} />;
   }
diff --git a/extension/src/popup/components/manageAssets/SelectAssetRows/index.tsx b/extension/src/popup/components/manageAssets/SelectAssetRows/index.tsx
index 81585170d..939e33365 100644
--- a/extension/src/popup/components/manageAssets/SelectAssetRows/index.tsx
+++ b/extension/src/popup/components/manageAssets/SelectAssetRows/index.tsx
@@ -20,7 +20,6 @@ import {
   getAssetFromCanonical,
 } from "helpers/stellar";
 import { getTokenBalance, isContractId } from "popup/helpers/soroban";
-import { ScamAssetIcon } from "popup/components/account/ScamAssetIcon";
 import { Balance, Balances, SorobanBalance } from "@shared/api/types";
 import { formatAmount } from "popup/helpers/formatters";
 import { useIsSoroswapEnabled, useIsSwap } from "popup/helpers/useIsSwap";
@@ -35,7 +34,6 @@ export const SelectAssetRows = ({ assetRows }: SelectAssetRowsProps) => {
   const {
     accountBalances: { balances = {} },
     assetSelect,
-    blockedDomains,
     soroswapTokens,
     transactionData,
   } = useSelector(transactionSubmissionSelector);
@@ -75,8 +73,15 @@ export const SelectAssetRows = ({ assetRows }: SelectAssetRowsProps) => {
     <div className="SelectAssetRows__scrollbar">
       <div className="SelectAssetRows__content">
         {assetRows.map(
-          ({ code = "", domain, image = "", issuer = "", icon }) => {
-            const isScamAsset = !!blockedDomains.domains[domain];
+          ({
+            code = "",
+            domain,
+            image = "",
+            issuer = "",
+            icon,
+            isSuspicious,
+          }) => {
+            const isScamAsset = isSuspicious || false;
             const isContract = isContractId(issuer);
             const canonical = getCanonicalFromAsset(code, issuer);
             let isSoroswap = false;
@@ -118,11 +123,11 @@ export const SelectAssetRows = ({ assetRows }: SelectAssetRowsProps) => {
                   code={code}
                   issuerKey={issuer}
                   icon={icon}
+                  isSuspicious={isScamAsset}
                 />
                 <div className="SelectAssetRows__row__info">
                   <div className="SelectAssetRows__row__info__header">
                     {code}
-                    <ScamAssetIcon isScamAsset={isScamAsset} />
                   </div>
                   <div className="SelectAssetRows__domain">
                     {formatDomain(domain)}
diff --git a/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx b/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
index e3d55a381..52f7091dc 100644
--- a/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
+++ b/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
@@ -334,6 +334,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
                 ) : null}
 
                 <Input
+                  data-testid="NetworkForm__networkName"
                   fieldSize="md"
                   disabled={isEditingDefaultNetworks}
                   id="networkName"
@@ -350,6 +351,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
                   placeholder={t("Enter network name")}
                 />
                 <Input
+                  data-testid="NetworkForm__networkUrl"
                   fieldSize="md"
                   disabled={isEditingDefaultNetworks}
                   id="networkUrl"
@@ -367,6 +369,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
                 {!isEditingDefaultNetworks ||
                 networkDetailsToEdit.network !== NETWORKS.PUBLIC ? (
                   <Input
+                    data-testid="NetworkForm__sorobanRpcUrl"
                     fieldSize="md"
                     disabled={isEditingDefaultNetworks}
                     id="sorobanRpcUrl"
@@ -383,6 +386,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
                   />
                 ) : null}
                 <Input
+                  data-testid="NetworkForm__networkPassphrase"
                   fieldSize="md"
                   disabled={isEditingDefaultNetworks}
                   id="networkPassphrase"
@@ -478,6 +482,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
               ) : (
                 <div className="NetworkForm__add-button">
                   <Button
+                    data-testid="NetworkForm__add"
                     size="md"
                     variant="primary"
                     disabled={!(isValid && dirty)}
diff --git a/extension/src/popup/components/sendPayment/SendAmount/AssetSelect/index.tsx b/extension/src/popup/components/sendPayment/SendAmount/AssetSelect/index.tsx
index aa531c5e5..599225aa7 100644
--- a/extension/src/popup/components/sendPayment/SendAmount/AssetSelect/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendAmount/AssetSelect/index.tsx
@@ -6,7 +6,6 @@ import { ROUTES } from "popup/constants/routes";
 import { navigateTo } from "popup/helpers/navigate";
 import { isMainnet, isTestnet } from "helpers/stellar";
 import { AssetIcon } from "popup/components/account/AccountAssets";
-import { ScamAssetIcon } from "popup/components/account/ScamAssetIcon";
 import { UnverifiedTokenNotification } from "popup/components/WarningMessages";
 import {
   transactionSubmissionSelector,
@@ -16,7 +15,6 @@ import {
 } from "popup/ducks/transactionSubmission";
 import { isContractId } from "popup/helpers/soroban";
 import { useIsSwap } from "popup/helpers/useIsSwap";
-import { useIsOwnedScamAsset } from "popup/helpers/useIsOwnedScamAsset";
 import { settingsSelector } from "popup/ducks/settings";
 import { getVerifiedTokens } from "popup/helpers/searchAsset";
 
@@ -25,14 +23,15 @@ import "./styles.scss";
 export const AssetSelect = ({
   assetCode,
   issuerKey,
+  isSuspicious,
 }: {
   assetCode: string;
   issuerKey: string;
+  isSuspicious: boolean;
 }) => {
   const dispatch = useDispatch();
   const { assetIcons } = useSelector(transactionSubmissionSelector);
   const { networkDetails, assetsLists } = useSelector(settingsSelector);
-  const isOwnedScamAsset = useIsOwnedScamAsset(assetCode, issuerKey);
   const [isUnverifiedToken, setIsUnverifiedToken] = useState(false);
 
   useEffect(() => {
@@ -83,9 +82,9 @@ export const AssetSelect = ({
               assetIcons={assetIcons}
               code={assetCode}
               issuerKey={issuerKey}
+              isSuspicious={isSuspicious}
             />
             <span className="AssetSelect__medium-copy">{assetCode}</span>
-            <ScamAssetIcon isScamAsset={isOwnedScamAsset} />
           </div>
           <div className="AssetSelect__content__right">
             <Icon.ChevronDown />
@@ -102,17 +101,18 @@ export const PathPayAssetSelect = ({
   issuerKey,
   balance,
   icon,
+  isSuspicious,
 }: {
   source: boolean;
   assetCode: string;
   issuerKey: string;
   balance: string;
   icon: string;
+  isSuspicious: boolean;
 }) => {
   const dispatch = useDispatch();
   const { assetIcons } = useSelector(transactionSubmissionSelector);
   const isSwap = useIsSwap();
-  const isOwnedScamAsset = useIsOwnedScamAsset(assetCode, issuerKey);
 
   const handleSelectAsset = () => {
     dispatch(
@@ -150,6 +150,7 @@ export const PathPayAssetSelect = ({
             code={assetCode}
             issuerKey={issuerKey}
             icon={icon}
+            isSuspicious={isSuspicious}
           />
           <span
             className="AssetSelect__medium-copy"
@@ -157,7 +158,6 @@ export const PathPayAssetSelect = ({
           >
             {truncateLongAssetCode(assetCode)}
           </span>{" "}
-          <ScamAssetIcon isScamAsset={isOwnedScamAsset} />
           <Icon.ChevronDown />
         </div>
         <div className="AssetSelect__content__right">
diff --git a/extension/src/popup/components/sendPayment/SendAmount/index.tsx b/extension/src/popup/components/sendPayment/SendAmount/index.tsx
index f0f4e7846..92e8b1ac1 100644
--- a/extension/src/popup/components/sendPayment/SendAmount/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendAmount/index.tsx
@@ -22,6 +22,7 @@ import { navigateTo } from "popup/helpers/navigate";
 import { useNetworkFees } from "popup/helpers/useNetworkFees";
 import { useIsSwap, useIsSoroswapEnabled } from "popup/helpers/useIsSwap";
 import { LP_IDENTIFIER } from "popup/helpers/account";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
 import { emitMetric } from "helpers/metrics";
 import { useRunAfterUpdate } from "popup/helpers/useRunAfterUpdate";
 import { getAssetDecimals, getTokenBalance } from "popup/helpers/soroban";
@@ -51,6 +52,7 @@ import {
 import { ScamAssetWarning } from "popup/components/WarningMessages";
 import { TX_SEND_MAX } from "popup/constants/transaction";
 import { BASE_RESERVE } from "@shared/constants/stellar";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 
 import { BalanceMap, SorobanBalance } from "@shared/api/types";
 import "../styles.scss";
@@ -122,7 +124,6 @@ export const SendAmount = ({
     destinationBalances,
     transactionData,
     assetDomains,
-    blockedDomains,
     assetIcons,
     soroswapTokens,
   } = useSelector(transactionSubmissionSelector);
@@ -147,6 +148,7 @@ export const SendAmount = ({
     code: "",
     issuer: "",
     image: "",
+    blockaidData: defaultBlockaidScanAssetResult,
   });
 
   /* eslint-disable react-hooks/exhaustive-deps */
@@ -205,25 +207,40 @@ export const SendAmount = ({
   }) => {
     dispatch(saveAmount(cleanAmount(values.amount)));
     dispatch(saveAsset(values.asset));
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    let isDestAssetScam = false;
+
     if (values.destinationAsset) {
       dispatch(saveDestinationAsset(values.destinationAsset));
+      isDestAssetScam = isAssetSuspicious(
+        accountBalances.balances?.[destinationAsset].blockaidData,
+      );
     }
     // check for scam asset
-    if (blockedDomains.domains[assetDomains[values.asset]]) {
+    const isSourceAssetScam = isAssetSuspicious(
+      accountBalances.balances?.[asset].blockaidData,
+    );
+    if (isSourceAssetScam) {
       setShowBlockedDomainWarning(true);
       setSuspiciousAssetData({
         code: getAssetFromCanonical(values.asset).code,
         issuer: getAssetFromCanonical(values.asset).issuer,
         domain: assetDomains[values.asset],
         image: assetIcons[values.asset],
+        blockaidData:
+          accountBalances.balances?.[asset].blockaidData ||
+          defaultBlockaidScanAssetResult,
       });
-    } else if (blockedDomains.domains[assetDomains[values.destinationAsset]]) {
+    } else if (isDestAssetScam) {
       setShowBlockedDomainWarning(true);
       setSuspiciousAssetData({
         code: getAssetFromCanonical(values.destinationAsset).code,
         issuer: getAssetFromCanonical(values.destinationAsset).issuer,
         domain: assetDomains[values.destinationAsset],
         image: assetIcons[values.destinationAsset],
+        blockaidData:
+          accountBalances.balances?.[destinationAsset].blockaidData ||
+          defaultBlockaidScanAssetResult,
       });
     } else {
       navigateTo(next);
@@ -425,12 +442,14 @@ export const SendAmount = ({
       {showBlockedDomainWarning && (
         <ScamAssetWarning
           isSendWarning
+          pillType="Transaction"
           domain={suspiciousAssetData.domain}
           code={suspiciousAssetData.code}
           issuer={suspiciousAssetData.issuer}
           image={suspiciousAssetData.image}
           onClose={() => setShowBlockedDomainWarning(false)}
           onContinue={() => navigateTo(next)}
+          blockaidData={suspiciousAssetData.blockaidData}
         />
       )}
       <React.Fragment>
@@ -568,6 +587,9 @@ export const SendAmount = ({
                       <AssetSelect
                         assetCode={parsedSourceAsset.code}
                         issuerKey={parsedSourceAsset.issuer}
+                        isSuspicious={isAssetSuspicious(
+                          accountBalances.balances?.[asset].blockaidData,
+                        )}
                       />
                     )}
                     {showSourceAndDestAsset && (
@@ -578,6 +600,9 @@ export const SendAmount = ({
                           issuerKey={parsedSourceAsset.issuer}
                           balance={formik.values.amount}
                           icon=""
+                          isSuspicious={isAssetSuspicious(
+                            accountBalances.balances?.[asset].blockaidData,
+                          )}
                         />
                         <PathPayAssetSelect
                           source={false}
@@ -589,6 +614,11 @@ export const SendAmount = ({
                               : "0"
                           }
                           icon={destinationIcon}
+                          isSuspicious={isAssetSuspicious(
+                            accountBalances.balances?.[
+                              formik.values.destinationAsset
+                            ]?.blockaidData,
+                          )}
                         />
                       </>
                     )}
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
index 368b013e3..e40f2dc17 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
@@ -32,29 +32,36 @@ import { View } from "popup/basics/layout/View";
 import { AssetIcon } from "popup/components/account/AccountAssets";
 import { TrustlineError } from "popup/components/manageAssets/TrustlineError";
 import IconFail from "popup/assets/icon-fail.svg";
-
-import "./styles.scss";
 import { emitMetric } from "helpers/metrics";
 import { METRIC_NAMES } from "popup/constants/metricsNames";
 import { formatAmount } from "popup/helpers/formatters";
+import { isAssetSuspicious } from "popup/helpers/blockaid";
+
+import "./styles.scss";
 
 const SwapAssetsIcon = ({
   sourceCanon,
   destCanon,
   assetIcons,
+  isSourceSuspicious,
+  isDestSuspicious,
 }: {
   sourceCanon: string;
   destCanon: string;
   assetIcons: AssetIcons;
+  isSourceSuspicious: boolean;
+  isDestSuspicious: boolean;
 }) => {
   const source = getAssetFromCanonical(sourceCanon);
   const dest = getAssetFromCanonical(destCanon);
+
   return (
     <div className="SwapAssetsIcon">
       <AssetIcon
         assetIcons={assetIcons}
         code={source.code}
         issuerKey={source.issuer}
+        isSuspicious={isSourceSuspicious}
       />
       <span data-testid="SubmitResultSource">{source.code}</span>
       <Icon.ArrowRight />
@@ -62,6 +69,7 @@ const SwapAssetsIcon = ({
         assetIcons={assetIcons}
         code={dest.code}
         issuerKey={dest.issuer}
+        isSuspicious={isDestSuspicious}
       />
       <span data-testid="SubmitResultDestination">{dest.code}</span>
     </div>
@@ -96,6 +104,12 @@ export const SubmitSuccess = ({ viewDetails }: { viewDetails: () => void }) => {
     networkDetails.networkPassphrase,
   );
   const isHardwareWallet = !!useSelector(hardwareWalletTypeSelector);
+  const isSourceAssetSuspicious = isAssetSuspicious(
+    accountBalances.balances?.[asset]?.blockaidData,
+  );
+  const isDestAssetSuspicious = isAssetSuspicious(
+    accountBalances.balances?.[destinationAsset]?.blockaidData,
+  );
 
   const removeTrustline = async (assetCode: string, assetIssuer: string) => {
     const changeParams = { limit: "0" };
@@ -213,6 +227,8 @@ export const SubmitSuccess = ({ viewDetails }: { viewDetails: () => void }) => {
                 sourceCanon={asset}
                 destCanon={destinationAsset}
                 assetIcons={assetIcons}
+                isSourceSuspicious={isSourceAssetSuspicious}
+                isDestSuspicious={isDestAssetSuspicious}
               />
             ) : (
               <FedOrGAddress
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
index c17970730..910d4aa06 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
@@ -23,14 +23,24 @@ import {
 } from "helpers/stellar";
 import { getStellarExpertUrl } from "popup/helpers/account";
 import { stellarSdkServer } from "@shared/api/helpers/stellarSdkServer";
-import { AssetIcons, ActionStatus } from "@shared/api/types";
+import { AssetBalance, AssetIcons, ActionStatus } from "@shared/api/types";
 import { getIconUrlFromIssuer } from "@shared/api/helpers/getIconUrlFromIssuer";
-import { isCustomNetwork } from "@shared/helpers/stellar";
+import {
+  defaultBlockaidScanAssetResult,
+  isCustomNetwork,
+} from "@shared/helpers/stellar";
+import {
+  isAssetSuspicious,
+  isBlockaidWarning,
+  isTxSuspicious,
+  useScanAsset,
+  useScanTx,
+} from "popup/helpers/blockaid";
 
 import { AppDispatch } from "popup/App";
 import { ROUTES } from "popup/constants/routes";
 import {
-  getBlockedAccounts,
+  getMemoRequiredAccounts,
   signFreighterTransaction,
   signFreighterSorobanTransaction,
   submitFreighterTransaction,
@@ -61,14 +71,18 @@ import {
   AssetIcon,
 } from "popup/components/account/AccountAssets";
 import { HardwareSign } from "popup/components/hardwareConnect/HardwareSign";
-import { useIsOwnedScamAsset } from "popup/helpers/useIsOwnedScamAsset";
-import { ScamAssetIcon } from "popup/components/account/ScamAssetIcon";
-import { FlaggedWarningMessage } from "popup/components/WarningMessages";
+import {
+  BlockaidWarningModal,
+  FlaggedWarningMessage,
+} from "popup/components/WarningMessages";
 import { View } from "popup/basics/layout/View";
 
 import { TRANSACTION_WARNING } from "constants/transaction";
 import { formatAmount } from "popup/helpers/formatters";
 
+import { resetSimulation } from "popup/ducks/token-payment";
+import { NetworkDetails } from "@shared/constants/stellar";
+
 import "./styles.scss";
 
 const TwoAssetCard = ({
@@ -78,6 +92,8 @@ const TwoAssetCard = ({
   destAssetIcons,
   destCanon,
   destAmount,
+  isSourceAssetSuspicious,
+  isDestAssetSuspicious,
 }: {
   sourceAssetIcons: AssetIcons;
   sourceCanon: string;
@@ -85,16 +101,12 @@ const TwoAssetCard = ({
   destAssetIcons: AssetIcons;
   destCanon: string;
   destAmount: string;
+  isSourceAssetSuspicious: boolean;
+  isDestAssetSuspicious: boolean;
 }) => {
   const sourceAsset = getAssetFromCanonical(sourceCanon);
   const destAsset = getAssetFromCanonical(destCanon);
 
-  const isSourceAssetScam = useIsOwnedScamAsset(
-    sourceAsset.code,
-    sourceAsset.issuer,
-  );
-  const isDestAssetScam = useIsOwnedScamAsset(destAsset.code, destAsset.issuer);
-
   return (
     <div className="TwoAssetCard">
       <div className="TwoAssetCard__row">
@@ -103,9 +115,9 @@ const TwoAssetCard = ({
             assetIcons={sourceAssetIcons}
             code={sourceAsset.code}
             issuerKey={sourceAsset.issuer}
+            isSuspicious={isSourceAssetSuspicious}
           />
           {sourceAsset.code}
-          <ScamAssetIcon isScamAsset={isSourceAssetScam} />
         </div>
         <div
           className="TwoAssetCard__row__right"
@@ -123,9 +135,9 @@ const TwoAssetCard = ({
             assetIcons={destAssetIcons}
             code={destAsset.code}
             issuerKey={destAsset.issuer}
+            isSuspicious={isDestAssetSuspicious}
           />
           {destAsset.code}
-          <ScamAssetIcon isScamAsset={isDestAssetScam} />
         </div>
         <div
           className="TwoAssetCard__row__right"
@@ -190,10 +202,73 @@ const getOperation = (
   });
 };
 
-export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
+const getBuiltTx = async (
+  publicKey: string,
+  opData: {
+    sourceAsset: Asset | { code: string; issuer: string };
+    destAsset: Asset | { code: string; issuer: string };
+    amount: string;
+    destinationAmount: string;
+    destination: string;
+    allowedSlippage: string;
+    path: string[];
+    isPathPayment: boolean;
+    isSwap: boolean;
+    isFunded: boolean;
+  },
+  fee: string,
+  transactionTimeout: number,
+  networkDetails: NetworkDetails,
+) => {
+  const {
+    sourceAsset,
+    destAsset,
+    amount,
+    destinationAmount,
+    destination,
+    allowedSlippage,
+    path,
+    isPathPayment,
+    isSwap,
+    isFunded,
+  } = opData;
+  const server = stellarSdkServer(
+    networkDetails.networkUrl,
+    networkDetails.networkPassphrase,
+  );
+  const sourceAccount: Account = await server.loadAccount(publicKey);
+  const operation = getOperation(
+    sourceAsset,
+    destAsset,
+    amount,
+    destinationAmount,
+    destination,
+    allowedSlippage,
+    path,
+    isPathPayment,
+    isSwap,
+    isFunded,
+    publicKey,
+  );
+  return new TransactionBuilder(sourceAccount, {
+    fee: xlmToStroop(fee).toFixed(),
+    networkPassphrase: networkDetails.networkPassphrase,
+  })
+    .addOperation(operation)
+    .setTimeout(transactionTimeout);
+};
+
+export const TransactionDetails = ({
+  goBack,
+  shouldScanTx,
+}: {
+  goBack: () => void;
+  shouldScanTx: boolean;
+}) => {
   const dispatch: AppDispatch = useDispatch();
   const submission = useSelector(transactionSubmissionSelector);
   const {
+    accountBalances,
     destinationBalances,
     transactionData: {
       destination,
@@ -212,15 +287,15 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
     },
     assetIcons,
     hardwareWalletData: { status: hwStatus },
-    blockedAccounts,
+    memoRequiredAccounts,
     transactionSimulation,
   } = submission;
 
   const transactionHash = submission.response?.hash;
   const isPathPayment = useSelector(isPathPaymentSelector);
-  const { isMemoValidationEnabled, isSafetyValidationEnabled } =
-    useSelector(settingsSelector);
+  const { isMemoValidationEnabled } = useSelector(settingsSelector);
   const isSwap = useIsSwap();
+  const { scanTx, data: scanResult, isLoading, setLoading } = useScanTx();
 
   const { t } = useTranslation();
 
@@ -235,9 +310,8 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
 
   const _isMainnet = isMainnet(networkDetails);
   const isValidatingMemo = isMemoValidationEnabled && _isMainnet;
-  const isValidatingSafety = isSafetyValidationEnabled && _isMainnet;
 
-  const matchingBlockedTags = blockedAccounts
+  const matchingBlockedTags = memoRequiredAccounts
     .filter(({ address }) => address === destination)
     .flatMap(({ tags }) => tags);
   const isMemoRequired =
@@ -245,13 +319,19 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
     matchingBlockedTags.some(
       (tag) => tag === TRANSACTION_WARNING.memoRequired && !memo,
     );
-  const isMalicious =
-    isValidatingSafety &&
-    matchingBlockedTags.some((tag) => tag === TRANSACTION_WARNING.malicious);
-  const isUnsafe =
-    isValidatingSafety &&
-    matchingBlockedTags.some((tag) => tag === TRANSACTION_WARNING.unsafe);
-  const isSubmitDisabled = isMemoRequired || isMalicious || isUnsafe;
+
+  const isSourceAssetSuspicious = isAssetSuspicious(
+    accountBalances.balances?.[asset].blockaidData,
+  );
+
+  const isSubmitDisabled = isMemoRequired;
+
+  const destAssetToScan = destinationAsset
+    ? `${destAsset.code}-${destAsset.issuer}`
+    : "";
+
+  const { scannedAsset: scannedDestAsset } = useScanAsset(destAssetToScan);
+  const isDestAssetSuspicious = isAssetSuspicious(scannedDestAsset);
 
   // load destination asset icons
   useEffect(() => {
@@ -268,9 +348,58 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
   }, [destAsset.code, destAsset.issuer, networkDetails]);
 
   useEffect(() => {
-    dispatch(getBlockedAccounts());
+    dispatch(getMemoRequiredAccounts());
   }, [dispatch]);
 
+  useEffect(() => {
+    const url = "internal"; // blockaid prefers a URL for this endpoint, but this does not originate from a URL
+    const scanSorobanTx = async () => {
+      if (
+        shouldScanTx &&
+        submission.submitStatus === ActionStatus.IDLE &&
+        transactionSimulation.preparedTransaction
+      ) {
+        await scanTx(
+          transactionSimulation.preparedTransaction,
+          url,
+          networkDetails,
+        );
+      }
+      setLoading(false);
+    };
+    const scanClassicTx = async () => {
+      if (shouldScanTx) {
+        const transaction = await getBuiltTx(
+          publicKey,
+          {
+            sourceAsset,
+            destAsset,
+            amount,
+            destinationAmount,
+            destination,
+            allowedSlippage,
+            path,
+            isPathPayment,
+            isSwap,
+            isFunded: destinationBalances.isFunded!,
+          },
+          transactionFee,
+          transactionTimeout,
+          networkDetails,
+        );
+
+        await scanTx(transaction.build().toXDR(), url, networkDetails);
+      }
+      setLoading(false);
+    };
+    if (isToken || isSoroswap) {
+      scanSorobanTx();
+      return;
+    }
+    scanClassicTx();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const handleSorobanTransaction = async () => {
     try {
       const res = await dispatch(
@@ -315,41 +444,33 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
 
   const handlePaymentTransaction = async () => {
     try {
-      const server = stellarSdkServer(
-        networkDetails.networkUrl,
-        networkDetails.networkPassphrase,
-      );
-      const sourceAccount: Account = await server.loadAccount(publicKey);
-
-      const operation = getOperation(
-        sourceAsset,
-        destAsset,
-        amount,
-        destinationAmount,
-        destination,
-        allowedSlippage,
-        path,
-        isPathPayment,
-        isSwap,
-        destinationBalances.isFunded!,
+      const transaction = await getBuiltTx(
         publicKey,
+        {
+          sourceAsset,
+          destAsset,
+          amount,
+          destinationAmount,
+          destination,
+          allowedSlippage,
+          path,
+          isPathPayment,
+          isSwap,
+          isFunded: destinationBalances.isFunded!,
+        },
+        transactionFee,
+        transactionTimeout,
+        networkDetails,
       );
 
-      const transactionXDR = new TransactionBuilder(sourceAccount, {
-        fee: xlmToStroop(transactionFee).toFixed(),
-        networkPassphrase: networkDetails.networkPassphrase,
-      })
-        .addOperation(operation)
-        .setTimeout(transactionTimeout);
-
       if (memo) {
-        transactionXDR.addMemo(Memo.text(memo));
+        transaction.addMemo(Memo.text(memo));
       }
 
       if (isHardwareWallet) {
         dispatch(
           startHwSign({
-            transactionXDR: transactionXDR.build().toXDR(),
+            transactionXDR: transaction.build().toXDR(),
             shouldSubmit: true,
           }),
         );
@@ -357,7 +478,7 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
       }
       const res = await dispatch(
         signFreighterTransaction({
-          transactionXDR: transactionXDR.build().toXDR(),
+          transactionXDR: transaction.build().toXDR(),
           network: networkDetails.networkPassphrase,
         }),
       );
@@ -436,186 +557,219 @@ export const TransactionDetails = ({ goBack }: { goBack: () => void }) => {
       {hwStatus === ShowOverlayStatus.IN_PROGRESS && hardwareWalletType && (
         <HardwareSign walletType={hardwareWalletType} />
       )}
-      <React.Fragment>
-        {submission.submitStatus === ActionStatus.PENDING && (
-          <div className="TransactionDetails__processing">
-            <div className="TransactionDetails__processing__header">
-              <Loader />{" "}
-              <span>
-                {t("Processing")} {isSwap ? t("swap") : t("transaction")}
-              </span>
-            </div>
-            <div className="TransactionDetails__processing__copy">
-              {t("Please don’t close this window")}
-            </div>
-          </div>
-        )}
-        <SubviewHeader
-          title={renderPageTitle(
-            submission.submitStatus === ActionStatus.SUCCESS,
-          )}
-          customBackAction={goBack}
-          customBackIcon={
-            submission.submitStatus === ActionStatus.SUCCESS ? (
-              <Icon.Close />
-            ) : null
-          }
-        />
-        <View.Content
-          contentFooter={
-            <div className="TransactionDetails__bottom-wrapper__copy">
-              {(isPathPayment || isSwap) &&
-                submission.submitStatus !== ActionStatus.SUCCESS &&
-                t("The final amount is approximate and may change")}
-            </div>
-          }
-        >
-          {!(isPathPayment || isSwap) && (
-            <div className="TransactionDetails__cards">
-              <Card>
-                <AccountAssets
-                  assetIcons={assetIcons}
-                  sortedBalances={[
-                    {
-                      token: {
-                        issuer: { key: sourceAsset.issuer },
-                        code: sourceAsset.code,
-                      },
-                      total: amount || "0",
-                    },
-                  ]}
-                />
-              </Card>
-            </div>
-          )}
-
-          {(isPathPayment || isSwap) && (
-            <TwoAssetCard
-              sourceAssetIcons={assetIcons}
-              sourceCanon={asset}
-              sourceAmount={amount}
-              destAssetIcons={destAssetIcons}
-              destCanon={destinationAsset || "native"}
-              destAmount={destinationAmount}
-            />
-          )}
-
-          {!isSwap && (
-            <div className="TransactionDetails__row">
-              <div>{t("Sending to")} </div>
-              <div className="TransactionDetails__row__right">
-                <div className="TransactionDetails__identicon">
-                  <FedOrGAddress
-                    fedAddress={truncatedFedAddress(federationAddress)}
-                    gAddress={destination}
-                  />
-                </div>
+      {isLoading ? (
+        <div className="TransactionDetails__loader">
+          <Loader size="2rem" />
+        </div>
+      ) : (
+        <React.Fragment>
+          {submission.submitStatus === ActionStatus.PENDING && (
+            <div className="TransactionDetails__processing">
+              <div className="TransactionDetails__processing__header">
+                <Loader />{" "}
+                <span>
+                  {t("Processing")} {isSwap ? t("swap") : t("transaction")}
+                </span>
               </div>
-            </div>
-          )}
-          {showMemo && (
-            <div className="TransactionDetails__row">
-              <div>{t("Memo")}</div>
-              <div className="TransactionDetails__row__right">
-                {memo || t("None")}
+              <div className="TransactionDetails__processing__copy">
+                {t("Please don’t close this window")}
               </div>
             </div>
           )}
-
-          {(isPathPayment || isSwap) && (
-            <div className="TransactionDetails__row">
-              <div>{t("Conversion rate")} </div>
-              <div
-                className="TransactionDetails__row__right"
-                data-testid="TransactionDetailsConversionRate"
-              >
-                1 {sourceAsset.code} /{" "}
-                {getConversionRate(amount, destinationAmount).toFixed(2)}{" "}
-                {destAsset.code}
+          <SubviewHeader
+            title={renderPageTitle(
+              submission.submitStatus === ActionStatus.SUCCESS,
+            )}
+            customBackAction={goBack}
+            customBackIcon={
+              submission.submitStatus === ActionStatus.SUCCESS ? (
+                <Icon.Close />
+              ) : null
+            }
+          />
+          <View.Content>
+            {!(isPathPayment || isSwap) && (
+              <div className="TransactionDetails__cards">
+                <Card>
+                  <AccountAssets
+                    assetIcons={assetIcons}
+                    sortedBalances={[
+                      {
+                        token: {
+                          issuer: { key: sourceAsset.issuer },
+                          code: sourceAsset.code,
+                          type: "credit_alphanum4",
+                        },
+                        total: new BigNumber(amount),
+                      } as AssetBalance,
+                    ]}
+                  />
+                </Card>
               </div>
-            </div>
-          )}
-          <div className="TransactionDetails__row">
-            <div>{t("Transaction fee")} </div>
-            <div
-              className="TransactionDetails__row__right"
-              data-testid="TransactionDetailsTransactionFee"
-            >
-              {transactionFee} XLM
-            </div>
-          </div>
-          {transactionSimulation.response && (
-            <>
+            )}
+
+            {(isPathPayment || isSwap) && (
+              <TwoAssetCard
+                sourceAssetIcons={assetIcons}
+                sourceCanon={asset}
+                sourceAmount={amount}
+                destAssetIcons={destAssetIcons}
+                destCanon={destinationAsset || "native"}
+                destAmount={destinationAmount}
+                isSourceAssetSuspicious={isSourceAssetSuspicious}
+                isDestAssetSuspicious={isDestAssetSuspicious}
+              />
+            )}
+
+            {!isSwap && (
               <div className="TransactionDetails__row">
-                <div>{t("Resource cost")} </div>
+                <div>{t("Sending to")} </div>
                 <div className="TransactionDetails__row__right">
-                  <div className="TransactionDetails__row__right__item">
-                    {transactionSimulation.response.cost.cpuInsns} CPU
-                  </div>
-                  <div className="TransactionDetails__row__right__item">
-                    {transactionSimulation.response.cost.memBytes} Bytes
+                  <div className="TransactionDetails__identicon">
+                    <FedOrGAddress
+                      fedAddress={truncatedFedAddress(federationAddress)}
+                      gAddress={destination}
+                    />
                   </div>
                 </div>
               </div>
+            )}
+            {showMemo && (
               <div className="TransactionDetails__row">
-                <div>{t("Minimum resource fee")} </div>
+                <div>{t("Memo")}</div>
                 <div className="TransactionDetails__row__right">
-                  {transactionSimulation.response.minResourceFee} XLM
+                  {memo || t("None")}
                 </div>
               </div>
-            </>
-          )}
-          {isSwap && (
+            )}
+
+            {(isPathPayment || isSwap) && (
+              <div className="TransactionDetails__row">
+                <div>{t("Conversion rate")} </div>
+                <div
+                  className="TransactionDetails__row__right"
+                  data-testid="TransactionDetailsConversionRate"
+                >
+                  1 {sourceAsset.code} /{" "}
+                  {getConversionRate(amount, destinationAmount).toFixed(2)}{" "}
+                  {destAsset.code}
+                </div>
+              </div>
+            )}
             <div className="TransactionDetails__row">
-              <div>{t("Minimum Received")} </div>
+              <div>{t("Transaction fee")} </div>
               <div
                 className="TransactionDetails__row__right"
-                data-testid="TransactionDetailsMinimumReceived"
+                data-testid="TransactionDetailsTransactionFee"
               >
-                {computeDestMinWithSlippage(
-                  allowedSlippage,
-                  destinationAmount,
-                ).toFixed()}{" "}
-                {destAsset.code}
+                {transactionFee} XLM
               </div>
             </div>
-          )}
-          {submission.submitStatus === ActionStatus.IDLE && (
-            <FlaggedWarningMessage
-              isUnsafe={isUnsafe}
-              isMalicious={isMalicious}
-              isMemoRequired={isMemoRequired}
-            />
-          )}
-        </View.Content>
-        <View.Footer isInline>
-          {submission.submitStatus === ActionStatus.SUCCESS ? (
-            <StellarExpertButton />
-          ) : (
-            <>
-              <Button
-                size="md"
-                variant="secondary"
-                onClick={() => {
-                  navigateTo(ROUTES.account);
-                }}
-              >
-                {t("Cancel")}
-              </Button>
-              <Button
-                size="md"
-                variant="primary"
-                disabled={isSubmitDisabled}
-                onClick={handleSend}
-                isLoading={hwStatus === ShowOverlayStatus.IN_PROGRESS}
-                data-testid="transaction-details-btn-send"
-              >
-                {isSwap ? t("Swap") : t("Send")}
-              </Button>
-            </>
-          )}
-        </View.Footer>
-      </React.Fragment>
+            {transactionSimulation.response && (
+              <>
+                <div className="TransactionDetails__row">
+                  <div>{t("Resource cost")} </div>
+                  <div className="TransactionDetails__row__right">
+                    <div className="TransactionDetails__row__right__item">
+                      {transactionSimulation.response.cost.cpuInsns} CPU
+                    </div>
+                    <div className="TransactionDetails__row__right__item">
+                      {transactionSimulation.response.cost.memBytes} Bytes
+                    </div>
+                  </div>
+                </div>
+                <div className="TransactionDetails__row">
+                  <div>{t("Minimum resource fee")} </div>
+                  <div className="TransactionDetails__row__right">
+                    {transactionSimulation.response.minResourceFee} XLM
+                  </div>
+                </div>
+              </>
+            )}
+            {isSwap && (
+              <div className="TransactionDetails__row">
+                <div>{t("Minimum Received")} </div>
+                <div
+                  className="TransactionDetails__row__right"
+                  data-testid="TransactionDetailsMinimumReceived"
+                >
+                  {computeDestMinWithSlippage(
+                    allowedSlippage,
+                    destinationAmount,
+                  ).toFixed()}{" "}
+                  {destAsset.code}
+                </div>
+              </div>
+            )}
+            <div className="TransactionDetails__warnings">
+              {scanResult?.validation &&
+                "result_type" in scanResult.validation && (
+                  <BlockaidWarningModal
+                    header={`This transaction was flagged as ${scanResult.validation.result_type}`}
+                    description={[scanResult.validation.description]}
+                    isWarning={isBlockaidWarning(
+                      scanResult.validation.result_type,
+                    )}
+                    isAsset
+                  />
+                )}
+              {submission.submitStatus === ActionStatus.IDLE && (
+                <FlaggedWarningMessage
+                  isMemoRequired={isMemoRequired}
+                  blockaidData={
+                    (isSourceAssetSuspicious
+                      ? accountBalances.balances?.[asset].blockaidData
+                      : accountBalances.balances?.[destinationAsset]
+                          ?.blockaidData) || defaultBlockaidScanAssetResult
+                  }
+                  isSuspicious={
+                    isSourceAssetSuspicious || isDestAssetSuspicious
+                  }
+                />
+              )}
+            </div>
+          </View.Content>
+          <div className="TransactionDetails__bottom-wrapper__copy">
+            {(isPathPayment || isSwap) &&
+              submission.submitStatus !== ActionStatus.SUCCESS &&
+              t("The final amount is approximate and may change")}
+          </div>
+          <View.Footer isInline>
+            {submission.submitStatus === ActionStatus.SUCCESS ? (
+              <StellarExpertButton />
+            ) : (
+              <>
+                <Button
+                  size="md"
+                  variant="secondary"
+                  onClick={() => {
+                    dispatch(resetSimulation());
+                    navigateTo(ROUTES.account);
+                  }}
+                >
+                  {t("Cancel")}
+                </Button>
+                <Button
+                  size="md"
+                  variant={
+                    isSourceAssetSuspicious ||
+                    isDestAssetSuspicious ||
+                    (scanResult && isTxSuspicious(scanResult))
+                      ? "error"
+                      : "primary"
+                  }
+                  disabled={isSubmitDisabled}
+                  onClick={handleSend}
+                  isLoading={hwStatus === ShowOverlayStatus.IN_PROGRESS}
+                  data-testid="transaction-details-btn-send"
+                >
+                  {isSwap ? t("Swap") : t("Send")}
+                </Button>
+              </>
+            )}
+          </View.Footer>
+        </React.Fragment>
+      )}
     </>
   );
 };
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/styles.scss b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/styles.scss
index 7cfad0088..de9f50d09 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/styles.scss
+++ b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/styles.scss
@@ -3,6 +3,15 @@
   flex-direction: column;
   text-align: center;
 
+  &__loader {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
   &__cards {
     margin-bottom: 1.5rem;
     row-gap: 1rem;
@@ -113,6 +122,15 @@
       align-items: center;
       text-align: center;
       justify-content: center;
+      padding-top: 1rem;
+    }
+  }
+
+  &__warnings {
+    margin-top: 1.5rem;
+
+    .WarningMessage__infoBlock {
+      margin-bottom: 0.375rem;
     }
   }
 }
@@ -123,7 +141,7 @@
   border-radius: 0.5rem;
   border: 1px solid var(--color-gray-10);
   position: relative;
-  margin-bottom: 1.5rem;
+  margin: -1.5rem 0 1.5rem 0;
 
   &__row:first-child {
     border-bottom: 1px solid var(--color-gray-10);
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/index.tsx
index 02ec3a732..fcfc5c988 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/index.tsx
@@ -24,6 +24,7 @@ export const SendConfirm = ({ previous }: { previous: ROUTES }) => {
     if (isSendComplete) {
       return (
         <TransactionDetails
+          shouldScanTx={false}
           goBack={() => {
             dispatch(resetSubmission());
             navigateTo(ROUTES.accountHistory);
@@ -33,15 +34,30 @@ export const SendConfirm = ({ previous }: { previous: ROUTES }) => {
     }
     switch (submission.submitStatus) {
       case ActionStatus.IDLE:
-        return <TransactionDetails goBack={() => navigateTo(previous)} />;
+        return (
+          <TransactionDetails
+            shouldScanTx={true}
+            goBack={() => navigateTo(previous)}
+          />
+        );
       case ActionStatus.PENDING:
-        return <TransactionDetails goBack={() => navigateTo(previous)} />;
+        return (
+          <TransactionDetails
+            shouldScanTx={false}
+            goBack={() => navigateTo(previous)}
+          />
+        );
       case ActionStatus.SUCCESS:
         return <SubmitSuccess viewDetails={() => setIsSendComplete(true)} />;
       case ActionStatus.ERROR:
         return <SubmitFail />;
       default:
-        return <TransactionDetails goBack={() => navigateTo(previous)} />;
+        return (
+          <TransactionDetails
+            shouldScanTx={false}
+            goBack={() => navigateTo(previous)}
+          />
+        );
     }
   };
 
diff --git a/extension/src/popup/components/sendPayment/SendSettings/Settings/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/Settings/index.tsx
index 5c6b87cf5..1954f389e 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/Settings/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/Settings/index.tsx
@@ -1,15 +1,20 @@
-import React, { useEffect } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { Formik, Form, Field, FieldProps } from "formik";
-import { Icon, Textarea, Link, Button } from "@stellar/design-system";
+import { Icon, Textarea, Link, Button, Loader } from "@stellar/design-system";
 import { useTranslation } from "react-i18next";
-import { Asset } from "stellar-sdk";
+import { Asset, BASE_FEE } from "stellar-sdk";
+import BigNumber from "bignumber.js";
 
 import { navigateTo } from "popup/helpers/navigate";
 import { useNetworkFees } from "popup/helpers/useNetworkFees";
 import { useIsSwap } from "popup/helpers/useIsSwap";
 import { getNativeContractDetails } from "popup/helpers/searchAsset";
-import { isMuxedAccount, getAssetFromCanonical } from "helpers/stellar";
+import {
+  isMuxedAccount,
+  getAssetFromCanonical,
+  stroopToXlm,
+} from "helpers/stellar";
 import { ROUTES } from "popup/constants/routes";
 import { SubviewHeader } from "popup/components/SubviewHeader";
 import { FormRows } from "popup/basics/Forms";
@@ -23,12 +28,21 @@ import {
   transactionSubmissionSelector,
   saveIsToken,
 } from "popup/ducks/transactionSubmission";
-import { simulateTokenPayment, simulateSwap } from "popup/ducks/token-payment";
+import {
+  simulateTokenPayment,
+  simulateSwap,
+  tokenSimulationSelector,
+} from "popup/ducks/token-payment";
 
 import { InfoTooltip } from "popup/basics/InfoTooltip";
 import { publicKeySelector } from "popup/ducks/accountServices";
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
-import { parseTokenAmount, isContractId } from "popup/helpers/soroban";
+import {
+  parseTokenAmount,
+  isContractId,
+  formatTokenAmount,
+  CLASSIC_ASSET_DECIMALS,
+} from "popup/helpers/soroban";
 import { Balances, TokenBalance } from "@shared/api/types";
 import { AppDispatch } from "popup/App";
 
@@ -62,36 +76,15 @@ export const Settings = ({
   const isPathPayment = useSelector(isPathPaymentSelector);
   const publicKey = useSelector(publicKeySelector);
   const { accountBalances } = useSelector(transactionSubmissionSelector);
+  const { simulation } = useSelector(tokenSimulationSelector);
   const isSwap = useIsSwap();
   const { recommendedFee } = useNetworkFees();
+  const [isLoadingSimulation, setLoadingSimulation] = useState(true);
 
-  // use default transaction fee if unset
-  useEffect(() => {
-    if (!transactionFee) {
-      dispatch(saveTransactionFee(recommendedFee));
-    }
-  }, [dispatch, recommendedFee, transactionFee]);
-
-  const handleTxFeeNav = () =>
-    navigateTo(isSwap ? ROUTES.swapSettingsFee : ROUTES.sendPaymentSettingsFee);
-
-  const handleSlippageNav = () =>
-    navigateTo(
-      isSwap ? ROUTES.swapSettingsSlippage : ROUTES.sendPaymentSettingsSlippage,
-    );
-
-  const handleTimeoutNav = () =>
-    navigateTo(
-      isSwap ? ROUTES.swapSettingsTimeout : ROUTES.sendPaymentSettingsTimeout,
-    );
-
-  // dont show memo for regular sends to Muxed, or for swaps
-  const showMemo = !isSwap && !isMuxedAccount(destination);
-  const showSlippage = (isPathPayment || isSwap) && !isSoroswap;
   const isSendSacToContract =
     isContractId(destination) &&
     !isContractId(getAssetFromCanonical(asset).issuer);
-  const getSacContractAddress = () => {
+  const getSacContractAddress = useCallback(() => {
     if (asset === "native") {
       return getNativeContractDetails(networkDetails).contract;
     }
@@ -105,74 +98,152 @@ export const Settings = ({
     );
 
     return contractAddress;
-  };
+  }, [asset, networkDetails]);
 
-  async function goToReview() {
-    if (isSoroswap) {
-      const simulatedTx = await dispatch(
-        simulateSwap({
-          networkDetails,
-          publicKey,
-          amountIn: amount,
-          amountInDecimals: decimals || 0,
-          amountOut: destinationAmount,
-          amountOutDecimals: destinationDecimals || 0,
-          memo,
-          transactionFee,
-          path,
-        }),
+  useEffect(() => {
+    async function simulateTx() {
+      // use default transaction fee if unset
+      const baseFee = new BigNumber(
+        transactionFee || recommendedFee || stroopToXlm(BASE_FEE),
       );
 
-      if (simulateSwap.fulfilled.match(simulatedTx)) {
-        dispatch(saveSimulation(simulatedTx.payload));
-        navigateTo(next);
-      }
-      return;
-    }
-
-    if (isToken || isSendSacToContract) {
-      const assetAddress = isSendSacToContract
-        ? getSacContractAddress()
-        : asset.split(":")[1];
-      const balances =
-        accountBalances.balances || ({} as NonNullable<Balances>);
-      const assetBalance = balances[asset] as TokenBalance;
+      if (isSoroswap) {
+        const simulatedTx = await dispatch(
+          simulateSwap({
+            networkDetails,
+            publicKey,
+            amountIn: amount,
+            amountInDecimals: decimals || 0,
+            amountOut: destinationAmount,
+            amountOutDecimals: destinationDecimals || 0,
+            memo,
+            transactionFee,
+            path,
+          }),
+        );
 
-      if (!assetBalance) {
-        throw new Error("Asset Balance not available");
+        if (simulateSwap.fulfilled.match(simulatedTx)) {
+          dispatch(saveSimulation(simulatedTx.payload));
+          const minResourceFee = formatTokenAmount(
+            new BigNumber(
+              simulatedTx.payload.simulationTransaction.minResourceFee,
+            ),
+            CLASSIC_ASSET_DECIMALS,
+          );
+          dispatch(
+            saveTransactionFee(
+              baseFee.plus(new BigNumber(minResourceFee)).toString(),
+            ),
+          );
+        }
+        return;
       }
 
-      const parsedAmount = isSendSacToContract
-        ? parseTokenAmount(amount, 7)
-        : parseTokenAmount(amount, Number(assetBalance.decimals));
+      if (
+        (isToken || isSendSacToContract) &&
+        !simulation.simulationTransaction?.minResourceFee
+      ) {
+        const assetAddress = isSendSacToContract
+          ? getSacContractAddress()
+          : asset.split(":")[1];
+        const balances =
+          accountBalances.balances || ({} as NonNullable<Balances>);
+        const assetBalance = balances[asset] as TokenBalance;
+
+        if (!assetBalance) {
+          throw new Error("Asset Balance not available");
+        }
 
-      const params = {
-        publicKey,
-        destination,
-        amount: parsedAmount.toNumber(),
-      };
+        const parsedAmount = isSendSacToContract
+          ? parseTokenAmount(amount, CLASSIC_ASSET_DECIMALS)
+          : parseTokenAmount(amount, Number(assetBalance.decimals));
 
-      const simulation = await dispatch(
-        simulateTokenPayment({
-          address: assetAddress,
+        const params = {
           publicKey,
-          memo,
-          params,
-          networkDetails,
-          transactionFee,
-        }),
-      );
+          destination,
+          amount: parsedAmount.toNumber(),
+        };
+
+        const simResponse = await dispatch(
+          simulateTokenPayment({
+            address: assetAddress,
+            publicKey,
+            memo,
+            params,
+            networkDetails,
+            transactionFee,
+          }),
+        );
 
-      if (simulateTokenPayment.fulfilled.match(simulation)) {
-        dispatch(saveSimulation(simulation.payload));
-        dispatch(saveIsToken(true));
-        navigateTo(next);
+        if (
+          simulateTokenPayment.fulfilled.match(simResponse) &&
+          recommendedFee
+        ) {
+          const minResourceFee = formatTokenAmount(
+            new BigNumber(
+              simResponse.payload.simulationTransaction.minResourceFee,
+            ),
+            CLASSIC_ASSET_DECIMALS,
+          );
+          dispatch(saveSimulation(simResponse.payload));
+          dispatch(saveIsToken(true));
+          dispatch(
+            saveTransactionFee(
+              baseFee.plus(new BigNumber(minResourceFee)).toString(),
+            ),
+          );
+        }
+        return;
       }
-      return;
+
+      if (!transactionFee) {
+        dispatch(saveTransactionFee(baseFee.toString()));
+      }
+    }
+    async function setFee() {
+      setLoadingSimulation(true);
+      await simulateTx();
+      setLoadingSimulation(false);
     }
+    setFee();
+  }, [
+    dispatch,
+    recommendedFee,
+    transactionFee,
+    accountBalances.balances,
+    amount,
+    asset,
+    decimals,
+    destination,
+    destinationAmount,
+    destinationDecimals,
+    getSacContractAddress,
+    isSendSacToContract,
+    isSoroswap,
+    isToken,
+    memo,
+    networkDetails,
+    path,
+    publicKey,
+    simulation.simulationTransaction?.minResourceFee,
+  ]);
+
+  const handleTxFeeNav = () =>
+    navigateTo(isSwap ? ROUTES.swapSettingsFee : ROUTES.sendPaymentSettingsFee);
+
+  const handleSlippageNav = () =>
+    navigateTo(
+      isSwap ? ROUTES.swapSettingsSlippage : ROUTES.sendPaymentSettingsSlippage,
+    );
+
+  const handleTimeoutNav = () =>
+    navigateTo(
+      isSwap ? ROUTES.swapSettingsTimeout : ROUTES.sendPaymentSettingsTimeout,
+    );
 
-    navigateTo(next);
-  }
+  // dont show memo for regular sends to Muxed, or for swaps
+  const showMemo = !isSwap && !isMuxedAccount(destination);
+  const showSlippage = (isPathPayment || isSwap) && !isSoroswap;
 
   return (
     <React.Fragment>
@@ -180,17 +251,21 @@ export const Settings = ({
         title={`${isSwap ? t("Swap") : t("Send")} ${t("Settings")}`}
         customBackAction={() => navigateTo(previous)}
       />
-      <Formik
-        initialValues={{ memo }}
-        onSubmit={(values) => {
-          dispatch(saveMemo(values.memo));
-        }}
-      >
-        {({ submitForm }) => (
-          <Form className="View__contentAndFooterWrapper">
-            <View.Content>
-              <FormRows>
-                {!isToken ? (
+      {isLoadingSimulation ? (
+        <div className="SendSettings__loadingWrapper">
+          <Loader size="2rem" />
+        </div>
+      ) : (
+        <Formik
+          initialValues={{ memo }}
+          onSubmit={(values) => {
+            dispatch(saveMemo(values.memo));
+          }}
+        >
+          {({ submitForm }) => (
+            <Form className="View__contentAndFooterWrapper">
+              <View.Content>
+                <FormRows>
                   <div className="SendSettings__row">
                     <div className="SendSettings__row__left">
                       <InfoTooltip
@@ -235,64 +310,15 @@ export const Settings = ({
                       </div>
                     </div>
                   </div>
-                ) : null}
 
-                <div className="SendSettings__row">
-                  <div className="SendSettings__row__left">
-                    <InfoTooltip
-                      infoText={
-                        <span>
-                          {t(
-                            "Number of seconds that can pass before this transaction can no longer be accepted by the network",
-                          )}{" "}
-                        </span>
-                      }
-                      placement="bottom"
-                    >
-                      <span
-                        className="SendSettings__row__title SendSettings__clickable"
-                        onClick={() => {
-                          submitForm();
-                          handleTimeoutNav();
-                        }}
-                      >
-                        {t("Transaction timeout")}
-                      </span>
-                    </InfoTooltip>
-                  </div>
-                  <div
-                    className="SendSettings__row__right SendSettings__clickable"
-                    onClick={() => {
-                      submitForm();
-                      handleTimeoutNav();
-                    }}
-                  >
-                    <span data-testid="SendSettingsTransactionTimeout">
-                      {transactionTimeout}(s)
-                    </span>
-                    <div>
-                      <Icon.ChevronRight />
-                    </div>
-                  </div>
-                </div>
-
-                {showSlippage && (
                   <div className="SendSettings__row">
                     <div className="SendSettings__row__left">
                       <InfoTooltip
                         infoText={
                           <span>
                             {t(
-                              "Allowed downward variation in the destination amount",
+                              "Number of seconds that can pass before this transaction can no longer be accepted by the network",
                             )}{" "}
-                            <Link
-                              variant="secondary"
-                              href="https://www.freighter.app/faq"
-                              rel="noreferrer"
-                              target="_blank"
-                            >
-                              {t("Learn more")}
-                            </Link>
                           </span>
                         }
                         placement="bottom"
@@ -301,10 +327,10 @@ export const Settings = ({
                           className="SendSettings__row__title SendSettings__clickable"
                           onClick={() => {
                             submitForm();
-                            handleSlippageNav();
+                            handleTimeoutNav();
                           }}
                         >
-                          {t("Allowed slippage")}
+                          {t("Transaction timeout")}
                         </span>
                       </InfoTooltip>
                     </div>
@@ -312,29 +338,30 @@ export const Settings = ({
                       className="SendSettings__row__right SendSettings__clickable"
                       onClick={() => {
                         submitForm();
-                        handleSlippageNav();
+                        handleTimeoutNav();
                       }}
                     >
-                      <span data-testid="SendSettingsAllowedSlippage">
-                        {allowedSlippage}%
+                      <span data-testid="SendSettingsTransactionTimeout">
+                        {transactionTimeout}(s)
                       </span>
                       <div>
                         <Icon.ChevronRight />
                       </div>
                     </div>
                   </div>
-                )}
-                {showMemo && (
-                  <>
+
+                  {showSlippage && (
                     <div className="SendSettings__row">
                       <div className="SendSettings__row__left">
                         <InfoTooltip
                           infoText={
                             <span>
-                              {t("Include a custom memo to this transaction")}{" "}
+                              {t(
+                                "Allowed downward variation in the destination amount",
+                              )}{" "}
                               <Link
                                 variant="secondary"
-                                href="https://developers.stellar.org/docs/glossary/transactions/#memo"
+                                href="https://www.freighter.app/faq"
                                 rel="noreferrer"
                                 target="_blank"
                               >
@@ -344,45 +371,93 @@ export const Settings = ({
                           }
                           placement="bottom"
                         >
-                          <span className="SendSettings__row__title">
-                            {t("Memo")}
+                          <span
+                            className="SendSettings__row__title SendSettings__clickable"
+                            onClick={() => {
+                              submitForm();
+                              handleSlippageNav();
+                            }}
+                          >
+                            {t("Allowed slippage")}
                           </span>
                         </InfoTooltip>
                       </div>
-                      <div className="SendSettings__row__right">
-                        <span></span>
+                      <div
+                        className="SendSettings__row__right SendSettings__clickable"
+                        onClick={() => {
+                          submitForm();
+                          handleSlippageNav();
+                        }}
+                      >
+                        <span data-testid="SendSettingsAllowedSlippage">
+                          {allowedSlippage}%
+                        </span>
+                        <div>
+                          <Icon.ChevronRight />
+                        </div>
                       </div>
                     </div>
-                    <Field name="memo">
-                      {({ field }: FieldProps) => (
-                        <Textarea
-                          fieldSize="md"
-                          id="mnemonic-input"
-                          placeholder={t("Memo (optional)")}
-                          {...field}
-                        />
-                      )}
-                    </Field>
-                  </>
-                )}
-              </FormRows>
-            </View.Content>
-            <View.Footer>
-              <Button
-                disabled={!transactionFee}
-                size="md"
-                isFullWidth
-                onClick={goToReview}
-                type="submit"
-                variant="secondary"
-                data-testid="send-settings-btn-continue"
-              >
-                {t("Review")} {isSwap ? t("Swap") : t("Send")}
-              </Button>
-            </View.Footer>
-          </Form>
-        )}
-      </Formik>
+                  )}
+                  {showMemo && (
+                    <>
+                      <div className="SendSettings__row">
+                        <div className="SendSettings__row__left">
+                          <InfoTooltip
+                            infoText={
+                              <span>
+                                {t("Include a custom memo to this transaction")}{" "}
+                                <Link
+                                  variant="secondary"
+                                  href="https://developers.stellar.org/docs/glossary/transactions/#memo"
+                                  rel="noreferrer"
+                                  target="_blank"
+                                >
+                                  {t("Learn more")}
+                                </Link>
+                              </span>
+                            }
+                            placement="bottom"
+                          >
+                            <span className="SendSettings__row__title">
+                              {t("Memo")}
+                            </span>
+                          </InfoTooltip>
+                        </div>
+                        <div className="SendSettings__row__right">
+                          <span></span>
+                        </div>
+                      </div>
+                      <Field name="memo">
+                        {({ field }: FieldProps) => (
+                          <Textarea
+                            fieldSize="md"
+                            id="mnemonic-input"
+                            placeholder={t("Memo (optional)")}
+                            {...field}
+                          />
+                        )}
+                      </Field>
+                    </>
+                  )}
+                </FormRows>
+              </View.Content>
+              <View.Footer>
+                <Button
+                  disabled={!transactionFee}
+                  size="md"
+                  isFullWidth
+                  onClick={() => navigateTo(next)}
+                  type="submit"
+                  variant="secondary"
+                  data-testid="send-settings-btn-continue"
+                >
+                  {t("Review")} {isSwap ? t("Swap") : t("Send")}
+                </Button>
+              </View.Footer>
+            </Form>
+          )}
+        </Formik>
+      )}
     </React.Fragment>
   );
 };
diff --git a/extension/src/popup/components/sendPayment/styles.scss b/extension/src/popup/components/sendPayment/styles.scss
index 4115ad569..3e15cf6d8 100644
--- a/extension/src/popup/components/sendPayment/styles.scss
+++ b/extension/src/popup/components/sendPayment/styles.scss
@@ -235,6 +235,14 @@
   .FormRows {
     gap: 0.75rem;
   }
+
+  &__loadingWrapper {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 
 .SendConfirm {
diff --git a/extension/src/popup/components/signTransaction/Operations/index.tsx b/extension/src/popup/components/signTransaction/Operations/index.tsx
index 92e22336b..41c2f3ca5 100644
--- a/extension/src/popup/components/signTransaction/Operations/index.tsx
+++ b/extension/src/popup/components/signTransaction/Operations/index.tsx
@@ -28,32 +28,6 @@ import {
 } from "./KeyVal";
 import "./styles.scss";
 
-const UnsafeMaliciousWarning = ({
-  isDestUnsafe,
-  isDestMalicious,
-}: {
-  isDestUnsafe: boolean;
-  isDestMalicious: boolean;
-}) => {
-  const { t } = useTranslation();
-
-  return isDestUnsafe || isDestMalicious ? (
-    <KeyValueList
-      operationKey=""
-      operationValue={
-        <IconButton
-          label={`${isDestMalicious ? t("Malicious") : t("Unsafe")} ${t(
-            "account",
-          )}`}
-          altText="Error"
-          icon={<Icon.Info />}
-          variant="error"
-        />
-      }
-    />
-  ) : null;
-};
-
 const MemoRequiredWarning = ({
   isDestMemoRequired,
 }: {
@@ -86,18 +60,12 @@ const DestinationWarning = ({
   isMemoRequired: boolean;
 }) => {
   const flaggedTags = flaggedKeys[destination]?.tags || [];
-  const isDestMalicious = flaggedTags.includes(TRANSACTION_WARNING.malicious);
-  const isDestUnsafe = flaggedTags.includes(TRANSACTION_WARNING.unsafe);
   const isDestMemoRequired = flaggedTags.includes(
     TRANSACTION_WARNING.memoRequired,
   );
 
   return (
     <>
-      <UnsafeMaliciousWarning
-        isDestMalicious={isDestMalicious}
-        isDestUnsafe={isDestUnsafe}
-      />
       {isMemoRequired ? (
         <MemoRequiredWarning isDestMemoRequired={isDestMemoRequired} />
       ) : null}
diff --git a/extension/src/popup/constants/metricsNames.ts b/extension/src/popup/constants/metricsNames.ts
index 5de16f683..35469411e 100644
--- a/extension/src/popup/constants/metricsNames.ts
+++ b/extension/src/popup/constants/metricsNames.ts
@@ -128,8 +128,6 @@ export const METRIC_NAMES = {
 
   signTransaction: "sign transaction: confirmed",
   signTransactionMemoRequired: "sign transaction: memo required error",
-  signTransactionMalicious: "sign transaction: malicious account warning",
-  signTransactionUnsafe: "sign transaction: unsafe account warning",
   rejectTransaction: "sign transaction: rejected",
 
   signBlob: "sign blob: confirmed",
diff --git a/extension/src/popup/ducks/settings.ts b/extension/src/popup/ducks/settings.ts
index abe5cb809..54d0d40df 100644
--- a/extension/src/popup/ducks/settings.ts
+++ b/extension/src/popup/ducks/settings.ts
@@ -16,6 +16,7 @@ import {
   editCustomNetwork as editCustomNetworkService,
   addAssetsList as addAssetsListService,
   modifyAssetsList as modifyAssetsListService,
+  saveIsBlockaidAnnounced as saveIsBlockaidAnnouncedService,
 } from "@shared/api/internal";
 import {
   NETWORKS,
@@ -54,9 +55,8 @@ const settingsInitialState: Settings = {
   } as NetworkDetails,
   networksList: DEFAULT_NETWORKS,
   isMemoValidationEnabled: true,
-  isSafetyValidationEnabled: true,
-  isValidatingSafeAssetsEnabled: true,
   isNonSSLEnabled: false,
+  isBlockaidAnnounced: false,
   error: "",
 };
 
@@ -114,21 +114,13 @@ export const saveSettings = createAsyncThunk<
   {
     isDataSharingAllowed: boolean;
     isMemoValidationEnabled: boolean;
-    isSafetyValidationEnabled: boolean;
-    isValidatingSafeAssetsEnabled: boolean;
     isNonSSLEnabled: boolean;
   },
   { rejectValue: ErrorMessage }
 >(
   "settings/saveSettings",
   async (
-    {
-      isDataSharingAllowed,
-      isMemoValidationEnabled,
-      isSafetyValidationEnabled,
-      isValidatingSafeAssetsEnabled,
-      isNonSSLEnabled,
-    },
+    { isDataSharingAllowed, isMemoValidationEnabled, isNonSSLEnabled },
     thunkApi,
   ) => {
     let res = {
@@ -144,8 +136,6 @@ export const saveSettings = createAsyncThunk<
       res = await saveSettingsService({
         isDataSharingAllowed,
         isMemoValidationEnabled,
-        isSafetyValidationEnabled,
-        isValidatingSafeAssetsEnabled,
         isNonSSLEnabled,
       });
     } catch (e) {
@@ -284,6 +274,29 @@ export const modifyAssetsList = createAsyncThunk<
   },
 );
 
+export const saveIsBlockaidAnnounced = createAsyncThunk<
+  { isBlockaidAnnounced: boolean },
+  {
+    isBlockaidAnnounced: boolean;
+  },
+  { rejectValue: ErrorMessage }
+>(
+  "settings/saveIsBlockaidAnnounced",
+  async ({ isBlockaidAnnounced }, thunkApi) => {
+    const res = await saveIsBlockaidAnnouncedService({
+      isBlockaidAnnounced,
+    });
+
+    if (res.error) {
+      return thunkApi.rejectWithValue({
+        errorMessage: res.error || "Unable to save isBlockaidAnnounced",
+      });
+    }
+
+    return res;
+  },
+);
+
 const settingsSlice = createSlice({
   name: "settings",
   initialState,
@@ -316,9 +329,7 @@ const settingsSlice = createSlice({
         isDataSharingAllowed,
         networkDetails,
         isMemoValidationEnabled,
-        isSafetyValidationEnabled,
         networksList,
-        isValidatingSafeAssetsEnabled,
         isRpcHealthy,
         isSorobanPublicEnabled,
       } = action?.payload || {
@@ -329,8 +340,6 @@ const settingsSlice = createSlice({
         ...state,
         isDataSharingAllowed,
         isMemoValidationEnabled,
-        isSafetyValidationEnabled,
-        isValidatingSafeAssetsEnabled,
         networkDetails,
         networksList,
         isRpcHealthy,
@@ -378,8 +387,6 @@ const settingsSlice = createSlice({
           networkDetails,
           networksList,
           isMemoValidationEnabled,
-          isSafetyValidationEnabled,
-          isValidatingSafeAssetsEnabled,
           isExperimentalModeEnabled,
           isHashSigningEnabled,
           isSorobanPublicEnabled,
@@ -387,6 +394,7 @@ const settingsSlice = createSlice({
           userNotification,
           assetsLists,
           isNonSSLEnabled,
+          isBlockaidAnnounced,
         } = action?.payload || {
           ...initialState,
         };
@@ -398,8 +406,6 @@ const settingsSlice = createSlice({
           networkDetails,
           networksList,
           isMemoValidationEnabled,
-          isSafetyValidationEnabled,
-          isValidatingSafeAssetsEnabled,
           isExperimentalModeEnabled,
           isHashSigningEnabled,
           isSorobanPublicEnabled,
@@ -407,6 +413,7 @@ const settingsSlice = createSlice({
           userNotification,
           assetsLists,
           isNonSSLEnabled,
+          isBlockaidAnnounced,
           settingsState: SettingsState.SUCCESS,
         };
       },
@@ -551,6 +558,24 @@ const settingsSlice = createSlice({
         };
       },
     );
+    builder.addCase(
+      saveIsBlockaidAnnounced.fulfilled,
+      (
+        state,
+        action: PayloadAction<{
+          isBlockaidAnnounced: boolean;
+        }>,
+      ) => {
+        const { isBlockaidAnnounced } = action?.payload || {
+          isBlockaidAnnounced: initialState.isBlockaidAnnounced,
+        };
+
+        return {
+          ...state,
+          isBlockaidAnnounced,
+        };
+      },
+    );
   },
 });
 
@@ -597,12 +622,10 @@ export const settingsPreferencesSelector = createSelector(
   ({
     isDataSharingAllowed,
     isMemoValidationEnabled,
-    isSafetyValidationEnabled,
     isExperimentalModeEnabled,
   }) => ({
     isDataSharingAllowed,
     isMemoValidationEnabled,
-    isSafetyValidationEnabled,
     isExperimentalModeEnabled,
   }),
 );
diff --git a/extension/src/popup/ducks/token-payment.ts b/extension/src/popup/ducks/token-payment.ts
index 02ade0c9f..86b4259a9 100644
--- a/extension/src/popup/ducks/token-payment.ts
+++ b/extension/src/popup/ducks/token-payment.ts
@@ -1,7 +1,7 @@
 import { Address, SorobanRpc, XdrLargeInt } from "stellar-sdk";
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import { ActionStatus, ErrorMessage } from "@shared/api/types";
-import { INDEXER_URL } from "@shared/constants/mercury";
+import { simulateTokenTransfer } from "@shared/api/internal";
 import { NetworkDetails } from "@shared/constants/stellar";
 import { SorobanRpcNotSupportedError } from "@shared/constants/errors";
 import { transfer } from "@shared/helpers/soroban/token";
@@ -62,52 +62,41 @@ export const simulateTokenPayment = createAsyncThunk<
           new XdrLargeInt("i128", params.amount).toI128(), // amount
         ];
         const transaction = transfer(address, transferParams, memo, builder);
-        const simulationResponse = await server.simulateTransaction(
+        const simulationTransaction = await server.simulateTransaction(
           transaction,
         );
 
         const preparedTransaction = SorobanRpc.assembleTransaction(
           transaction,
-          simulationResponse,
+          simulationTransaction,
         )
           .build()
           .toXDR();
 
         return {
-          simulationResponse,
+          simulationTransaction,
           preparedTransaction,
         };
       }
-      const options = {
-        method: "POST",
-        headers: {
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          address,
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          pub_key: publicKey,
-          memo,
-          params,
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          network_url: networkDetails.sorobanRpcUrl,
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          network_passphrase: networkDetails.networkPassphrase,
-        }),
-      };
-      const res = await fetch(
-        `${INDEXER_URL}/simulate-token-transfer`,
-        options,
-      );
-      const response = await res.json();
+      const { ok, response } = await simulateTokenTransfer({
+        address,
+        publicKey,
+        memo,
+        params,
+        networkDetails,
+        transactionFee,
+      });
 
-      if (!res.ok) {
+      if (!ok) {
         return thunkApi.rejectWithValue({
           errorMessage: response.message,
         });
       }
-      return response;
+
+      return {
+        preparedTransaction: response.preparedTransaction,
+        simulationTransaction: response.simulationResponse,
+      };
     } catch (e) {
       const message = e instanceof Error ? e.message : JSON.stringify(e);
       return thunkApi.rejectWithValue({
diff --git a/extension/src/popup/ducks/transactionSubmission.ts b/extension/src/popup/ducks/transactionSubmission.ts
index 1fc1d7e39..9415640bf 100644
--- a/extension/src/popup/ducks/transactionSubmission.ts
+++ b/extension/src/popup/ducks/transactionSubmission.ts
@@ -16,8 +16,7 @@ import {
   getAccountBalancesStandalone as internalGetAccountBalancesStandalone,
   getAssetIcons as getAssetIconsService,
   getAssetDomains as getAssetDomainsService,
-  getBlockedDomains as internalGetBlockedDomains,
-  getBlockedAccounts as internalGetBlockedAccounts,
+  getMemoRequiredAccounts as internalGetMemoRequiredAccounts,
   removeTokenId as internalRemoveTokenId,
   submitFreighterTransaction as internalSubmitFreighterTransaction,
   submitFreighterSorobanTransaction as internalSubmitFreighterSorobanTransaction,
@@ -29,10 +28,9 @@ import {
   AssetDomains,
   Balances,
   ErrorMessage,
-  BlockedDomains,
   AccountType,
   ActionStatus,
-  BlockedAccount,
+  MemoRequiredAccount,
   BalanceToMigrate,
   SoroswapToken,
 } from "@shared/api/types";
@@ -41,7 +39,10 @@ import { NETWORKS, NetworkDetails } from "@shared/constants/stellar";
 import { ConfigurableWalletType } from "@shared/constants/hardwareWallet";
 import { isCustomNetwork } from "@shared/helpers/stellar";
 
-import { getCanonicalFromAsset } from "helpers/stellar";
+import {
+  getCanonicalFromAsset,
+  isMainnet as isMainnetHelper,
+} from "helpers/stellar";
 import { METRICS_DATA } from "constants/localStorageTypes";
 import { MetricsData, emitMetric } from "helpers/metrics";
 import { METRIC_NAMES } from "popup/constants/metricsNames";
@@ -359,10 +360,13 @@ export const getAccountBalances = createAsyncThunk<
   try {
     let balances;
 
+    const isMainnet = isMainnetHelper(networkDetails);
+
     if (isCustomNetwork(networkDetails)) {
       balances = await internalGetAccountBalancesStandalone({
         publicKey,
         networkDetails,
+        isMainnet,
       });
     } else {
       balances = await internalgetAccountIndexerBalances(
@@ -391,6 +395,7 @@ export const getDestinationBalances = createAsyncThunk<
       return await internalGetAccountBalancesStandalone({
         publicKey,
         networkDetails,
+        isMainnet: isMainnetHelper(networkDetails),
       });
     }
     return await internalgetAccountIndexerBalances(publicKey, networkDetails);
@@ -514,27 +519,14 @@ export const getBestSoroswapPath = createAsyncThunk<
   },
 );
 
-export const getBlockedDomains = createAsyncThunk<
-  BlockedDomains,
-  undefined,
-  { rejectValue: ErrorMessage }
->("getBlockedDomains", async (_, thunkApi) => {
-  try {
-    const resp = await internalGetBlockedDomains();
-    return resp.blockedDomains || [];
-  } catch (e) {
-    return thunkApi.rejectWithValue({ errorMessage: e as string });
-  }
-});
-
-export const getBlockedAccounts = createAsyncThunk<
-  BlockedAccount[],
+export const getMemoRequiredAccounts = createAsyncThunk<
+  MemoRequiredAccount[],
   undefined,
   { rejectValue: ErrorMessage }
 >("getBlockedAccounts", async (_, thunkApi) => {
   try {
-    const resp = await internalGetBlockedAccounts();
-    return resp.blockedAccounts || [];
+    const resp = await internalGetMemoRequiredAccounts();
+    return resp.memoRequiredAccounts || [];
   } catch (e) {
     return thunkApi.rejectWithValue({ errorMessage: e as string });
   }
@@ -602,10 +594,7 @@ interface InitialState {
     type: AssetSelectType;
     isSource: boolean;
   };
-  blockedDomains: {
-    domains: BlockedDomains;
-  };
-  blockedAccounts: BlockedAccount[];
+  memoRequiredAccounts: MemoRequiredAccount[];
 }
 
 export const initialState: InitialState = {
@@ -658,10 +647,7 @@ export const initialState: InitialState = {
     type: AssetSelectType.MANAGE,
     isSource: true,
   },
-  blockedDomains: {
-    domains: {},
-  },
-  blockedAccounts: [],
+  memoRequiredAccounts: [],
 };
 
 const transactionSubmissionSlice = createSlice({
@@ -876,11 +862,8 @@ const transactionSubmissionSlice = createSlice({
       state.transactionData.destinationDecimals =
         action.payload.amountOutDecimals;
     });
-    builder.addCase(getBlockedDomains.fulfilled, (state, action) => {
-      state.blockedDomains.domains = action.payload;
-    });
-    builder.addCase(getBlockedAccounts.fulfilled, (state, action) => {
-      state.blockedAccounts = action.payload;
+    builder.addCase(getMemoRequiredAccounts.fulfilled, (state, action) => {
+      state.memoRequiredAccounts = action.payload;
     });
   },
 });
diff --git a/extension/src/popup/helpers/account.ts b/extension/src/popup/helpers/account.ts
index a893cc565..c83a7347e 100644
--- a/extension/src/popup/helpers/account.ts
+++ b/extension/src/popup/helpers/account.ts
@@ -22,7 +22,7 @@ export const LP_IDENTIFIER = ":lp";
 export const sortBalances = (
   balances: Balances,
   sorobanBalances?: TokenBalances,
-) => {
+): AssetType[] => {
   const collection = [] as any[];
   const lpBalances = [] as any[];
   const _sorobanBalances = sorobanBalances || [];
@@ -95,8 +95,10 @@ export const sortOperationsByAsset = ({
         bal.token !== undefined && "code" in bal.token ? bal.token.code : "";
       assetOperationMap[getCanonicalFromAsset(code, issuer)] = [];
     }
-    if ("contractId" in bal) {
-      assetOperationMap[getCanonicalFromAsset(bal.symbol, bal.contractId)] = [];
+    if ("contractId" in bal && "symbol" in bal) {
+      assetOperationMap[
+        getCanonicalFromAsset(bal.symbol, bal.contractId || "")
+      ] = [];
     }
   });
 
diff --git a/extension/src/popup/helpers/blockaid.ts b/extension/src/popup/helpers/blockaid.ts
index 581bae49b..aa4aa5f67 100644
--- a/extension/src/popup/helpers/blockaid.ts
+++ b/extension/src/popup/helpers/blockaid.ts
@@ -1,29 +1,21 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import * as Sentry from "@sentry/browser";
+import { useSelector } from "react-redux";
 
 import { INDEXER_URL } from "@shared/constants/mercury";
 import { NetworkDetails } from "@shared/constants/stellar";
 import { isCustomNetwork } from "@shared/helpers/stellar";
+import {
+  BlockAidScanAssetResult,
+  BlockAidScanSiteResult,
+  BlockAidScanTxResult,
+  BlockAidBulkScanAssetResult,
+} from "@shared/api/types";
 import { isMainnet } from "helpers/stellar";
 import { emitMetric } from "helpers/metrics";
 import { METRIC_NAMES } from "popup/constants/metricsNames";
-
-interface BlockAidScanSiteResult {
-  status: "hit" | "miss";
-  url: string;
-  scan_start_time: Date;
-  scan_end_time: Date;
-  malicious_score: number; // 0-1
-  is_reachable: boolean;
-  is_web3_site: true;
-  is_malicious: boolean;
-  // ...
-}
-
-interface BlockAidScanTxResult {
-  simulation: object;
-  validation: object;
-}
+import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
+import { fetchJson } from "./fetch";
 
 export const useScanSite = () => {
   const [data, setData] = useState({} as BlockAidScanSiteResult);
@@ -68,7 +60,7 @@ export const useScanSite = () => {
 };
 
 export const useScanTx = () => {
-  const [data, setData] = useState({} as BlockAidScanTxResult);
+  const [data, setData] = useState(null as BlockAidScanTxResult | null);
   const [error, setError] = useState(null as string | null);
   const [isLoading, setLoading] = useState(true);
 
@@ -82,63 +74,175 @@ export const useScanTx = () => {
       if (isCustomNetwork(networkDetails)) {
         setError("Scanning transactions is not supported on custom networks");
         setLoading(false);
-        return;
+        return null;
       }
-      const res = await fetch(
+      const response = await fetchJson<{
+        data: BlockAidScanTxResult;
+        error: string | null;
+      }>(
         `${INDEXER_URL}/scan-tx?url=${encodeURIComponent(
           url,
-        )}&tx_xdr=${xdr}&network=${networkDetails.network}`,
+        )}&tx_xdr=${encodeURIComponent(xdr)}&network=${networkDetails.network}`,
       );
-      const response = (await res.json()) as {
-        data: BlockAidScanTxResult;
-        error: string | null;
-      };
 
-      if (!res.ok) {
-        setError(response.error || "Failed to scan transaction");
-      }
       setData(response.data);
       emitMetric(METRIC_NAMES.blockaidTxScan, { response: response.data });
       setLoading(false);
+      return response.data;
     } catch (err) {
       setError("Failed to scan transaction");
-      Sentry.captureException(err);
+      Sentry.captureException({
+        error: err,
+        xdr,
+        url,
+        networkDetails,
+      });
       setLoading(false);
     }
+    return null;
   };
 
   return {
     data,
     error,
     isLoading,
+    setLoading,
     scanTx,
   };
 };
 
+interface ScanAssetResponseSuccess {
+  data: BlockAidScanAssetResult;
+  error: null;
+}
+interface ScanAssetResponseError {
+  data: null;
+  error: string;
+}
+type ScanAssetResponse = ScanAssetResponseSuccess | ScanAssetResponseError;
+
+interface ScanAssetBulkResponseSuccess {
+  data: BlockAidBulkScanAssetResult;
+  error: null;
+}
+interface ScanAssetBulkResponseError {
+  data: null;
+  error: string;
+}
+type ScanAssetBulkResponse =
+  | ScanAssetBulkResponseSuccess
+  | ScanAssetBulkResponseError;
+
 export const scanAsset = async (
   address: string,
   networkDetails: NetworkDetails,
 ) => {
   try {
     if (!isMainnet(networkDetails)) {
-      console.error("Scanning assets is only supported on Mainnet");
-      return {};
+      /* Scanning assets is only supported on Mainnet */
+      return {} as BlockAidScanAssetResult;
     }
     const res = await fetch(`${INDEXER_URL}/scan-asset?address=${address}`);
-    const response = (await res.json()) as {
-      data: BlockAidScanTxResult;
-      error: string | null;
-    };
+    const response = (await res.json()) as ScanAssetResponse;
 
-    if (!res.ok) {
+    if (!res.ok || response.error) {
       Sentry.captureException(response.error || "Failed to scan asset");
     }
 
     emitMetric(METRIC_NAMES.blockaidAssetScan, { response: response.data });
+    if (!response.data) {
+      return {} as BlockAidScanAssetResult;
+    }
     return response.data;
   } catch (err) {
     console.error("Failed to scan asset");
     Sentry.captureException(err);
   }
-  return {};
+  return {} as BlockAidScanAssetResult;
+};
+
+export const useScanAsset = (address: string) => {
+  const networkDetails = useSelector(settingsNetworkDetailsSelector);
+  const [scannedAssetStatus, setScannedAssetStatus] = useState(
+    {} as BlockAidScanAssetResult,
+  );
+
+  useEffect(() => {
+    const fetchScanAssetStatus = async () => {
+      const scannedAsset = await scanAsset(address, networkDetails);
+      setScannedAssetStatus(scannedAsset);
+    };
+
+    if (address) {
+      fetchScanAssetStatus();
+    }
+  }, [networkDetails, address]);
+
+  return {
+    scannedAsset: scannedAssetStatus,
+  };
+};
+
+export const isAssetSuspicious = (blockaidData?: BlockAidScanAssetResult) => {
+  if (!blockaidData || !blockaidData.result_type) {
+    return false;
+  }
+  return blockaidData.result_type !== "Benign";
+};
+
+export const isTxSuspicious = (blockaidData: BlockAidScanTxResult) => {
+  const { simulation, validation } = blockaidData;
+
+  if (!blockaidData) {
+    return false;
+  }
+
+  if (simulation && "error" in simulation) {
+    return true;
+  }
+
+  if (
+    validation &&
+    "result_type" in validation &&
+    validation.result_type !== "Benign"
+  ) {
+    return true;
+  }
+
+  return false;
+};
+
+export const isBlockaidWarning = (resultType: string) =>
+  resultType === "Warning" || resultType === "Spam";
+
+export const scanAssetBulk = async (
+  addressList: string[],
+  networkDetails: NetworkDetails,
+) => {
+  try {
+    if (!isMainnet(networkDetails)) {
+      /* Scanning assets is only supported on Mainnet */
+      return {} as BlockAidBulkScanAssetResult;
+    }
+    const url = new URL(`${INDEXER_URL}/scan-asset-bulk`);
+    addressList.forEach((address) => {
+      url.searchParams.append("asset_ids", address);
+    });
+    const response = await fetch(url.href);
+    const resJson = (await response.json()) as ScanAssetBulkResponse;
+
+    if (!response.ok || resJson.error) {
+      Sentry.captureException(resJson.error || "Failed to bulk scan assets");
+    }
+
+    emitMetric(METRIC_NAMES.blockaidAssetScan, { response: resJson });
+    if (!resJson.data) {
+      return {} as BlockAidBulkScanAssetResult;
+    }
+    return resJson.data || {};
+  } catch (err) {
+    console.error("Failed to bulk scan asset");
+    Sentry.captureException(err);
+  }
+  return {} as BlockAidBulkScanAssetResult;
 };
diff --git a/extension/src/popup/helpers/checkForSuspiciousAsset.ts b/extension/src/popup/helpers/checkForSuspiciousAsset.ts
index f43a59949..6f6e3a39f 100644
--- a/extension/src/popup/helpers/checkForSuspiciousAsset.ts
+++ b/extension/src/popup/helpers/checkForSuspiciousAsset.ts
@@ -2,14 +2,12 @@ import { Horizon, StellarToml } from "stellar-sdk";
 import { Horizon as HorizonNext } from "stellar-sdk-next";
 import { NetworkDetails } from "@shared/constants/stellar";
 import { NewAssetFlags } from "popup/components/manageAssets/ManageAssetRows";
-import { getApiStellarExpertUrl } from "popup/helpers/account";
 
 export const checkForSuspiciousAsset = async ({
   code,
   issuer,
   domain,
   server,
-  networkDetails,
 }: {
   code: string;
   issuer: string;
@@ -28,40 +26,26 @@ export const checkForSuspiciousAsset = async ({
     console.error(e);
   }
 
-  // check if new asset
-  let isNewAsset = false;
-  try {
-    const resp = await fetch(
-      `${getApiStellarExpertUrl(
-        networkDetails,
-      )}/asset/${code}-${issuer}/rating`,
-    );
-    const json = await resp.json();
-    const age = json.rating?.age;
-    if (!age || age <= 3) {
-      isNewAsset = true;
-    }
-  } catch (e) {
-    console.error(e);
-  }
-
   // check domain
   let isInvalidDomain = false;
-  try {
-    const resp = await StellarToml.Resolver.resolve(domain);
-    let found = false;
-    (resp?.CURRENCIES || []).forEach(
-      (c: { code?: string; issuer?: string }) => {
-        if (c.code === code && c.issuer === issuer) {
-          found = true;
-        }
-      },
-    );
-    isInvalidDomain = !found;
-  } catch (e) {
-    console.error(e);
-    isInvalidDomain = true;
+
+  if (domain) {
+    try {
+      const resp = await StellarToml.Resolver.resolve(domain);
+      let found = false;
+      (resp?.CURRENCIES || []).forEach(
+        (c: { code?: string; issuer?: string }) => {
+          if (c.code === code && c.issuer === issuer) {
+            found = true;
+          }
+        },
+      );
+      isInvalidDomain = !found;
+    } catch (e) {
+      console.error(e);
+      isInvalidDomain = true;
+    }
   }
 
-  return { isRevocable, isNewAsset, isInvalidDomain };
+  return { isRevocable, isInvalidDomain };
 };
diff --git a/extension/src/popup/helpers/fetch.ts b/extension/src/popup/helpers/fetch.ts
new file mode 100644
index 000000000..b057eb5bd
--- /dev/null
+++ b/extension/src/popup/helpers/fetch.ts
@@ -0,0 +1,14 @@
+export const fetchJson = async <T>(url: string, options?: RequestInit) => {
+  const res = await fetch(url, options);
+  if (!res.ok) {
+    throw new Error(res.statusText);
+  }
+
+  if (!res.headers.get("content-type")?.includes("application/json")) {
+    const content = await res.text();
+    throw new Error(`Did not receive json error:${content}`);
+  }
+
+  const data = (await res.json()) as T;
+  return data;
+};
diff --git a/extension/src/popup/helpers/soroban.ts b/extension/src/popup/helpers/soroban.ts
index 70a98b150..3d6aaf415 100644
--- a/extension/src/popup/helpers/soroban.ts
+++ b/extension/src/popup/helpers/soroban.ts
@@ -111,6 +111,13 @@ export const parseTokenAmount = (value: string, decimals: number) => {
   return wholeValue.shiftedBy(decimals).plus(fractionValue);
 };
 
+export const addressToString = (address: xdr.ScAddress) => {
+  if (address.switch().name === "scAddressTypeAccount") {
+    return StrKey.encodeEd25519PublicKey(address.accountId().ed25519());
+  }
+  return StrKey.encodeContract(address.contractId());
+};
+
 export const getArgsForTokenInvocation = (
   fnName: string,
   args: xdr.ScVal[],
@@ -121,18 +128,12 @@ export const getArgsForTokenInvocation = (
 
   switch (fnName) {
     case SorobanTokenInterface.transfer:
-      from = StrKey.encodeEd25519PublicKey(
-        args[0].address().accountId().ed25519(),
-      );
-      to = StrKey.encodeEd25519PublicKey(
-        args[1].address().accountId().ed25519(),
-      );
+      from = addressToString(args[0].address());
+      to = addressToString(args[1].address());
       amount = scValToNative(args[2]);
       break;
     case SorobanTokenInterface.mint:
-      to = StrKey.encodeEd25519PublicKey(
-        args[0].address().accountId().ed25519(),
-      );
+      to = addressToString(args[0].address());
       amount = scValToNative(args[1]);
       break;
     default:
diff --git a/extension/src/popup/helpers/useIsOwnedScamAsset.ts b/extension/src/popup/helpers/useIsOwnedScamAsset.ts
deleted file mode 100644
index 17f27be55..000000000
--- a/extension/src/popup/helpers/useIsOwnedScamAsset.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useSelector } from "react-redux";
-import { getCanonicalFromAsset } from "helpers/stellar";
-import { transactionSubmissionSelector } from "popup/ducks/transactionSubmission";
-
-export const useIsOwnedScamAsset = (code: string, issuer: string) => {
-  const { assetDomains, blockedDomains } = useSelector(
-    transactionSubmissionSelector,
-  );
-
-  const canonicalAsset = getCanonicalFromAsset(code, issuer);
-  const assetDomain = assetDomains[canonicalAsset];
-  return !!blockedDomains.domains[assetDomain];
-};
diff --git a/extension/src/popup/locales/en/translation.json b/extension/src/popup/locales/en/translation.json
index a73471461..9967a05f8 100644
--- a/extension/src/popup/locales/en/translation.json
+++ b/extension/src/popup/locales/en/translation.json
@@ -1,12 +1,10 @@
 {
-  "{{srcAssetCode}} for {{destAssetCode}}": "{{srcAssetCode}} for {{destAssetCode}}",
   "* All Stellar accounts must maintain a minimum balance of lumens": "* All Stellar accounts must maintain a minimum balance of lumens.",
   "A destination account requires the use of the memo field which is not present in the transaction you’re about to sign": {
     " Freighter automatically disabled the option to sign this transaction": "A destination account requires the use of the memo field which is not present in the transaction you’re about to sign. Freighter automatically disabled the option to sign this transaction."
   },
   "A Stellar wallet for every website": "A Stellar wallet for every website",
   "About": "About",
-  "account": "account",
   "Account": "Account",
   "Account ID": "Account ID",
   "Account Migration": "Account Migration",
@@ -16,8 +14,8 @@
   "Add": "Add",
   "Add address": "Add address",
   "Add an asset": "Add an asset",
-  "Add anyway": "Add anyway",
   "Add asset": "Add asset",
+  "Add Asset trustline": "Add Asset trustline",
   "Add Asset Trustline": "Add Asset Trustline",
   "Add by address": "Add by address",
   "Add custom network": "Add custom network",
@@ -28,7 +26,7 @@
   "Add New Address": "Add New Address",
   "Add new list": "Add new list",
   "Address": "Address",
-  "Addresses are uppercase and begin with letters “G“ or “M“": "Addresses are uppercase and begin with letters “G“ or “M“.",
+  "Addresses are uppercase and begin with letters “G“, “M“, or “C“": "Addresses are uppercase and begin with letters “G“, “M“, or “C“.",
   "Advanced settings": "Advanced settings",
   "Advanced Settings": "Advanced Settings",
   "Advanced settings are not recommended for new or unexperienced users": {
@@ -51,8 +49,6 @@
   "Allowed slippage": "Allowed slippage",
   "Always check the domain of websites you’re using Freighter with": "Always check the domain of websites you’re using Freighter with",
   "Amount": "Amount",
-  "An account you’re interacting with is tagged as malicious on": "An account you’re interacting with is tagged as malicious on",
-  "An account you’re interacting with is tagged as unsafe on": "An account you’re interacting with is tagged as unsafe on",
   "An error occurred": "An error occurred",
   "Anonymous data sharing": "Anonymous data sharing",
   "Anyone who has access to this phrase has access to your account and to the funds in it, so save it in a safe and secure place": "Anyone who has access to this phrase has access to your account and to the funds in it, so save it in a safe and secure place.",
@@ -89,13 +85,11 @@
   "Balance ID": "Balance ID",
   "Before we start with migration, please read": "Before we start with migration, please read",
   "Before You Add This Asset": "Before You Add This Asset",
-  "Block malicious or unsafe addresses and domains": "Block malicious or unsafe addresses and domains",
-  "Block trustlines to malicious or fraudulent assets": "Block trustlines to malicious or fraudulent assets",
-  "Blocked asset": "Blocked asset",
   "Bump To": "Bump To",
   "Buy Amount": "Buy Amount",
   "Buying": "Buying",
   "by": "by",
+  "By default it will verify": "By default it will verify",
   "Can’t find the asset you’re looking for? Add it manually": "Can’t find the asset you’re looking for? Add it manually",
   "Cancel": "Cancel",
   "Check the destination account memo requirements and include it in the transaction": "Check the destination account memo requirements and include it in the transaction.",
@@ -119,6 +113,7 @@
   "Connect device to computer": "Connect device to computer",
   "Connect to domain without SSL certificate": "Connect to domain without SSL certificate",
   "CONNECTION ERROR": "CONNECTION ERROR",
+  "Connection Request": "Connection Request",
   "Continue": "Continue",
   "Contract Address": "Contract Address",
   "Contract ID": "Contract ID",
@@ -128,7 +123,6 @@
   "Copy address": "Copy address",
   "Create a new Stellar address": "Create a new Stellar address",
   "Create a password": "Create a password",
-  "Create Account": "Create Account",
   "Create Wallet": "Create Wallet",
   "Custom": "Custom",
   "data entries": "data entries",
@@ -145,14 +139,11 @@
   "Detecting": "Detecting",
   "Different source and destination assets": "Different source and destination assets",
   "digits after the decimal allowed": "digits after the decimal allowed",
-  "directory": "directory",
-  "disable": "disable",
   "Disabled": "Disabled",
   "Done": "Done",
   "Double check the domain name": {
     " If it is incorrect in any way, do not share your public key and contact the site administrator via a verified email or social media account to confirm that this domain is correct": "Double check the domain name. If it is incorrect in any way, do not share your public key and contact the site administrator via a verified email or social media account to confirm that this domain is correct."
   },
-  "enable": "enable",
   "Enable Blind Signing on Ledger": "Enable Blind Signing on Ledger",
   "Enable this list": "Enable this list",
   "Enabled": "Enabled",
@@ -184,11 +175,7 @@
   },
   "Fetch list information": "Fetch list information",
   "Finish": "Finish",
-  "For your safety, signing this transaction is disabled": "For your safety, signing this transaction is disabled",
   "For your security, we'll check if you got it right in the next step": "For your security, we'll check if you got it right in the next step.",
-  "Freighter automatically blocked this asset": {
-    " Projects related to this asset may be fraudulent even if the creators say otherwise": "Freighter automatically blocked this asset. Projects related to this asset may be fraudulent even if the creators say otherwise."
-  },
   "Freighter can’t recover your imported secret key using your recovery phrase": {
     " Storing your secret key is your responsibility": {
       " Freighter will never ask for your secret key outside of the extension": "Freighter can’t recover your imported secret key using your recovery phrase. Storing your secret key is your responsibility. Freighter will never ask for your secret key outside of the extension."
@@ -198,7 +185,9 @@
   "Freighter is a non-custodial wallet extension that enables you to sign Stellar transactions via your browser": {
     " It’s a safer alternative to copying and pasting private keys for use with web apps": "Freighter is a non-custodial wallet extension that enables you to sign Stellar transactions via your browser. It’s a safer alternative to copying and pasting private keys for use with web apps."
   },
+  "Freighter is adding a new layer of protection": "Freighter is adding a new layer of protection",
   "Freighter is set to": "Freighter is set to",
+  "Freighter now uses Blockaid to keep your accounts safer": "Freighter now uses Blockaid to keep your accounts safer.",
   "Freighter uses asset lists to check assets you interact with": {
     " You can define your own assets lists in Settings": "Freighter uses asset lists to check assets you interact with. You can define your own assets lists in Settings."
   },
@@ -243,9 +232,9 @@
   "Insufficient Balance": "Insufficient Balance",
   "Insufficient Fee": "Insufficient Fee",
   "INSUFFICIENT FUNDS FOR FEE": "INSUFFICIENT FUNDS FOR FEE",
+  "invalid destination address": "invalid destination address",
   "invalid federation address": "invalid federation address",
   "Invalid Format Asset": "Invalid Format Asset",
-  "invalid public key": "invalid public key",
   "INVALID STELLAR ADDRESS": "INVALID STELLAR ADDRESS",
   "Invocation Type": "Invocation Type",
   "is requesting approval to sign a message": "is requesting approval to sign a message",
@@ -279,7 +268,6 @@
   "Make sure it is a funded Stellar account and try again": "Make sure it is a funded Stellar account and try again.",
   "Make sure you have your 12 word backup phrase": "Make sure you have your 12 word backup phrase",
   "Make sure you have your current 12 words backup phrase before continuing": "Make sure you have your current 12 words backup phrase before continuing.",
-  "Malicious": "Malicious",
   "Manage Assets": "Manage Assets",
   "Manage connected apps": "Manage connected apps",
   "Manage network settings": "Manage network settings",
@@ -307,7 +295,6 @@
   "Min Price": "Min Price",
   "Minimum Received": "Minimum Received",
   "Minimum resource fee": "Minimum resource fee",
-  "Minted": "Minted",
   "Multiple assets": "Multiple assets",
   "Multiple assets have a similar code, please check the domain before adding": "Multiple assets have a similar code, please check the domain before adding.",
   "must be below": "must be below",
@@ -322,7 +309,6 @@
   "Nevermind, cancel": "Nevermind, cancel",
   "New account": "New account",
   "New asset": "New asset",
-  "New Asset": "New Asset",
   "New password": "New password",
   "Next": "Next",
   "no path found": "no path found",
@@ -332,7 +318,6 @@
   "Not funded": "Not funded",
   "Not migrated": "Not migrated",
   "Not on your lists": "Not on your lists",
-  "Not recommended asset": "Not recommended asset",
   "Now, let’s create a new mnemonic phrase": "Now, let’s create a new mnemonic phrase",
   "Number of seconds that can pass before this transaction can no longer be accepted by the network": "Number of seconds that can pass before this transaction can no longer be accepted by the network",
   "Offer ID": "Offer ID",
@@ -359,25 +344,19 @@
     " This can help you identify fraudulent assets": "Please double-check its information and characteristics. This can help you identify fraudulent assets."
   },
   "Please note the following message": "Please note the following message",
-  "Please proceed with caution": "Please proceed with caution.",
   "Please select a different network before removing it": "Please select a different network before removing it.",
   "Please select each word in the same order you have": "Please select each word in the same order you have",
   "powered by": "powered by",
+  "Powered by ": "Powered by ",
   "Pre Auth Transaction": "Pre Auth Transaction",
   "Predicate": "Predicate",
   "Preferences": "Preferences",
   "Price": "Price",
   "Privacy Policy": "Privacy Policy",
-  "Proceed with caution": {
-    " Blockaid is unable to provide a risk assesment for this domain at this time": "Proceed with caution. Blockaid is unable to provide a risk assesment for this domain at this time."
-  },
+  "Proceed with caution": "Proceed with caution",
   "Processing": "Processing",
-  "Projects related to this asset may be fraudulent even if the creators say otherwise": {
-    " ": "Projects related to this asset may be fraudulent even if the creators say otherwise. "
-  },
   "Read before importing your key": "Read before importing your key",
   "Ready to migrate": "Ready to migrate",
-  "Received": "Received",
   "RECEIVED": "RECEIVED",
   "RECENT": "RECENT",
   "Recipient Stellar address": "Recipient Stellar address",
@@ -422,9 +401,9 @@
   "SET MAX": "SET MAX",
   "Set recommended": "Set recommended",
   "Settings": "Settings",
-  "Settings > Preferences": "Settings > Preferences",
   "Show recovery phrase": "Show recovery phrase",
   "Sign": "Sign",
+  "Sign anyway": "Sign anyway",
   "Sign Transaction": "Sign Transaction",
   "Signed Payload": "Signed Payload",
   "Signer": "Signer",
@@ -451,18 +430,21 @@
   "Swap failed": "Swap failed",
   "swapped": "swapped",
   "Swapped": "Swapped",
-  "Swapped {{srcAssetCode}} for {{destAssetCode}}": "Swapped {{srcAssetCode}} for {{destAssetCode}}",
   "Switch to this network": "Switch to this network",
   "Terms of Service": "Terms of Service",
   "Terms of Use": "Terms of Use",
+  "The accounts you interact with": "The accounts you interact with",
   "The application is requesting a specific account": "The application is requesting a specific account",
   "The asset creator can revoke your access to this asset at anytime": "The asset creator can revoke your access to this asset at anytime",
+  "The assets you interact with": "The assets you interact with",
   "The destination account can receive a different asset, the received amount is defined by the available conversion rates": "The destination account can receive a different asset, the received amount is defined by the available conversion rates",
   "The destination account does not accept the asset you’re sending": "The destination account does not accept the asset you’re sending",
   "The destination account doesn’t exist": "The destination account doesn’t exist.",
   "The destination account must opt to accept this asset before receiving it": "The destination account must opt to accept this asset before receiving it.",
   "The destination account receives the same asset and amount sent": "The destination account receives the same asset and amount sent",
+  "The domains you interact with": "The domains you interact with",
   "The final amount is approximate and may change": "The final amount is approximate and may change",
+  "The operations and functions executed in transactions and smart contracts": "The operations and functions executed in transactions and smart contracts",
   "The requester expects you to sign this auth entry on": "The requester expects you to sign this auth entry on",
   "The requester expects you to sign this message on": "The requester expects you to sign this message on",
   "The transaction you’re trying to sign is on": "The transaction you’re trying to sign is on",
@@ -472,7 +454,6 @@
     }
   },
   "them noted to confirm you got them right": "them noted to confirm you got them right",
-  "this alert by going to": "this alert by going to",
   "This asset has a balance": "This asset has a balance",
   "This asset has buying liabilities": "This asset has buying liabilities",
   "This asset is not part of an asset list": {
@@ -483,9 +464,6 @@
     }
   },
   "This asset is part of the asset lists": "This asset is part of the asset lists",
-  "This asset was tagged as fraudulent by stellar": {
-    "expert, a reliable community-maintained directory": "This asset was tagged as fraudulent by stellar.expert, a reliable community-maintained directory."
-  },
   "This authorization uses the source account's credentials, so you are implicitly authorizing this when you sign the transaction": "This authorization uses the source account's credentials, so you are implicitly authorizing this when you sign the transaction.",
   "This can be used to sign arbitrary transaction hashes without having to decode them first": {
     " Ledger will not display the transaction details in the device display prior to signing so make sure you only interact with applications you know and trust": "This can be used to sign arbitrary transaction hashes without having to decode them first. Ledger will not display the transaction details in the device display prior to signing so make sure you only interact with applications you know and trust."
@@ -493,20 +471,21 @@
   "This invocation authorizes the following transfers, please review the invocation tree and confirm that you want to proceed": "This invocation authorizes the following transfers, please review the invocation tree and confirm that you want to proceed.",
   "This is a relatively new asset": "This is a relatively new asset.",
   "This new backup phrase will be used for your new accounts": "This new backup phrase will be used for your new accounts.",
+  "This site has been scanned and verified": "This site has been scanned and verified",
+  "This site was flagged as malicious": "This site was flagged as malicious",
   "This transaction could not be completed": "This transaction could not be completed.",
+  "This transaction was flagged by Blockaid for the following reasons": "This transaction was flagged by Blockaid for the following reasons",
   "To": "To",
   "To create a new account you need to send at least 1 XLM to it": "To create a new account you need to send at least 1 XLM to it.",
   "To create this account, fund it with a minimum of 1 XLM": "To create this account, fund it with a minimum of 1 XLM.",
   "Token List URL": "Token List URL",
   "Total Available": "Total Available",
   "Total Balance": "Total Balance",
-  "Trading or sending this asset is not recommended": {
-    " Projects related to this asset may be fraudulent even if the creators say otherwise": "Trading or sending this asset is not recommended. Projects related to this asset may be fraudulent even if the creators say otherwise."
-  },
   "transaction": "transaction",
   "Transaction": "Transaction",
   "Transaction failed": "Transaction failed",
   "Transaction fee": "Transaction fee",
+  "Transaction Request": "Transaction Request",
   "Transaction timeout": "Transaction timeout",
   "Transactions": "Transactions",
   "trustlines": "trustlines",
@@ -515,8 +494,8 @@
   "Unable to connect to": "Unable to connect to",
   "Unable to migrate": "Unable to migrate",
   "Unable to parse assets lists": "Unable to parse assets lists",
+  "Unable to scan site for malicious behavior": "Unable to scan site for malicious behavior",
   "Unable to search for assets": "Unable to search for assets",
-  "Unsafe": "Unsafe",
   "Unsupported signing method": "Unsupported signing method",
   "Unverified asset": "Unverified asset",
   "Use experimental API’s and connect to the Futurenet, a test network": {
@@ -545,7 +524,6 @@
   "You are interacting with data that may be using untested and changing schemas": {
     " Proceed at your own risk": "You are interacting with data that may be using untested and changing schemas. Proceed at your own risk."
   },
-  "You can": "You can",
   "You can choose to merge your current account into the new accounts after the migration, which will effectively destroy your current account": {
     " Merging is optional and will allow you to send your current account’s funding lumens to the new accounts": "You can choose to merge your current account into the new accounts after the migration, which will effectively destroy your current account. Merging is optional and will allow you to send your current account’s funding lumens to the new accounts."
   },
diff --git a/extension/src/popup/locales/pt/translation.json b/extension/src/popup/locales/pt/translation.json
index 706703bfb..898d7a2dc 100644
--- a/extension/src/popup/locales/pt/translation.json
+++ b/extension/src/popup/locales/pt/translation.json
@@ -1,12 +1,10 @@
 {
-  "{{srcAssetCode}} for {{destAssetCode}}": "{{srcAssetCode}} for {{destAssetCode}}",
   "* All Stellar accounts must maintain a minimum balance of lumens": "* All Stellar accounts must maintain a minimum balance of lumens.",
   "A destination account requires the use of the memo field which is not present in the transaction you’re about to sign": {
     " Freighter automatically disabled the option to sign this transaction": "A destination account requires the use of the memo field which is not present in the transaction you’re about to sign. Freighter automatically disabled the option to sign this transaction."
   },
   "A Stellar wallet for every website": "A Stellar wallet for every website",
   "About": "About",
-  "account": "account",
   "Account": "Account",
   "Account ID": "Account ID",
   "Account Migration": "Account Migration",
@@ -16,8 +14,8 @@
   "Add": "Add",
   "Add address": "Add address",
   "Add an asset": "Add an asset",
-  "Add anyway": "Add anyway",
   "Add asset": "Add asset",
+  "Add Asset trustline": "Add Asset trustline",
   "Add Asset Trustline": "Add Asset Trustline",
   "Add by address": "Add by address",
   "Add custom network": "Add custom network",
@@ -28,7 +26,7 @@
   "Add New Address": "Add New Address",
   "Add new list": "Add new list",
   "Address": "Address",
-  "Addresses are uppercase and begin with letters “G“ or “M“": "Addresses are uppercase and begin with letters “G“ or “M“.",
+  "Addresses are uppercase and begin with letters “G“, “M“, or “C“": "Addresses are uppercase and begin with letters “G“, “M“, or “C“.",
   "Advanced settings": "Advanced settings",
   "Advanced Settings": "Advanced Settings",
   "Advanced settings are not recommended for new or unexperienced users": {
@@ -51,8 +49,6 @@
   "Allowed slippage": "Allowed slippage",
   "Always check the domain of websites you’re using Freighter with": "Always check the domain of websites you’re using Freighter with",
   "Amount": "Amount",
-  "An account you’re interacting with is tagged as malicious on": "An account you’re interacting with is tagged as malicious on",
-  "An account you’re interacting with is tagged as unsafe on": "An account you’re interacting with is tagged as unsafe on",
   "An error occurred": "An error occurred",
   "Anonymous data sharing": "Anonymous data sharing",
   "Anyone who has access to this phrase has access to your account and to the funds in it, so save it in a safe and secure place": "Anyone who has access to this phrase has access to your account and to the funds in it, so save it in a safe and secure place.",
@@ -89,13 +85,11 @@
   "Balance ID": "Balance ID",
   "Before we start with migration, please read": "Before we start with migration, please read",
   "Before You Add This Asset": "Before You Add This Asset",
-  "Block malicious or unsafe addresses and domains": "Block malicious or unsafe addresses and domains",
-  "Block trustlines to malicious or fraudulent assets": "Block trustlines to malicious or fraudulent assets",
-  "Blocked asset": "Blocked asset",
   "Bump To": "Bump To",
   "Buy Amount": "Buy Amount",
   "Buying": "Buying",
   "by": "by",
+  "By default it will verify": "By default it will verify",
   "Can’t find the asset you’re looking for? Add it manually": "Can’t find the asset you’re looking for? Add it manually",
   "Cancel": "Cancel",
   "Check the destination account memo requirements and include it in the transaction": "Check the destination account memo requirements and include it in the transaction.",
@@ -119,6 +113,7 @@
   "Connect device to computer": "Connect device to computer",
   "Connect to domain without SSL certificate": "Connect to domain without SSL certificate",
   "CONNECTION ERROR": "CONNECTION ERROR",
+  "Connection Request": "Connection Request",
   "Continue": "Continue",
   "Contract Address": "Contract Address",
   "Contract ID": "Contract ID",
@@ -128,7 +123,6 @@
   "Copy address": "Copy address",
   "Create a new Stellar address": "Create a new Stellar address",
   "Create a password": "Create a password",
-  "Create Account": "Create Account",
   "Create Wallet": "Create Wallet",
   "Custom": "Custom",
   "data entries": "data entries",
@@ -145,14 +139,11 @@
   "Detecting": "Detecting",
   "Different source and destination assets": "Different source and destination assets",
   "digits after the decimal allowed": "digits after the decimal allowed",
-  "directory": "directory",
-  "disable": "disable",
   "Disabled": "Disabled",
   "Done": "Done",
   "Double check the domain name": {
     " If it is incorrect in any way, do not share your public key and contact the site administrator via a verified email or social media account to confirm that this domain is correct": "Double check the domain name. If it is incorrect in any way, do not share your public key and contact the site administrator via a verified email or social media account to confirm that this domain is correct."
   },
-  "enable": "enable",
   "Enable Blind Signing on Ledger": "Enable Blind Signing on Ledger",
   "Enable this list": "Enable this list",
   "Enabled": "Enabled",
@@ -184,11 +175,7 @@
   },
   "Fetch list information": "Fetch list information",
   "Finish": "Finish",
-  "For your safety, signing this transaction is disabled": "For your safety, signing this transaction is disabled",
   "For your security, we'll check if you got it right in the next step": "For your security, we'll check if you got it right in the next step.",
-  "Freighter automatically blocked this asset": {
-    " Projects related to this asset may be fraudulent even if the creators say otherwise": "Freighter automatically blocked this asset. Projects related to this asset may be fraudulent even if the creators say otherwise."
-  },
   "Freighter can’t recover your imported secret key using your recovery phrase": {
     " Storing your secret key is your responsibility": {
       " Freighter will never ask for your secret key outside of the extension": "Freighter can’t recover your imported secret key using your recovery phrase. Storing your secret key is your responsibility. Freighter will never ask for your secret key outside of the extension."
@@ -198,7 +185,9 @@
   "Freighter is a non-custodial wallet extension that enables you to sign Stellar transactions via your browser": {
     " It’s a safer alternative to copying and pasting private keys for use with web apps": "Freighter is a non-custodial wallet extension that enables you to sign Stellar transactions via your browser. It’s a safer alternative to copying and pasting private keys for use with web apps."
   },
+  "Freighter is adding a new layer of protection": "Freighter is adding a new layer of protection",
   "Freighter is set to": "Freighter is set to",
+  "Freighter now uses Blockaid to keep your accounts safer": "Freighter now uses Blockaid to keep your accounts safer.",
   "Freighter uses asset lists to check assets you interact with": {
     " You can define your own assets lists in Settings": "Freighter uses asset lists to check assets you interact with. You can define your own assets lists in Settings."
   },
@@ -243,9 +232,9 @@
   "Insufficient Balance": "Insufficient Balance",
   "Insufficient Fee": "Insufficient Fee",
   "INSUFFICIENT FUNDS FOR FEE": "INSUFFICIENT FUNDS FOR FEE",
+  "invalid destination address": "invalid destination address",
   "invalid federation address": "invalid federation address",
   "Invalid Format Asset": "Invalid Format Asset",
-  "invalid public key": "invalid public key",
   "INVALID STELLAR ADDRESS": "INVALID STELLAR ADDRESS",
   "Invocation Type": "Invocation Type",
   "is requesting approval to sign a message": "is requesting approval to sign a message",
@@ -279,7 +268,6 @@
   "Make sure it is a funded Stellar account and try again": "Make sure it is a funded Stellar account and try again.",
   "Make sure you have your 12 word backup phrase": "Make sure you have your 12 word backup phrase",
   "Make sure you have your current 12 words backup phrase before continuing": "Make sure you have your current 12 words backup phrase before continuing.",
-  "Malicious": "Malicious",
   "Manage Assets": "Manage Assets",
   "Manage connected apps": "Manage connected apps",
   "Manage network settings": "Manage network settings",
@@ -307,7 +295,6 @@
   "Min Price": "Min Price",
   "Minimum Received": "Minimum Received",
   "Minimum resource fee": "Minimum resource fee",
-  "Minted": "Minted",
   "Multiple assets": "Multiple assets",
   "Multiple assets have a similar code, please check the domain before adding": "Multiple assets have a similar code, please check the domain before adding.",
   "must be below": "must be below",
@@ -322,7 +309,6 @@
   "Nevermind, cancel": "Nevermind, cancel",
   "New account": "New account",
   "New asset": "New asset",
-  "New Asset": "New Asset",
   "New password": "New password",
   "Next": "Next",
   "no path found": "no path found",
@@ -332,7 +318,6 @@
   "Not funded": "Not funded",
   "Not migrated": "Not migrated",
   "Not on your lists": "Not on your lists",
-  "Not recommended asset": "Not recommended asset",
   "Now, let’s create a new mnemonic phrase": "Now, let’s create a new mnemonic phrase",
   "Number of seconds that can pass before this transaction can no longer be accepted by the network": "Number of seconds that can pass before this transaction can no longer be accepted by the network",
   "Offer ID": "Offer ID",
@@ -359,25 +344,19 @@
     " This can help you identify fraudulent assets": "Please double-check its information and characteristics. This can help you identify fraudulent assets."
   },
   "Please note the following message": "Please note the following message",
-  "Please proceed with caution": "Please proceed with caution.",
   "Please select a different network before removing it": "Please select a different network before removing it.",
   "Please select each word in the same order you have": "Please select each word in the same order you have",
   "powered by": "powered by",
+  "Powered by ": "Powered by ",
   "Pre Auth Transaction": "Pre Auth Transaction",
   "Predicate": "Predicate",
   "Preferences": "Preferences",
   "Price": "Price",
   "Privacy Policy": "Privacy Policy",
-  "Proceed with caution": {
-    " Blockaid is unable to provide a risk assesment for this domain at this time": "Proceed with caution. Blockaid is unable to provide a risk assesment for this domain at this time."
-  },
+  "Proceed with caution": "Proceed with caution",
   "Processing": "Processing",
-  "Projects related to this asset may be fraudulent even if the creators say otherwise": {
-    " ": "Projects related to this asset may be fraudulent even if the creators say otherwise. "
-  },
   "Read before importing your key": "Read before importing your key",
   "Ready to migrate": "Ready to migrate",
-  "Received": "Received",
   "RECEIVED": "RECEIVED",
   "RECENT": "RECENT",
   "Recipient Stellar address": "Recipient Stellar address",
@@ -422,9 +401,9 @@
   "SET MAX": "SET MAX",
   "Set recommended": "Set recommended",
   "Settings": "Settings",
-  "Settings > Preferences": "Settings > Preferences",
   "Show recovery phrase": "Show recovery phrase",
   "Sign": "Sign",
+  "Sign anyway": "Sign anyway",
   "Sign Transaction": "Sign Transaction",
   "Signed Payload": "Signed Payload",
   "Signer": "Signer",
@@ -451,18 +430,21 @@
   "Swap failed": "Swap failed",
   "swapped": "swapped",
   "Swapped": "Swapped",
-  "Swapped {{srcAssetCode}} for {{destAssetCode}}": "Swapped {{srcAssetCode}} for {{destAssetCode}}",
   "Switch to this network": "Switch to this network",
   "Terms of Service": "Terms of Service",
   "Terms of Use": "Terms of Use",
+  "The accounts you interact with": "The accounts you interact with",
   "The application is requesting a specific account": "The application is requesting a specific account",
   "The asset creator can revoke your access to this asset at anytime": "The asset creator can revoke your access to this asset at anytime",
+  "The assets you interact with": "The assets you interact with",
   "The destination account can receive a different asset, the received amount is defined by the available conversion rates": "The destination account can receive a different asset, the received amount is defined by the available conversion rates",
   "The destination account does not accept the asset you’re sending": "The destination account does not accept the asset you’re sending",
   "The destination account doesn’t exist": "The destination account doesn’t exist.",
   "The destination account must opt to accept this asset before receiving it": "The destination account must opt to accept this asset before receiving it.",
   "The destination account receives the same asset and amount sent": "The destination account receives the same asset and amount sent",
+  "The domains you interact with": "The domains you interact with",
   "The final amount is approximate and may change": "The final amount is approximate and may change",
+  "The operations and functions executed in transactions and smart contracts": "The operations and functions executed in transactions and smart contracts",
   "The requester expects you to sign this auth entry on": "The requester expects you to sign this auth entry on",
   "The requester expects you to sign this message on": "The requester expects you to sign this message on",
   "The transaction you’re trying to sign is on": "The transaction you’re trying to sign is on",
@@ -472,7 +454,6 @@
     }
   },
   "them noted to confirm you got them right": "them noted to confirm you got them right",
-  "this alert by going to": "this alert by going to",
   "This asset has a balance": "This asset has a balance",
   "This asset has buying liabilities": "This asset has buying liabilities",
   "This asset is not part of an asset list": {
@@ -483,9 +464,6 @@
     }
   },
   "This asset is part of the asset lists": "This asset is part of the asset lists",
-  "This asset was tagged as fraudulent by stellar": {
-    "expert, a reliable community-maintained directory": "This asset was tagged as fraudulent by stellar.expert, a reliable community-maintained directory."
-  },
   "This authorization uses the source account's credentials, so you are implicitly authorizing this when you sign the transaction": "This authorization uses the source account's credentials, so you are implicitly authorizing this when you sign the transaction.",
   "This can be used to sign arbitrary transaction hashes without having to decode them first": {
     " Ledger will not display the transaction details in the device display prior to signing so make sure you only interact with applications you know and trust": "This can be used to sign arbitrary transaction hashes without having to decode them first. Ledger will not display the transaction details in the device display prior to signing so make sure you only interact with applications you know and trust."
@@ -493,20 +471,21 @@
   "This invocation authorizes the following transfers, please review the invocation tree and confirm that you want to proceed": "This invocation authorizes the following transfers, please review the invocation tree and confirm that you want to proceed.",
   "This is a relatively new asset": "This is a relatively new asset.",
   "This new backup phrase will be used for your new accounts": "This new backup phrase will be used for your new accounts.",
+  "This site has been scanned and verified": "This site has been scanned and verified",
+  "This site was flagged as malicious": "This site was flagged as malicious",
   "This transaction could not be completed": "This transaction could not be completed.",
+  "This transaction was flagged by Blockaid for the following reasons": "This transaction was flagged by Blockaid for the following reasons",
   "To": "To",
   "To create a new account you need to send at least 1 XLM to it": "To create a new account you need to send at least 1 XLM to it.",
   "To create this account, fund it with a minimum of 1 XLM": "To create this account, fund it with a minimum of 1 XLM.",
   "Token List URL": "Token List URL",
   "Total Available": "Total Available",
   "Total Balance": "Total Balance",
-  "Trading or sending this asset is not recommended": {
-    " Projects related to this asset may be fraudulent even if the creators say otherwise": "Trading or sending this asset is not recommended. Projects related to this asset may be fraudulent even if the creators say otherwise."
-  },
   "transaction": "transaction",
   "Transaction": "Transaction",
   "Transaction failed": "Transaction failed",
   "Transaction fee": "Transaction fee",
+  "Transaction Request": "Transaction Request",
   "Transaction timeout": "Transaction timeout",
   "Transactions": "Transactions",
   "trustlines": "trustlines",
@@ -515,8 +494,8 @@
   "Unable to connect to": "Unable to connect to",
   "Unable to migrate": "Unable to migrate",
   "Unable to parse assets lists": "Unable to parse assets lists",
+  "Unable to scan site for malicious behavior": "Unable to scan site for malicious behavior",
   "Unable to search for assets": "Unable to search for assets",
-  "Unsafe": "Unsafe",
   "Unsupported signing method": "Unsupported signing method",
   "Unverified asset": "Unverified asset",
   "Use experimental API’s and connect to the Futurenet, a test network": {
@@ -545,7 +524,6 @@
   "You are interacting with data that may be using untested and changing schemas": {
     " Proceed at your own risk": "You are interacting with data that may be using untested and changing schemas. Proceed at your own risk."
   },
-  "You can": "You can",
   "You can choose to merge your current account into the new accounts after the migration, which will effectively destroy your current account": {
     " Merging is optional and will allow you to send your current account’s funding lumens to the new accounts": "You can choose to merge your current account into the new accounts after the migration, which will effectively destroy your current account. Merging is optional and will allow you to send your current account’s funding lumens to the new accounts."
   },
diff --git a/extension/src/popup/views/Account/index.tsx b/extension/src/popup/views/Account/index.tsx
index 7d929a870..042d5f644 100644
--- a/extension/src/popup/views/Account/index.tsx
+++ b/extension/src/popup/views/Account/index.tsx
@@ -36,7 +36,6 @@ import {
   resetAccountBalanceStatus,
   saveAssetSelectType,
   AssetSelectType,
-  getBlockedDomains,
   getAccountBalances,
   getSoroswapTokens,
 } from "popup/ducks/transactionSubmission";
@@ -54,6 +53,7 @@ import { AccountHeader } from "popup/components/account/AccountHeader";
 import { AssetDetail } from "popup/components/account/AssetDetail";
 import { Loading } from "popup/components/Loading";
 import { NotFundedMessage } from "popup/components/account/NotFundedMessage";
+// import { BlockaidAnnouncement } from "popup/components/account/BlockaidAnnouncement";
 
 import "popup/metrics/authServices";
 
@@ -99,7 +99,6 @@ export const Account = () => {
         networkDetails,
       }),
     );
-    dispatch(getBlockedDomains());
 
     return () => {
       dispatch(resetAccountBalanceStatus());
@@ -180,6 +179,7 @@ export const Account = () => {
             publicKey={publicKey}
             setLoading={setLoading}
           />
+          {/* <BlockaidAnnouncement /> */}
           <View.Content
             hasNoTopPadding
             contentFooter={
diff --git a/extension/src/popup/views/Account/styles.scss b/extension/src/popup/views/Account/styles.scss
index 7572116f0..b60e552cc 100644
--- a/extension/src/popup/views/Account/styles.scss
+++ b/extension/src/popup/views/Account/styles.scss
@@ -73,7 +73,7 @@
   &__assets-button {
     display: flex;
     justify-content: center;
-    margin-bottom: 1.5rem;
+    margin-top: 1.5rem;
   }
 
   &__fetch-fail {
diff --git a/extension/src/popup/views/GrantAccess/index.tsx b/extension/src/popup/views/GrantAccess/index.tsx
index b7ef68486..494190cb1 100644
--- a/extension/src/popup/views/GrantAccess/index.tsx
+++ b/extension/src/popup/views/GrantAccess/index.tsx
@@ -8,7 +8,7 @@ import { getUrlHostname, parsedSearchParam } from "helpers/urls";
 import { rejectAccess, grantAccess } from "popup/ducks/access";
 import { publicKeySelector } from "popup/ducks/accountServices";
 import { ButtonsContainer, ModalWrapper } from "popup/basics/Modal";
-import { ModalInfo } from "popup/components/ModalInfo";
+import { DomainScanModalInfo } from "popup/components/ModalInfo";
 import { KeyIdenticon } from "popup/components/identicons/KeyIdenticon";
 import { settingsNetworkDetailsSelector } from "popup/ducks/settings";
 import { useScanSite } from "popup/helpers/blockaid";
@@ -48,6 +48,9 @@ export const GrantAccess = () => {
     window.close();
   };
 
+  const isMalicious =
+    data && "is_malicious" in data ? data.is_malicious : false;
+
   return (
     <>
       <ModalWrapper>
@@ -56,20 +59,24 @@ export const GrantAccess = () => {
             <Loader size="5rem" />
           </div>
         ) : (
-          <ModalInfo
+          <DomainScanModalInfo
             domain={domain}
-            variant={data?.is_malicious ? "malicious" : "default"}
+            isMalicious={isMalicious}
+            scanStatus={data.status}
             subject={t(
               `Allow ${domain} to view your wallet address, balance, activity and request approval for transactions`,
             )}
           >
-            <div className="GrantAccess__SigningWith">
+            <div
+              className="GrantAccess__SigningWith"
+              data-testid="grant-access-view"
+            >
               <h5>Connecting with</h5>
               <div className="GrantAccess__PublicKey">
                 <KeyIdenticon publicKey={publicKey} />
               </div>
             </div>
-            {data?.is_malicious ? (
+            {isMalicious ? (
               <ButtonsContainer>
                 <Button
                   size="md"
@@ -83,10 +90,10 @@ export const GrantAccess = () => {
                 <Button
                   size="md"
                   isFullWidth
-                  variant="destructive"
+                  variant="tertiary"
                   onClick={rejectAndClose}
                 >
-                  {t("Cancel")}
+                  {t("Reject")}
                 </Button>
               </ButtonsContainer>
             ) : (
@@ -110,7 +117,7 @@ export const GrantAccess = () => {
                 </Button>
               </ButtonsContainer>
             )}
-          </ModalInfo>
+          </DomainScanModalInfo>
         )}
       </ModalWrapper>
     </>
diff --git a/extension/src/popup/views/GrantAccess/styles.scss b/extension/src/popup/views/GrantAccess/styles.scss
index 901d2a829..44b95009d 100644
--- a/extension/src/popup/views/GrantAccess/styles.scss
+++ b/extension/src/popup/views/GrantAccess/styles.scss
@@ -2,6 +2,7 @@
   &__SigningWith {
     display: flex;
     flex-direction: column;
+    min-width: 300px;
   }
 
   &__PublicKey {
diff --git a/extension/src/popup/views/IntegrationTest.tsx b/extension/src/popup/views/IntegrationTest.tsx
index 6f539d660..6b13c21db 100644
--- a/extension/src/popup/views/IntegrationTest.tsx
+++ b/extension/src/popup/views/IntegrationTest.tsx
@@ -35,7 +35,6 @@ import {
   addCustomNetwork,
   removeCustomNetwork,
   editCustomNetwork,
-  getBlockedDomains,
 } from "@shared/api/internal";
 import {
   requestPublicKey,
@@ -297,8 +296,6 @@ export const IntegrationTest = () => {
       res = await saveSettings({
         isDataSharingAllowed: true,
         isMemoValidationEnabled: true,
-        isSafetyValidationEnabled: true,
-        isValidatingSafeAssetsEnabled: true,
         isNonSSLEnabled: true,
       });
       runAsserts("saveSettings", () => {
@@ -307,8 +304,6 @@ export const IntegrationTest = () => {
         assertEq(res.error, undefined);
         assertEq(res.isDataSharingAllowed, true);
         assertEq(res.isMemoValidationEnabled, true);
-        assertEq(res.isSafetyValidationEnabled, true);
-        assertEq(res.isValidatingSafeAssetsEnabled, true);
         assertEq(res.isNonSSLEnabled, true);
       });
 
@@ -362,11 +357,6 @@ export const IntegrationTest = () => {
         assertEq(res.networksList.length, networksListLength - 1);
       });
 
-      res = await getBlockedDomains();
-      runAsserts("getBlockedDomains", () => {
-        assertEq(Object.keys(res.blockedDomains as object).length > 0, true);
-      });
-
       await changeNetwork(NETWORK_NAMES.PUBNET);
       res = await requestPublicKey();
       runAsserts("requestPublicKey", () => {
diff --git a/extension/src/popup/views/Preferences/index.tsx b/extension/src/popup/views/Preferences/index.tsx
index a7c4e790f..ae5a84e1f 100644
--- a/extension/src/popup/views/Preferences/index.tsx
+++ b/extension/src/popup/views/Preferences/index.tsx
@@ -15,36 +15,25 @@ import "./styles.scss";
 export const Preferences = () => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
-  const {
-    isDataSharingAllowed,
-    isMemoValidationEnabled,
-    isSafetyValidationEnabled,
-    isValidatingSafeAssetsEnabled,
-    isNonSSLEnabled,
-  } = useSelector(settingsSelector);
+  const { isDataSharingAllowed, isMemoValidationEnabled, isNonSSLEnabled } =
+    useSelector(settingsSelector);
 
   interface SettingValues {
     isValidatingMemoValue: boolean;
-    isValidatingSafetyValue: boolean;
     isDataSharingAllowedValue: boolean;
-    isValidatingSafeAssetsValue: boolean;
     isNonSSLEnabledValue: boolean;
   }
 
   const initialValues: SettingValues = {
     isValidatingMemoValue: isMemoValidationEnabled,
-    isValidatingSafetyValue: isSafetyValidationEnabled,
     isDataSharingAllowedValue: isDataSharingAllowed,
-    isValidatingSafeAssetsValue: isValidatingSafeAssetsEnabled,
     isNonSSLEnabledValue: isNonSSLEnabled,
   };
 
   const handleSubmit = async (formValue: SettingValues) => {
     const {
       isValidatingMemoValue,
-      isValidatingSafetyValue,
       isDataSharingAllowedValue,
-      isValidatingSafeAssetsValue,
       isNonSSLEnabledValue,
     } = formValue;
 
@@ -52,9 +41,7 @@ export const Preferences = () => {
     await dispatch(
       saveSettings({
         isMemoValidationEnabled: isValidatingMemoValue,
-        isSafetyValidationEnabled: isValidatingSafetyValue,
         isDataSharingAllowed: isDataSharingAllowedValue,
-        isValidatingSafeAssetsEnabled: isValidatingSafeAssetsValue,
         isNonSSLEnabled: isNonSSLEnabledValue,
       }),
     );
@@ -89,33 +76,6 @@ export const Preferences = () => {
                     id="isValidatingMemoValue"
                   />
                 </div>
-                <div className="Preferences--toggle">
-                  <label
-                    htmlFor="isValidatingSafetyValue"
-                    className="Preferences--label"
-                  >
-                    {t("Block malicious or unsafe addresses and domains")}
-                  </label>
-                  <Toggle
-                    checked={initialValues.isValidatingSafetyValue}
-                    customInput={<Field />}
-                    id="isValidatingSafetyValue"
-                  />
-                </div>
-
-                <div className="Preferences--toggle">
-                  <label
-                    htmlFor="isValidatingSafeAssetsValue"
-                    className="Preferences--label"
-                  >
-                    {t("Block trustlines to malicious or fraudulent assets")}
-                  </label>
-                  <Toggle
-                    checked={initialValues.isValidatingSafeAssetsValue}
-                    customInput={<Field />}
-                    id="isValidatingSafeAssetsValue"
-                  />
-                </div>
               </div>
 
               <div className="Preferences--section">
diff --git a/extension/src/popup/views/SignTransaction/index.tsx b/extension/src/popup/views/SignTransaction/index.tsx
index 9402abea1..88f629ff5 100644
--- a/extension/src/popup/views/SignTransaction/index.tsx
+++ b/extension/src/popup/views/SignTransaction/index.tsx
@@ -51,8 +51,9 @@ import {
   WarningMessageVariant,
   WarningMessage,
   FirstTimeWarningMessage,
-  FlaggedWarningMessage,
+  MemoWarningMessage,
   SSLWarningMessage,
+  BlockaidTxScanLabel,
 } from "popup/components/WarningMessages";
 import { HardwareSign } from "popup/components/hardwareConnect/HardwareSign";
 import { KeyIdenticon } from "popup/components/identicons/KeyIdenticon";
@@ -82,7 +83,11 @@ export const SignTransaction = () => {
   const isNonSSLEnabled = useSelector(isNonSSLEnabledSelector);
   const networkDetails = useSelector(settingsNetworkDetailsSelector);
   const { networkName, networkPassphrase } = networkDetails;
-  const { scanTx } = useScanTx();
+  const { scanTx, isLoading: isLoadingScan, data: scanResult } = useScanTx();
+  const flaggedMalicious =
+    scanResult?.validation &&
+    "result_type" in scanResult.validation &&
+    scanResult.validation.result_type === "Malicious";
 
   const tx = getTransactionInfo(location.search);
   const { url } = parsedSearchParam(location.search);
@@ -140,12 +145,6 @@ export const SignTransaction = () => {
   );
 
   const flaggedKeyValues = Object.values(flaggedKeys);
-  const isUnsafe = flaggedKeyValues.some(({ tags }) =>
-    tags.includes(TRANSACTION_WARNING.unsafe),
-  );
-  const isMalicious = flaggedKeyValues.some(({ tags }) =>
-    tags.includes(TRANSACTION_WARNING.malicious),
-  );
   const isMemoRequired = flaggedKeyValues.some(
     ({ tags }) => tags.includes(TRANSACTION_WARNING.memoRequired) && !memo,
   );
@@ -189,13 +188,7 @@ export const SignTransaction = () => {
     if (isMemoRequired) {
       emitMetric(METRIC_NAMES.signTransactionMemoRequired);
     }
-    if (isUnsafe) {
-      emitMetric(METRIC_NAMES.signTransactionUnsafe);
-    }
-    if (isMalicious) {
-      emitMetric(METRIC_NAMES.signTransactionMalicious);
-    }
-  }, [isMemoRequired, isMalicious, isUnsafe]);
+  }, [isMemoRequired]);
 
   useEffect(() => {
     if (currentAccount.publicKey) {
@@ -211,7 +204,7 @@ export const SignTransaction = () => {
     };
   }, [currentAccount.publicKey, dispatch, networkDetails]);
 
-  const isSubmitDisabled = isMemoRequired || isMalicious;
+  const isSubmitDisabled = isMemoRequired;
 
   if (_networkPassphrase !== networkPassphrase) {
     return (
@@ -238,7 +231,7 @@ export const SignTransaction = () => {
     accountBalanceStatus !== ActionStatus.PENDING &&
     accountBalanceStatus !== ActionStatus.IDLE;
 
-  if (!hasLoadedBalances) {
+  if (!hasLoadedBalances || isLoadingScan) {
     return <Loading />;
   }
 
@@ -323,16 +316,11 @@ export const SignTransaction = () => {
             </Notification>
           </div>
         ) : null}
-        {flaggedKeyValues.length ? (
-          <FlaggedWarningMessage
-            isUnsafe={isUnsafe}
-            isMalicious={isMalicious}
-            isMemoRequired={isMemoRequired}
-          />
-        ) : null}
+        <MemoWarningMessage isMemoRequired={isMemoRequired} />
         {!isDomainListedAllowed && !isSubmitDisabled ? (
           <FirstTimeWarningMessage />
         ) : null}
+        {scanResult && <BlockaidTxScanLabel scanResult={scanResult} />}
         {renderTabBody()}
       </div>
     );
@@ -382,48 +370,98 @@ export const SignTransaction = () => {
               </button>
             </div>
             <div className="SignTransaction__Actions__BtnRow">
-              <Button
-                isFullWidth
-                size="md"
-                variant="secondary"
-                onClick={() => rejectAndClose()}
-              >
-                {t("Cancel")}
-              </Button>
-              {needsReviewAuth ? (
-                <Button
-                  disabled={isSubmitDisabled}
-                  variant="tertiary"
-                  isFullWidth
-                  size="md"
-                  isLoading={isConfirming}
-                  onClick={() =>
-                    navigateTo(
-                      ROUTES.reviewAuthorization,
-                      `?${encodeObject({
-                        accountToSign,
-                        transactionXdr,
-                        domain,
-                        flaggedKeys,
-                        isMemoRequired,
-                        memo: decodedMemo,
-                      })}`,
-                    )
-                  }
-                >
-                  {t("Review")}
-                </Button>
+              {flaggedMalicious ? (
+                <>
+                  {needsReviewAuth ? (
+                    <Button
+                      disabled={isSubmitDisabled}
+                      variant="error"
+                      isFullWidth
+                      size="md"
+                      isLoading={isConfirming}
+                      onClick={() =>
+                        navigateTo(
+                          ROUTES.reviewAuthorization,
+                          `?${encodeObject({
+                            accountToSign,
+                            transactionXdr,
+                            domain,
+                            flaggedKeys,
+                            isMemoRequired,
+                            memo: decodedMemo,
+                          })}`,
+                        )
+                      }
+                    >
+                      {t("Review anyway")}
+                    </Button>
+                  ) : (
+                    <Button
+                      disabled={isSubmitDisabled}
+                      variant="error"
+                      isFullWidth
+                      size="md"
+                      isLoading={isConfirming}
+                      onClick={() => handleApprove()}
+                    >
+                      {t("Sign anyway")}
+                    </Button>
+                  )}
+                  <Button
+                    isFullWidth
+                    size="md"
+                    variant="secondary"
+                    onClick={() => rejectAndClose()}
+                  >
+                    {t("Reject")}
+                  </Button>
+                </>
               ) : (
-                <Button
-                  disabled={isSubmitDisabled}
-                  variant="tertiary"
-                  isFullWidth
-                  size="md"
-                  isLoading={isConfirming}
-                  onClick={() => handleApprove()}
-                >
-                  {t("Sign")}
-                </Button>
+                <>
+                  <Button
+                    isFullWidth
+                    size="md"
+                    variant="secondary"
+                    onClick={() => rejectAndClose()}
+                  >
+                    {t("Cancel")}
+                  </Button>
+                  {needsReviewAuth ? (
+                    <Button
+                      disabled={isSubmitDisabled}
+                      variant="tertiary"
+                      isFullWidth
+                      size="md"
+                      isLoading={isConfirming}
+                      onClick={() =>
+                        navigateTo(
+                          ROUTES.reviewAuthorization,
+                          `?${encodeObject({
+                            accountToSign,
+                            transactionXdr,
+                            domain,
+                            flaggedKeys,
+                            isMemoRequired,
+                            memo: decodedMemo,
+                          })}`,
+                        )
+                      }
+                    >
+                      {t("Review")}
+                    </Button>
+                  ) : (
+                    <Button
+                      disabled={isSubmitDisabled}
+                      variant="tertiary"
+                      isFullWidth
+                      size="md"
+                      isLoading={isConfirming}
+                      onClick={() => handleApprove()}
+                    >
+                      {t("Sign")}
+                    </Button>
+                  )}
+                </>
               )}
             </div>
           </div>
diff --git a/extension/src/popup/views/__tests__/Account.test.tsx b/extension/src/popup/views/__tests__/Account.test.tsx
index d22d9d6b5..122a3563e 100644
--- a/extension/src/popup/views/__tests__/Account.test.tsx
+++ b/extension/src/popup/views/__tests__/Account.test.tsx
@@ -1,14 +1,22 @@
 import React from "react";
 import { render, waitFor, screen, fireEvent } from "@testing-library/react";
 import { Horizon } from "stellar-sdk";
+import BigNumber from "bignumber.js";
 
 import { APPLICATION_STATE as ApplicationState } from "@shared/constants/applicationState";
 import {
   TESTNET_NETWORK_DETAILS,
   DEFAULT_NETWORKS,
+  MAINNET_NETWORK_DETAILS,
 } from "@shared/constants/stellar";
+import { Balances } from "@shared/api/types";
 import * as ApiInternal from "@shared/api/internal";
+import * as ExtensionMessaging from "@shared/api/helpers/extensionMessaging";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 import * as UseAssetDomain from "popup/helpers/useAssetDomain";
+import { INDEXER_URL } from "@shared/constants/mercury";
+import { SERVICE_TYPES } from "@shared/constants/services";
+import { Response } from "@shared/api/types";
 
 import { Wrapper, mockBalances, mockAccounts } from "../../__testHelpers__";
 import { Account } from "../Account";
@@ -27,18 +35,102 @@ const mockHistoryOperations = {
   ] as Horizon.ServerApi.PaymentOperationRecord[],
 };
 
-jest.spyOn(global, "fetch").mockImplementation(() =>
-  Promise.resolve({
+jest.spyOn(global, "fetch").mockImplementation((url) => {
+  if (
+    url ===
+    `${INDEXER_URL}/scan-asset-bulk?asset_ids=USDC-GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM`
+  ) {
+    return Promise.resolve({
+      json: async () => {
+        return {
+          data: {
+            results: {
+              "USDC-GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM": {
+                address: "",
+                chain: "stellar",
+                attack_types: {},
+                fees: {},
+                malicious_score: "1.0",
+                metadata: {},
+                financial_stats: {},
+                trading_limits: {},
+                result_type: "Malicious",
+                features: [
+                  { description: "", feature_id: "METADATA", type: "Benign" },
+                ],
+              },
+            },
+          },
+        };
+      },
+    } as any);
+  }
+
+  return Promise.resolve({
     json: async () => {
       return [];
     },
-  } as any),
-);
+  } as any);
+});
 
 jest
   .spyOn(ApiInternal, "getAccountIndexerBalances")
   .mockImplementation(() => Promise.resolve(mockBalances));
 
+jest
+  .spyOn(ExtensionMessaging, "sendMessageToBackground")
+  .mockImplementation((msg) => {
+    if (msg.type === SERVICE_TYPES.GET_TOKEN_IDS) {
+      return Promise.resolve({ tokenIdList: [] as string[] } as Response);
+    }
+
+    return Promise.resolve({} as Response);
+  });
+
+jest.mock("stellar-sdk", () => {
+  const original = jest.requireActual("stellar-sdk");
+  return {
+    Asset: original.Asset,
+    StrKey: original.StrKey,
+    Networks: original.Networks,
+    Operation: original.Operation,
+    Horizon: {
+      Server: class {
+        accounts() {
+          return {
+            accountId: () => ({
+              call: () =>
+                Promise.resolve({
+                  balances: [
+                    {
+                      asset_code: "USDC",
+                      asset_issuer:
+                        "GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM",
+                      asset_type: "credit_alphanum4",
+                      balance: "100.0000000",
+                      buying_liabilities: "0.0000000",
+                      selling_liabilities: "0.0000000",
+                      limit: "1000.0000000",
+                    },
+                    {
+                      asset_type: "native",
+                      balance: "50.0000000",
+                      buying_liabilities: "0.0000000",
+                      selling_liabilities: "0.0000000",
+                    },
+                  ],
+                }),
+            }),
+          };
+        }
+      },
+      HorizonApi: original.Horizon.HorizonApi,
+    },
+    SorobanRpc: original.SorobanRpc,
+    TransactionBuilder: original.TransactionBuilder,
+  };
+});
+
 // @ts-ignore
 jest.spyOn(ApiInternal, "loadAccount").mockImplementation(() =>
   Promise.resolve({
@@ -62,13 +154,20 @@ jest
   );
 
 jest
-  .spyOn(ApiInternal, "getIndexerAccountHistory")
+  .spyOn(ApiInternal, "getAccountHistory")
   .mockImplementation(() => Promise.resolve(mockHistoryOperations.operations));
 
 jest.spyOn(UseAssetDomain, "useAssetDomain").mockImplementation(() => {
   return { assetDomain: "centre.io", error: "" };
 });
 
+jest.spyOn(ApiInternal, "getAssetIcons").mockImplementation(() =>
+  Promise.resolve({
+    "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM":
+      "http://domain.com/icon.png",
+  }),
+);
+
 describe("Account view", () => {
   afterAll(() => {
     jest.clearAllMocks();
@@ -125,7 +224,7 @@ describe("Account view", () => {
     expect(accountNodes.length).toEqual(3);
     expect(screen.getAllByText("Account 1")).toBeDefined();
   });
-  it("displays balances", async () => {
+  it("displays balances and scam notifications on Mainnet", async () => {
     render(
       <Wrapper
         state={{
@@ -136,7 +235,7 @@ describe("Account view", () => {
             allAccounts: mockAccounts,
           },
           settings: {
-            networkDetails: TESTNET_NETWORK_DETAILS,
+            networkDetails: MAINNET_NETWORK_DETAILS,
             networksList: DEFAULT_NETWORKS,
           },
         }}
@@ -144,13 +243,130 @@ describe("Account view", () => {
         <Account />
       </Wrapper>,
     );
+
     await waitFor(() => {
       const assetNodes = screen.getAllByTestId("account-assets-item");
       expect(assetNodes.length).toEqual(3);
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-XLM"),
+      ).not.toContainElement(screen.getByTestId("ScamAssetIcon"));
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-USDC"),
+      ).toContainElement(screen.getByTestId("ScamAssetIcon"));
       expect(screen.getAllByText("USDC")).toBeDefined();
     });
   });
-  it.skip("goes to account details", async () => {
+  it("displays balances and scam notifications on custom Mainnet network", async () => {
+    const customMainnet = {
+      network: "STANDALONE",
+      networkName: "Custom Network",
+      networkPassphrase: MAINNET_NETWORK_DETAILS.networkPassphrase,
+      networkUrl: MAINNET_NETWORK_DETAILS.networkUrl,
+    };
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey: "G1",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: customMainnet,
+            networksList: [...DEFAULT_NETWORKS, customMainnet],
+          },
+        }}
+      >
+        <Account />
+      </Wrapper>,
+    );
+
+    await waitFor(() => {
+      const assetNodes = screen.getAllByTestId("account-assets-item");
+      expect(assetNodes.length).toEqual(2);
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-XLM"),
+      ).not.toContainElement(screen.getByTestId("ScamAssetIcon"));
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-USDC"),
+      ).toContainElement(screen.getByTestId("ScamAssetIcon"));
+      expect(screen.getAllByText("USDC")).toBeDefined();
+    });
+  });
+  it("displays balances on custom TESTNET network without scam icons", async () => {
+    const customMainnet = {
+      network: "STANDALONE",
+      networkName: "Custom Network",
+      networkPassphrase: TESTNET_NETWORK_DETAILS.networkPassphrase,
+      networkUrl: TESTNET_NETWORK_DETAILS.networkUrl,
+    };
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey: "G1",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: customMainnet,
+            networksList: [...DEFAULT_NETWORKS, customMainnet],
+          },
+        }}
+      >
+        <Account />
+      </Wrapper>,
+    );
+
+    await waitFor(() => {
+      const assetNodes = screen.getAllByTestId("account-assets-item");
+      expect(assetNodes.length).toEqual(2);
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-XLM"),
+      ).toBeDefined();
+      expect(
+        screen.getByTestId("AccountAssets__asset--loading-USDC"),
+      ).toBeDefined();
+      expect(screen.getAllByText("USDC")).toBeDefined();
+      expect(screen.queryByTestId("ScamAssetIcon")).toBeNull();
+    });
+  });
+  it("goes to account details", async () => {
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey: "G1",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Account />
+      </Wrapper>,
+    );
+
+    await waitFor(async () => {
+      await fireEvent.click(
+        screen.getByTestId("AccountAssets__asset--loading-USDC"),
+      );
+    });
+    await waitFor(() => {
+      expect(
+        screen.getByTestId("asset-detail-available-copy"),
+      ).toHaveTextContent("100 USDC");
+    });
+  });
+  it("shows Blockaid warning in account details", async () => {
     render(
       <Wrapper
         state={{
@@ -171,14 +387,18 @@ describe("Account view", () => {
     );
 
     await waitFor(async () => {
-      const assetNodes = screen.getAllByTestId("account-assets");
-      await fireEvent.click(assetNodes[1]);
+      await fireEvent.click(
+        screen.getByTestId("AccountAssets__asset--loading-USDC"),
+      );
     });
     await waitFor(() => {
       expect(
         screen.getByTestId("asset-detail-available-copy"),
       ).toHaveTextContent("100 USDC");
     });
+    await waitFor(() => {
+      expect(screen.getByTestId("ScamAssetWarning__box")).toBeDefined();
+    });
   });
   it("switches accounts", async () => {
     render(
@@ -211,4 +431,59 @@ describe("Account view", () => {
       );
     });
   });
+  it("loads LP shares", async () => {
+    const mockLpBalance = {
+      balances: {
+        ["2f0d463c05c1f99676a90f78f32f4bf6ddf7f5227dce805711c65e257434f9dd:lp"]:
+          {
+            total: new BigNumber("1000000000"),
+            limit: new BigNumber("1000000000"),
+            liquidityPoolId:
+              "2f0d463c05c1f99676a90f78f32f4bf6ddf7f5227dce805711c65e257434f9dd",
+            available: new BigNumber("1000000000"),
+            reserves: [
+              { asset: "A:foo", amount: "0.000" },
+              { asset: "B:bar", amount: "0.000" },
+            ],
+            blockaidData: defaultBlockaidScanAssetResult,
+          },
+        native: {
+          token: { type: "native", code: "XLM" },
+          total: new BigNumber("50"),
+          available: new BigNumber("50"),
+          blockaidData: defaultBlockaidScanAssetResult,
+        },
+      } as any as Balances,
+      isFunded: true,
+      subentryCount: 1,
+    };
+    jest
+      .spyOn(ApiInternal, "getAccountIndexerBalances")
+      .mockImplementation(() => Promise.resolve(mockLpBalance));
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey: "G1",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Account />
+      </Wrapper>,
+    );
+    await waitFor(() => {
+      const assetNodes = screen.getAllByTestId("account-assets-item");
+      expect(assetNodes.length).toEqual(2);
+      expect(assetNodes[1]).toHaveTextContent("LP");
+      expect(assetNodes[1]).toHaveTextContent("0 shares");
+    });
+  });
 });
diff --git a/extension/src/popup/views/__tests__/GrantAccess.test.tsx b/extension/src/popup/views/__tests__/GrantAccess.test.tsx
new file mode 100644
index 000000000..418004d31
--- /dev/null
+++ b/extension/src/popup/views/__tests__/GrantAccess.test.tsx
@@ -0,0 +1,171 @@
+import React from "react";
+import { render, waitFor, screen } from "@testing-library/react";
+
+import { APPLICATION_STATE as ApplicationState } from "@shared/constants/applicationState";
+import { Wrapper, mockAccounts } from "../../__testHelpers__";
+import {
+  TESTNET_NETWORK_DETAILS,
+  DEFAULT_NETWORKS,
+  NetworkDetails,
+} from "@shared/constants/stellar";
+import { GrantAccess } from "../GrantAccess";
+import * as blockAidHelpers from "popup/helpers/blockaid";
+import { BlockAidScanSiteResult } from "@shared/api/types";
+import * as urlHelpers from "../../../helpers/urls";
+
+jest.spyOn(urlHelpers, "parsedSearchParam").mockImplementation(() => {
+  const original = jest.requireActual("../../../helpers/urls");
+  return {
+    ...original,
+    url: "example.com",
+  };
+});
+
+describe("Grant Access view", () => {
+  afterAll(() => {
+    jest.clearAllMocks();
+  });
+
+  it("renders", async () => {
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey:
+              "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <GrantAccess />
+      </Wrapper>,
+    );
+
+    await waitFor(() => screen.getByTestId("grant-access-view"));
+    expect(screen.getByTestId("grant-access-view")).toBeDefined();
+  });
+
+  // not applicable right now, but we may show this warning in the future
+  it.skip("shows a benign label when scan site returns non malicious flag", async () => {
+    jest.spyOn(blockAidHelpers, "useScanSite").mockImplementation(() => {
+      return {
+        error: null,
+        isLoading: false,
+        data: {
+          is_malicious: false,
+        } as BlockAidScanSiteResult,
+        scanSite: (_url: string, _networkDetails: NetworkDetails) => {
+          return Promise.resolve();
+        },
+      };
+    });
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey:
+              "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <GrantAccess />
+      </Wrapper>,
+    );
+
+    await waitFor(() => screen.getByTestId("grant-access-view"));
+    expect(screen.getByTestId("grant-access-view")).toBeDefined();
+    expect(screen.getByTestId("blockaid-benign-label")).toBeDefined();
+  });
+
+  it("shows a miss label when scan site returns a miss status", async () => {
+    jest.spyOn(blockAidHelpers, "useScanSite").mockImplementation(() => {
+      return {
+        error: null,
+        isLoading: false,
+        data: {
+          status: "miss",
+        } as BlockAidScanSiteResult,
+        scanSite: (_url: string, _networkDetails: NetworkDetails) => {
+          return Promise.resolve();
+        },
+      };
+    });
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey:
+              "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <GrantAccess />
+      </Wrapper>,
+    );
+
+    await waitFor(() => screen.getByTestId("grant-access-view"));
+    expect(screen.getByTestId("grant-access-view")).toBeDefined();
+    expect(screen.getByTestId("blockaid-miss-label")).toBeDefined();
+  });
+
+  it("shows a malicious label when scan site returns a malicious flag", async () => {
+    jest.spyOn(blockAidHelpers, "useScanSite").mockImplementation(() => {
+      return {
+        error: null,
+        isLoading: false,
+        data: {
+          is_malicious: true,
+        } as BlockAidScanSiteResult,
+        scanSite: (_url: string, _networkDetails: NetworkDetails) => {
+          return Promise.resolve();
+        },
+      };
+    });
+
+    render(
+      <Wrapper
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey:
+              "GBTYAFHGNZSTE4VBWZYAGB3SRGJEPTI5I4Y22KZ4JTVAN56LESB6JZOF",
+            allAccounts: mockAccounts,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <GrantAccess />
+      </Wrapper>,
+    );
+
+    await waitFor(() => screen.getByTestId("grant-access-view"));
+    expect(screen.getByTestId("grant-access-view")).toBeDefined();
+    expect(screen.getByTestId("blockaid-malicious-label")).toBeDefined();
+  });
+});
diff --git a/extension/src/popup/views/__tests__/ManageAssets.test.tsx b/extension/src/popup/views/__tests__/ManageAssets.test.tsx
index 37a732893..2fa433a19 100644
--- a/extension/src/popup/views/__tests__/ManageAssets.test.tsx
+++ b/extension/src/popup/views/__tests__/ManageAssets.test.tsx
@@ -17,6 +17,7 @@ import {
 } from "@shared/constants/stellar";
 import { Balances } from "@shared/api/types";
 import { createMemoryHistory } from "history";
+import { defaultBlockaidScanAssetResult } from "@shared/helpers/stellar";
 
 import { APPLICATION_STATE as ApplicationState } from "@shared/constants/applicationState";
 import { ROUTES } from "popup/constants/routes";
@@ -25,6 +26,8 @@ import * as CheckSuspiciousAsset from "popup/helpers/checkForSuspiciousAsset";
 import * as ManageAssetXDR from "popup/helpers/getManageAssetXDR";
 import * as SearchAsset from "popup/helpers/searchAsset";
 import * as SorobanHelpers from "popup/helpers/soroban";
+import * as BlockaidHelpers from "popup/helpers/blockaid";
+
 import {
   AssetSelectType,
   initialState as transactionSubmissionInitialState,
@@ -147,7 +150,21 @@ jest.spyOn(SearchAsset, "searchAsset").mockImplementation(({ asset }) => {
     });
   }
 
-  // Malicious
+  if (asset === "BMAL") {
+    return Promise.resolve({
+      _embedded: {
+        records: [
+          {
+            asset:
+              "BMAL-GBFJZSHWOMYS6U73NXQRRD4JX6TZNWEAFII6Z5INGWVJ2VCQ2K4NQMHP",
+            domain: "bmal.domain.com",
+          },
+        ],
+      },
+    });
+  }
+
+  // Asset with warnings
   return Promise.resolve({
     _embedded: {
       records: [
@@ -209,6 +226,8 @@ jest.mock("popup/constants/history", () => ({
 jest.mock("stellar-sdk", () => {
   const original = jest.requireActual("stellar-sdk");
   return {
+    Asset: original.Asset,
+    Operation: original.Operation,
     Networks: original.Networks,
     Horizon: {
       Server: class {
@@ -226,6 +245,36 @@ jest.mock("stellar-sdk", () => {
   };
 });
 
+jest.spyOn(BlockaidHelpers, "scanAsset").mockImplementation((address) => {
+  if (
+    address === "BMAL-GBFJZSHWOMYS6U73NXQRRD4JX6TZNWEAFII6Z5INGWVJ2VCQ2K4NQMHP"
+  ) {
+    return Promise.resolve({
+      ...defaultBlockaidScanAssetResult,
+      result_type: "Malicious",
+      features: [
+        {
+          description: "bad asset",
+          feature_id: "KNOWN_MALICIOUS",
+          type: "Malicious",
+        },
+      ],
+    });
+  }
+
+  return Promise.resolve({
+    ...defaultBlockaidScanAssetResult,
+    result_type: "Benign",
+    features: [
+      {
+        description: "good asset",
+        feature_id: "METADATA",
+        type: "Benign",
+      },
+    ],
+  });
+});
+
 const publicKey = "GCXRLIZUQNZ3YYJDGX6Z445P7FG5WXT7UILBO5CFIYYM7Z7YTIOELC6O";
 const history = createMemoryHistory();
 
@@ -599,7 +648,7 @@ describe("Manage assets", () => {
     });
   });
 
-  it("show warning when adding malicious asset", async () => {
+  it("show warning when adding an asset with warnings", async () => {
     await initView();
 
     expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
@@ -651,12 +700,72 @@ describe("Manage assets", () => {
         "NewAssetWarningAddButton",
       );
       expect(warningAddButton).toBeEnabled();
+
       await fireEvent.click(warningAddButton);
     });
 
     const lastRoute = history.entries.pop();
     expect(lastRoute?.pathname).toBe("/account");
   });
+  it("show warning when adding an asset with Blockaid warning on Mainnet", async () => {
+    await initView(true);
+
+    expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
+      "Your assets",
+    );
+
+    const addButton = screen.getByTestId("ChooseAssetAddAssetButton");
+    expect(addButton).toBeEnabled();
+    await fireEvent.click(addButton);
+
+    await waitFor(() => {
+      screen.getByTestId("AppHeaderPageTitle");
+      expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
+        "Choose Asset",
+      );
+
+      const searchInput = screen.getByTestId("search-asset-input");
+      fireEvent.change(searchInput, { target: { value: "BMAL" } });
+      expect(searchInput).toHaveValue("BMAL");
+    });
+
+    await waitFor(async () => {
+      const addedTrustlines = screen.queryAllByTestId("ManageAssetRow");
+
+      expect(addedTrustlines.length).toBe(1);
+      expect(
+        within(addedTrustlines[0]).getByTestId("ManageAssetCode"),
+      ).toHaveTextContent("BMAL");
+      expect(
+        within(addedTrustlines[0]).getByTestId("ManageAssetDomain"),
+      ).toHaveTextContent("bmal.domain.com");
+
+      const addAssetButton = within(addedTrustlines[0]).getByTestId(
+        "ManageAssetRowButton",
+      );
+
+      expect(addAssetButton).toHaveTextContent("Add");
+      expect(addAssetButton).toBeEnabled();
+      await fireEvent.click(addAssetButton);
+    });
+
+    await waitFor(async () => {
+      const warning = screen.getByTestId("ScamAssetWarning");
+      expect(screen.getByTestId("ScamAssetWarning__box")).toHaveTextContent(
+        "This token was flagged as Malicious by Blockaid. Interacting with this token may result in loss of funds and is not recommended for the following reasons:",
+      );
+
+      const addAssetButton = within(warning).getByTestId(
+        "ScamAsset__add-asset",
+      );
+      expect(addAssetButton).toBeEnabled();
+
+      await fireEvent.click(addAssetButton);
+    });
+
+    const lastRoute = history.entries.pop();
+    expect(lastRoute?.pathname).toBe("/account");
+  });
   it("add soroban token on asset list", async () => {
     // init Mainnet view
     await initView(false, true);
diff --git a/extension/src/popup/views/__tests__/SendPayment.test.tsx b/extension/src/popup/views/__tests__/SendPayment.test.tsx
index 7abc365e4..4f1fe1e5f 100644
--- a/extension/src/popup/views/__tests__/SendPayment.test.tsx
+++ b/extension/src/popup/views/__tests__/SendPayment.test.tsx
@@ -4,6 +4,7 @@ import { render, waitFor, fireEvent, screen } from "@testing-library/react";
 import { Wrapper, mockBalances, mockAccounts } from "../../__testHelpers__";
 import * as ApiInternal from "@shared/api/internal";
 import * as UseNetworkFees from "popup/helpers/useNetworkFees";
+import * as BlockaidHelpers from "popup/helpers/blockaid";
 import {
   TESTNET_NETWORK_DETAILS,
   DEFAULT_NETWORKS,
@@ -14,6 +15,8 @@ import { APPLICATION_STATE as ApplicationState } from "@shared/constants/applica
 import { ROUTES } from "popup/constants/routes";
 import { SendPayment } from "popup/views/SendPayment";
 import { initialState as transactionSubmissionInitialState } from "popup/ducks/transactionSubmission";
+import * as CheckSuspiciousAsset from "popup/helpers/checkForSuspiciousAsset";
+import * as tokenPaymentActions from "popup/ducks/token-payment";
 
 jest.spyOn(ApiInternal, "getAccountIndexerBalances").mockImplementation(() => {
   return Promise.resolve(mockBalances);
@@ -33,10 +36,23 @@ jest.spyOn(UseNetworkFees, "useNetworkFees").mockImplementation(() => {
   };
 });
 
+jest.spyOn(BlockaidHelpers, "useScanTx").mockImplementation(() => {
+  return {
+    scanTx: () => Promise.resolve(null),
+    isLoading: false,
+    setLoading: () => {},
+    data: null,
+    error: null,
+  };
+});
+
 jest.mock("stellar-sdk", () => {
   const original = jest.requireActual("stellar-sdk");
   return {
+    Asset: original.Asset,
+    StrKey: original.StrKey,
     Networks: original.Networks,
+    Operation: original.Operation,
     Horizon: {
       Server: class {
         loadAccount() {
@@ -49,9 +65,26 @@ jest.mock("stellar-sdk", () => {
       },
     },
     SorobanRpc: original.SorobanRpc,
+    TransactionBuilder: original.TransactionBuilder,
   };
 });
 
+jest
+  .spyOn(CheckSuspiciousAsset, "checkForSuspiciousAsset")
+  .mockImplementation(({ issuer }: { issuer: string }) => {
+    let isRevocable = false;
+    let isNewAsset = false;
+    let isInvalidDomain = false;
+
+    if (issuer === "GBFJZSHWOMYS6U73NXQRRD4JX6TZNWEAFII6Z5INGWVJ2VCQ2K4NQMHP") {
+      isRevocable = true;
+      isNewAsset = true;
+      isInvalidDomain = true;
+    }
+
+    return Promise.resolve({ isRevocable, isNewAsset, isInvalidDomain });
+  });
+
 jest.mock("react-router-dom", () => {
   const ReactRouter = jest.requireActual("react-router-dom");
   return {
@@ -68,7 +101,7 @@ jest.mock("popup/constants/history", () => ({
 
 const publicKey = "GA4UFF2WJM7KHHG4R5D5D2MZQ6FWMDOSVITVF7C5OLD5NFP6RBBW2FGV";
 
-describe.skip("SendPayment", () => {
+describe("SendPayment", () => {
   afterAll(() => {
     jest.clearAllMocks();
   });
@@ -91,6 +124,7 @@ describe.skip("SendPayment", () => {
             networkDetails: TESTNET_NETWORK_DETAILS,
             networksList: DEFAULT_NETWORKS,
           },
+          tokenPaymentSimulation: tokenPaymentActions.initialState,
         }}
       >
         <SendPayment />
@@ -138,7 +172,12 @@ const testPaymentFlow = async (asset: string) => {
             asset,
           },
           accountBalances: mockBalances,
+          assetDomains: {
+            "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM":
+              "domain.com",
+          },
         },
+        tokenPaymentSimulation: tokenPaymentActions.initialState,
       }}
     >
       <SendPayment />
@@ -164,17 +203,44 @@ const testPaymentFlow = async (asset: string) => {
   });
 
   await waitFor(async () => {
+    if (
+      asset === "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM"
+    ) {
+      expect(screen.getByTestId("ScamAssetIcon")).toBeDefined();
+    } else {
+      expect(screen.queryByTestId("ScamAssetIcon")).toBeNull();
+    }
     const continueBtn = screen.getByTestId("send-amount-btn-continue");
     expect(continueBtn).not.toBeDisabled();
     await fireEvent.click(continueBtn);
+
+    if (
+      asset === "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM"
+    ) {
+      await fireEvent.click(screen.getByTestId("ScamAsset__send"));
+    }
   });
 
   await waitFor(async () => {
+    expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
+      "Send Settings",
+    );
     const continueBtn = screen.getByTestId("send-settings-btn-continue");
+    expect(continueBtn).toBeEnabled();
     await fireEvent.click(continueBtn);
   });
 
   await waitFor(async () => {
+    expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
+      "Confirm Send",
+    );
+    if (
+      asset === "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM"
+    ) {
+      expect(screen.getByTestId("BlockaidWarningModal__button")).toBeDefined();
+    } else {
+      expect(screen.queryByTestId("BlockaidWarningModal__button")).toBeNull();
+    }
     const sendBtn = screen.getByTestId("transaction-details-btn-send");
     await fireEvent.click(sendBtn);
   });
diff --git a/extension/src/popup/views/__tests__/SendTokenPayment.test.tsx b/extension/src/popup/views/__tests__/SendTokenPayment.test.tsx
index 93d089232..8cfb939c4 100644
--- a/extension/src/popup/views/__tests__/SendTokenPayment.test.tsx
+++ b/extension/src/popup/views/__tests__/SendTokenPayment.test.tsx
@@ -33,6 +33,18 @@ jest
     });
   });
 
+jest.spyOn(ApiInternal, "simulateTokenTransfer").mockImplementation(() => {
+  return Promise.resolve({
+    ok: true,
+    response: {
+      preparedTransaction: "xdr",
+      simulationResponse: {
+        minResourceFee: "1234",
+      },
+    },
+  });
+});
+
 jest.spyOn(UseNetworkFees, "useNetworkFees").mockImplementation(() => {
   return {
     recommendedFee: ".00001",
@@ -122,21 +134,6 @@ jest.mock("popup/constants/history", () => ({
   },
 }));
 
-jest.spyOn(global, "fetch").mockImplementation(() =>
-  Promise.resolve({
-    ok: true,
-    json: async () => ({
-      id: "tx ID",
-      transactionData: {},
-      cost: {
-        cpuInsns: 12389,
-        memBytes: 32478,
-      },
-      minResourceFee: 43289,
-    }),
-  } as any),
-);
-
 jest.mock("popup/helpers/searchAsset", () => {
   return {
     getVerifiedTokens: async () => Promise.resolve([]),
@@ -176,8 +173,7 @@ describe("SendTokenPayment", () => {
             isToken: true,
           },
           transactionSimulation: {
-            raw: null,
-            response: null,
+            ...tokenPaymentActions.initialState.simulation,
           },
           accountBalances: mockBalances,
         },
diff --git a/extension/src/popup/views/__tests__/Swap.test.tsx b/extension/src/popup/views/__tests__/Swap.test.tsx
index 43557ae7c..387522612 100644
--- a/extension/src/popup/views/__tests__/Swap.test.tsx
+++ b/extension/src/popup/views/__tests__/Swap.test.tsx
@@ -5,16 +5,15 @@ import {
   fireEvent,
   screen,
   within,
-  act,
 } from "@testing-library/react";
 
 import * as ApiInternal from "@shared/api/internal";
 import * as UseNetworkFees from "popup/helpers/useNetworkFees";
+import * as BlockaidHelpers from "popup/helpers/blockaid";
 import {
   TESTNET_NETWORK_DETAILS,
   DEFAULT_NETWORKS,
 } from "@shared/constants/stellar";
-import { Balances } from "@shared/api/types";
 import { createMemoryHistory } from "history";
 import BigNumber from "bignumber.js";
 
@@ -51,7 +50,43 @@ export const swapMockBalances = {
       total: new BigNumber("333"),
       available: new BigNumber("333"),
     },
-  } as any as Balances,
+  } as any,
+  isFunded: true,
+  subentryCount: 1,
+};
+
+const swapMaliciousMockBalances = {
+  balances: {
+    "USDC:GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM": {
+      token: {
+        code: "USDC",
+        issuer: {
+          key: "GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM",
+        },
+      },
+      total: new BigNumber("111"),
+      available: new BigNumber("111"),
+      blockaidData: {
+        result_type: "Spam",
+        features: [{ description: "" }],
+      },
+    },
+    native: {
+      token: { type: "native", code: "XLM" },
+      total: new BigNumber("222"),
+      available: new BigNumber("222"),
+    },
+    "SRT:GCDNJUBQSX7AJWLJACMJ7I4BC3Z47BQUTMHEICZLE6MU4KQBRYG5JY6B": {
+      token: {
+        code: "SRT",
+        issuer: {
+          key: "GCDNJUBQSX7AJWLJACMJ7I4BC3Z47BQUTMHEICZLE6MU4KQBRYG5JY6B",
+        },
+      },
+      total: new BigNumber("333"),
+      available: new BigNumber("333"),
+    },
+  } as any,
   isFunded: true,
   subentryCount: 1,
 };
@@ -72,6 +107,16 @@ jest.spyOn(UseNetworkFees, "useNetworkFees").mockImplementation(() => ({
   networkCongestion: UseNetworkFees.NetworkCongestion.MEDIUM,
 }));
 
+jest.spyOn(BlockaidHelpers, "useScanTx").mockImplementation(() => {
+  return {
+    scanTx: () => Promise.resolve(null),
+    isLoading: false,
+    setLoading: () => {},
+    data: null,
+    error: null,
+  };
+});
+
 const mockHistoryGetter = jest.fn();
 jest.mock("popup/constants/history", () => ({
   get history() {
@@ -129,6 +174,10 @@ jest.mock("stellar-sdk", () => {
 
 const publicKey = "GCXRLIZUQNZ3YYJDGX6Z445P7FG5WXT7UILBO5CFIYYM7Z7YTIOELC6O";
 
+const history = createMemoryHistory();
+history.push(ROUTES.swap);
+mockHistoryGetter.mockReturnValue(history);
+
 describe("Swap", () => {
   beforeEach(() => {
     jest.spyOn(global, "fetch").mockImplementation(() =>
@@ -138,44 +187,35 @@ describe("Swap", () => {
       } as any),
     );
   });
-  beforeEach(async () => {
-    const history = createMemoryHistory();
-    history.push(ROUTES.swap);
-    mockHistoryGetter.mockReturnValue(history);
-
-    act(() => {
-      render(
-        <Wrapper
-          history={history}
-          state={{
-            auth: {
-              error: null,
-              applicationState: ApplicationState.PASSWORD_CREATED,
-              publicKey,
-              allAccounts: mockAccounts,
-              hasPrivateKey: true,
-            },
-            settings: {
-              networkDetails: TESTNET_NETWORK_DETAILS,
-              networksList: DEFAULT_NETWORKS,
-            },
-          }}
-        >
-          <Swap />
-        </Wrapper>,
-      );
-    });
 
-    await waitFor(() => {
-      expect(screen.getByTestId("AppHeaderPageTitle")).toBeDefined();
-    });
-  });
+  afterEach(() => {});
 
   afterAll(() => {
     jest.clearAllMocks();
   });
 
   it("renders swap view initial state", async () => {
+    render(
+      <Wrapper
+        history={history}
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey,
+            allAccounts: mockAccounts,
+            hasPrivateKey: true,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Swap />
+      </Wrapper>,
+    );
+
     expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
       "Swap XLM",
     );
@@ -211,7 +251,92 @@ describe("Swap", () => {
     expect(screen.getByTestId("send-amount-btn-continue")).toBeDisabled();
   });
 
+  it("renders swap view with malicious asset", async () => {
+    jest
+      .spyOn(ApiInternal, "getAccountIndexerBalances")
+      .mockImplementation(() => Promise.resolve(swapMaliciousMockBalances));
+
+    render(
+      <Wrapper
+        history={history}
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey,
+            allAccounts: mockAccounts,
+            hasPrivateKey: true,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Swap />
+      </Wrapper>,
+    );
+
+    expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
+      "Swap XLM",
+    );
+
+    await waitFor(() => {
+      expect(screen.getByTestId("AppHeaderPageSubtitle")).not.toHaveTextContent(
+        "0 XLM available",
+      );
+    });
+
+    expect(screen.getByTestId("AppHeaderPageSubtitle")).toHaveTextContent(
+      "220.49999 XLM available",
+    );
+    expect(screen.getByTestId("send-amount-amount-input")).toHaveValue("0");
+
+    const assetSelects = screen.getAllByTestId("AssetSelect");
+    const sourceAsset = assetSelects[0];
+    const destinationAsset = assetSelects[1];
+
+    expect(
+      within(sourceAsset).getByTestId("AssetSelectSourceLabel"),
+    ).toHaveTextContent("From");
+    expect(
+      within(sourceAsset).getByTestId("AssetSelectSourceCode"),
+    ).toHaveTextContent("XLM");
+
+    expect(
+      within(destinationAsset).getByTestId("AssetSelectSourceLabel"),
+    ).toHaveTextContent("To");
+    expect(
+      within(destinationAsset).getByTestId("AssetSelectSourceCode"),
+    ).toHaveTextContent("USDC");
+    expect(destinationAsset).toContainElement(
+      screen.getByTestId("ScamAssetIcon"),
+    );
+    expect(screen.getByTestId("send-amount-btn-continue")).toBeDisabled();
+  });
+
   it("set max amount", async () => {
+    render(
+      <Wrapper
+        history={history}
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey,
+            allAccounts: mockAccounts,
+            hasPrivateKey: true,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Swap />
+      </Wrapper>,
+    );
+
     const setMaxButton = screen.getByTestId("SendAmountSetMax");
 
     await waitFor(async () => {
@@ -235,8 +360,37 @@ describe("Swap", () => {
   });
 
   it("swap custom amount", async () => {
+    jest
+      .spyOn(ApiInternal, "getAccountIndexerBalances")
+      .mockImplementation(() => Promise.resolve(swapMockBalances));
+
+    render(
+      <Wrapper
+        history={history}
+        state={{
+          auth: {
+            error: null,
+            applicationState: ApplicationState.PASSWORD_CREATED,
+            publicKey,
+            allAccounts: mockAccounts,
+            hasPrivateKey: true,
+          },
+          settings: {
+            networkDetails: TESTNET_NETWORK_DETAILS,
+            networksList: DEFAULT_NETWORKS,
+          },
+        }}
+      >
+        <Swap />
+      </Wrapper>,
+    );
+
     const amountInput = screen.getByTestId("send-amount-amount-input");
 
+    await waitFor(() => {
+      expect(screen.getByTestId("AppHeaderPageTitle")).toBeDefined();
+    });
+
     await waitFor(async () => {
       fireEvent.change(amountInput, { target: { value: "20" } });
       expect(screen.getByTestId("send-amount-amount-input")).not.toHaveValue(
@@ -271,7 +425,6 @@ describe("Swap", () => {
 
     // Swap Settings view
     await waitFor(() => {
-      screen.getByTestId("AppHeaderPageTitle");
       expect(screen.getByTestId("AppHeaderPageTitle")).toHaveTextContent(
         "Swap Settings",
       );
diff --git a/extension/webpack.common.js b/extension/webpack.common.js
index 9355da8b6..ff7b7360f 100644
--- a/extension/webpack.common.js
+++ b/extension/webpack.common.js
@@ -4,7 +4,6 @@ const HtmlWebPackPlugin = require("html-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
-const TerserPlugin = require("terser-webpack-plugin");
 const path = require("path");
 const webpack = require("webpack");
 
@@ -16,10 +15,6 @@ const commonConfig = (
   env = { EXPERIMENTAL: false, AMPLITUDE_KEY: "", SENTRY_KEY: "" },
 ) => ({
   cache: true,
-  optimization: {
-    minimize: true,
-    minimizer: [new TerserPlugin()],
-  },
   entry: {
     background: path.resolve(__dirname, "./public/background.ts"),
     index: ["babel-polyfill", path.resolve(__dirname, "./src/popup/index.tsx")],
diff --git a/extension/webpack.extension.js b/extension/webpack.extension.js
index 290fb98e0..644eb80b6 100644
--- a/extension/webpack.extension.js
+++ b/extension/webpack.extension.js
@@ -5,6 +5,7 @@ const { commonConfig } = require("./webpack.common.js");
 const Dotenv = require("dotenv-webpack");
 const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");
 const SpeedMeasurePlugin = require("speed-measure-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 
 const smp = new SpeedMeasurePlugin();
 
@@ -19,6 +20,10 @@ const prodConfig = (
   },
 ) =>
   smp.wrap({
+    optimization: {
+      minimize: true,
+      minimizer: [new TerserPlugin()],
+    },
     mode: "production",
     optimization: {
       minimize: env.PRODUCTION,
diff --git a/package.json b/package.json
index cd3b9a609..bea41a107 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "start:unpacked": "yarn workspace extension start:unpacked-extension",
     "install-if-package-changed": "git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD | grep --quiet yarn.lock && yarn setup || exit 0",
     "test:ci": "jest --ci",
-    "test:e2e": "yarn workspace extension test:e2e",
+    "test:e2e": "yarn workspace extension test:e2e --workers=1",
     "test": "jest -o --watch",
     "prepare": "husky install"
   },
diff --git a/yarn.lock b/yarn.lock
index aef6e50a2..18adf0193 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1363,6 +1363,19 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@blockaid/client@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@blockaid/client/-/client-0.25.0.tgz#047edad9b4a2400b316041aa0932f53120b14448"
+  integrity sha512-QcFuurS6sAOFY8/d8rmWpmJAUJbYojSQlOAJ97eWSAW9WI9D1tjAC1JpEBvGUlfwLjO4/+kOqk4KvDXxEleIgA==
+  dependencies:
+    "@types/node" "^18.11.18"
+    "@types/node-fetch" "^2.6.4"
+    abort-controller "^3.0.0"
+    agentkeepalive "^4.2.1"
+    form-data-encoder "1.7.2"
+    formdata-node "^4.3.2"
+    node-fetch "^2.6.7"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -3836,6 +3849,14 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
+"@types/node-fetch@^2.6.4":
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
+  integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==
+  dependencies:
+    "@types/node" "*"
+    form-data "^4.0.0"
+
 "@types/node-forge@^1.3.0":
   version "1.3.11"
   resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
@@ -3860,6 +3881,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
+"@types/node@^18.11.18":
+  version "18.19.50"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.50.tgz#8652b34ee7c0e7e2004b3f08192281808d41bf5a"
+  integrity sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/parse-json@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
@@ -8218,6 +8246,11 @@ fork-ts-checker-webpack-plugin@^9.0.2:
     semver "^7.3.5"
     tapable "^2.2.1"
 
+form-data-encoder@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040"
+  integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==
+
 form-data-encoder@^2.1.2:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
@@ -8246,6 +8279,14 @@ format@^0.2.0:
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
   integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==
 
+formdata-node@^4.3.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz#23f6a5cb9cb55315912cbec4ff7b0f59bbd191e2"
+  integrity sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==
+  dependencies:
+    node-domexception "1.0.0"
+    web-streams-polyfill "4.0.0-beta.3"
+
 formik@^2.1.4:
   version "2.4.6"
   resolved "https://registry.yarnpkg.com/formik/-/formik-2.4.6.tgz#4da75ca80f1a827ab35b08fd98d5a76e928c9686"
@@ -12463,6 +12504,11 @@ node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
+node-domexception@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
+
 node-emoji@^2.1.0:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-2.1.3.tgz#93cfabb5cc7c3653aa52f29d6ffb7927d8047c06"
@@ -16363,6 +16409,11 @@ underscore.string@~3.3.4:
     sprintf-js "^1.1.1"
     util-deprecate "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 undici-types@~6.19.2:
   version "6.19.8"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
@@ -16855,6 +16906,11 @@ web-namespaces@^2.0.0:
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
   integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
 
+web-streams-polyfill@4.0.0-beta.3:
+  version "4.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz#2898486b74f5156095e473efe989dcf185047a38"
+  integrity sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==
+
 webextension-polyfill@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.12.0.tgz#f62c57d2cd42524e9fbdcee494c034cae34a3d69"