diff --git a/package.json b/package.json
index 26db783b445..3afd8938e89 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
   "dependencies": {
     "@bitcoinerlab/secp256k1": "1.0.2",
     "@coinbase/cbpay-js": "1.0.2",
-    "@dlc-link/dlc-tools": "1.0.9",
+    "@dlc-link/dlc-tools": "1.1.1",
     "@fungible-systems/zone-file": "2.0.0",
     "@hirosystems/token-metadata-api-client": "1.1.0",
     "@ledgerhq/hw-transport-webusb": "6.27.19",
diff --git a/scripts/generate-manifest.js b/scripts/generate-manifest.js
index 877d5ef8b6c..498eac28e6a 100644
--- a/scripts/generate-manifest.js
+++ b/scripts/generate-manifest.js
@@ -30,10 +30,15 @@ const environmentIcons = {
   },
 };
 
+const devCsp =
+  "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; frame-src https://ordinals.com/; frame-ancestors 'none';";
+
+const prodCsp = `default-src 'none'; connect-src *; style-src 'unsafe-inline'; img-src 'self' data: https:; script-src 'self' 'wasm-unsafe-eval'; object-src 'none'; frame-src https://ordinals.com/; frame-ancestors 'none';`;
+
 const contentSecurityPolicyEnvironment = {
-  development:
-    "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; frame-src 'none'; frame-ancestors 'none';",
-  production: `default-src 'none'; connect-src *; style-src 'unsafe-inline'; img-src 'self' data: https:; script-src 'self' 'wasm-unsafe-eval'; object-src 'none'; frame-src 'none'; frame-ancestors 'none';`,
+  testing: prodCsp,
+  development: devCsp,
+  production: prodCsp,
 };
 
 const defaultIconEnvironment = {
diff --git a/src/app/common/hooks/use-bitcoin-contracts.ts b/src/app/common/hooks/use-bitcoin-contracts.ts
index 1f434476aaa..88355b05eb5 100644
--- a/src/app/common/hooks/use-bitcoin-contracts.ts
+++ b/src/app/common/hooks/use-bitcoin-contracts.ts
@@ -207,17 +207,27 @@ export function useBitcoinContracts() {
     close();
   }
 
-  async function getAllSignedBitcoinContracts(): Promise<BitcoinContractListItem[] | undefined> {
+  async function getAllActiveBitcoinContracts(): Promise<BitcoinContractListItem[] | undefined> {
     const bitcoinContractInterface = await getBitcoinContractInterface();
 
     if (!bitcoinContractInterface) return;
 
+    await bitcoinContractInterface.periodic_check();
     const bitcoinContracts = await bitcoinContractInterface.get_contracts();
-    const signedBitcoinContracts = bitcoinContracts.filter(
-      (bitcoinContract: BitcoinContractListItem) => bitcoinContract.state === 'Signed'
-    );
 
-    return signedBitcoinContracts;
+    const stateOrder = ['Signed', 'Confirmed'];
+
+    const activeBitcoinContracts = bitcoinContracts
+      .filter(
+        (bitcoinContract: BitcoinContractListItem) =>
+          bitcoinContract.state === 'Signed' || bitcoinContract.state === 'Confirmed'
+      )
+      .sort(
+        (a: BitcoinContractListItem, b: BitcoinContractListItem) =>
+          stateOrder.indexOf(a.state) - stateOrder.indexOf(b.state)
+      );
+
+    return activeBitcoinContracts;
   }
 
   function getTransactionDetails(txId: string, bitcoinCollateral: number) {
@@ -239,7 +249,7 @@ export function useBitcoinContracts() {
 
   async function sumBitcoinContractCollateralAmounts(): Promise<Money> {
     let bitcoinContractsCollateralSum = 0;
-    const bitcoinContracts = await getAllSignedBitcoinContracts();
+    const bitcoinContracts = await getAllActiveBitcoinContracts();
     if (!bitcoinContracts) return createMoneyFromDecimal(0, 'BTC');
 
     bitcoinContracts.forEach((bitcoinContract: BitcoinContractListItem) => {
@@ -313,7 +323,7 @@ export function useBitcoinContracts() {
     handleOffer,
     handleAccept,
     handleReject,
-    getAllSignedBitcoinContracts,
+    getAllActiveBitcoinContracts,
     sumBitcoinContractCollateralAmounts,
     sendRpcResponse,
   };
diff --git a/src/app/components/brc20-tokens-loader.tsx b/src/app/components/brc20-tokens-loader.tsx
index e51b9807bca..042559d4670 100644
--- a/src/app/components/brc20-tokens-loader.tsx
+++ b/src/app/components/brc20-tokens-loader.tsx
@@ -1,13 +1,13 @@
 import {
   Brc20Token,
-  useBrc20TokensQuery,
+  useGetBrc20TokensQuery,
 } from '@app/query/bitcoin/ordinals/brc20/brc20-tokens.query';
 
 interface Brc20TokensLoaderProps {
   children(brc20Tokens: Brc20Token[]): React.JSX.Element;
 }
 export function Brc20TokensLoader({ children }: Brc20TokensLoaderProps) {
-  const { data: allBrc20TokensResponse } = useBrc20TokensQuery();
+  const { data: allBrc20TokensResponse } = useGetBrc20TokensQuery();
   const brc20Tokens = allBrc20TokensResponse?.pages
     .flatMap(page => page.brc20Tokens)
     .filter(token => token.length > 0)
diff --git a/src/app/components/fees-row/components/fees-row.layout.tsx b/src/app/components/fees-row/components/fees-row.layout.tsx
index 5bcec46c849..6c3eff8bac4 100644
--- a/src/app/components/fees-row/components/fees-row.layout.tsx
+++ b/src/app/components/fees-row/components/fees-row.layout.tsx
@@ -23,7 +23,7 @@ export function FeesRowLayout(props: FeesRowLayoutProps) {
   const [_, meta] = useField('fee');
 
   return (
-    <HStack gap="space.04" width="100%" {...rest}>
+    <HStack gap="space.04" width="100%" {...rest} flexWrap="wrap">
       <HStack alignItems="center" justifyContent="space-between" position="relative" width="100%">
         <HStack alignItems="center" width="100%">
           <Tooltip label={feesInfo} placement="bottom">
@@ -39,7 +39,7 @@ export function FeesRowLayout(props: FeesRowLayoutProps) {
         {feeField}
       </HStack>
       {isSponsored && <SponsoredLabel />}
-      {!meta.error && fieldWarning && <WarningLabel>{fieldWarning}</WarningLabel>}
+      {!meta.error && fieldWarning && <WarningLabel width="100%">{fieldWarning}</WarningLabel>}
     </HStack>
   );
 }
diff --git a/src/app/features/collectibles/components/_collectible-types/collectible-audio.tsx b/src/app/features/collectibles/components/_collectible-types/collectible-audio.tsx
new file mode 100644
index 00000000000..3688d5b3037
--- /dev/null
+++ b/src/app/features/collectibles/components/_collectible-types/collectible-audio.tsx
@@ -0,0 +1,19 @@
+import { ReactNode } from 'react';
+
+import { AudioIcon } from '@app/ui/components/icons/audio-icon';
+
+import { CollectibleItemLayout, CollectibleItemLayoutProps } from '../collectible-item.layout';
+import { CollectiblePlaceholderLayout } from './collectible-placeholder.layout';
+
+interface CollectibleAudioProps extends Omit<CollectibleItemLayoutProps, 'children'> {
+  icon: ReactNode;
+}
+export function CollectibleAudio({ icon, ...props }: CollectibleAudioProps) {
+  return (
+    <CollectibleItemLayout collectibleTypeIcon={icon} {...props}>
+      <CollectiblePlaceholderLayout>
+        <AudioIcon size="xl" />
+      </CollectiblePlaceholderLayout>
+    </CollectibleItemLayout>
+  );
+}
diff --git a/src/app/features/collectibles/components/_collectible-types/collectible-iframe.tsx b/src/app/features/collectibles/components/_collectible-types/collectible-iframe.tsx
new file mode 100644
index 00000000000..4b413b68dda
--- /dev/null
+++ b/src/app/features/collectibles/components/_collectible-types/collectible-iframe.tsx
@@ -0,0 +1,35 @@
+import { ReactNode, useState } from 'react';
+
+import { Iframe } from '@app/ui/components/iframe';
+
+import { CollectibleItemLayout, CollectibleItemLayoutProps } from '../collectible-item.layout';
+import { ImageUnavailable } from '../image-unavailable';
+
+interface CollectibleIframeProps extends Omit<CollectibleItemLayoutProps, 'children'> {
+  icon: ReactNode;
+  src: string;
+}
+export function CollectibleIframe({ icon, src, ...props }: CollectibleIframeProps) {
+  const [isError, setIsError] = useState(false);
+
+  if (isError)
+    return (
+      <CollectibleItemLayout collectibleTypeIcon={icon} {...props}>
+        <ImageUnavailable />
+      </CollectibleItemLayout>
+    );
+
+  return (
+    <CollectibleItemLayout collectibleTypeIcon={icon} {...props}>
+      <Iframe
+        aspectRatio="1 / 1"
+        height="100%"
+        objectFit="cover"
+        onError={() => setIsError(true)}
+        src={src}
+        width="100%"
+        zIndex={99}
+      />
+    </CollectibleItemLayout>
+  );
+}
diff --git a/src/app/features/collectibles/components/_collectible-types/collectible-image.tsx b/src/app/features/collectibles/components/_collectible-types/collectible-image.tsx
index d7cf6503ab2..4033ff021a3 100644
--- a/src/app/features/collectibles/components/_collectible-types/collectible-image.tsx
+++ b/src/app/features/collectibles/components/_collectible-types/collectible-image.tsx
@@ -1,11 +1,11 @@
-import { useState } from 'react';
+import { ReactNode, useState } from 'react';
 
 import { CollectibleItemLayout, CollectibleItemLayoutProps } from '../collectible-item.layout';
 import { ImageUnavailable } from '../image-unavailable';
 
 interface CollectibleImageProps extends Omit<CollectibleItemLayoutProps, 'children'> {
   alt?: string;
-  icon: React.JSX.Element;
+  icon: ReactNode;
   src: string;
 }
 export function CollectibleImage(props: CollectibleImageProps) {
diff --git a/src/app/features/collectibles/components/_collectible-types/collectible-placeholder.layout.tsx b/src/app/features/collectibles/components/_collectible-types/collectible-placeholder.layout.tsx
new file mode 100644
index 00000000000..6961363e795
--- /dev/null
+++ b/src/app/features/collectibles/components/_collectible-types/collectible-placeholder.layout.tsx
@@ -0,0 +1,19 @@
+import { Flex } from 'leather-styles/jsx';
+
+import { HasChildren } from '@app/common/has-children';
+
+export function CollectiblePlaceholderLayout({ children }: HasChildren) {
+  return (
+    <Flex
+      alignItems="center"
+      bg="accent.component-background-default"
+      flexDirection="column"
+      height="100%"
+      justifyContent="center"
+      textAlign="center"
+      width="100%"
+    >
+      {children}
+    </Flex>
+  );
+}
diff --git a/src/app/features/collectibles/components/bitcoin/inscription.tsx b/src/app/features/collectibles/components/bitcoin/inscription.tsx
index 64d7259da73..01be874ac9a 100644
--- a/src/app/features/collectibles/components/bitcoin/inscription.tsx
+++ b/src/app/features/collectibles/components/bitcoin/inscription.tsx
@@ -7,6 +7,8 @@ import { openInNewTab } from '@app/common/utils/open-in-new-tab';
 import { convertInscriptionToSupportedInscriptionType } from '@app/query/bitcoin/ordinals/inscription.hooks';
 import { OrdinalIcon } from '@app/ui/components/icons/ordinal-icon';
 
+import { CollectibleAudio } from '../_collectible-types/collectible-audio';
+import { CollectibleIframe } from '../_collectible-types/collectible-iframe';
 import { CollectibleImage } from '../_collectible-types/collectible-image';
 import { CollectibleOther } from '../_collectible-types/collectible-other';
 import { InscriptionText } from './inscription-text';
@@ -26,7 +28,32 @@ export function Inscription({ rawInscription }: InscriptionProps) {
   }
 
   switch (inscription.type) {
-    case 'image': {
+    case 'audio':
+      return (
+        <CollectibleAudio
+          icon={<OrdinalIcon size="lg" />}
+          key={inscription.title}
+          onClickCallToAction={() => openInNewTab(inscription.infoUrl)}
+          onClickSend={() => openSendInscriptionModal()}
+          subtitle="Ordinal inscription"
+          title={`# ${inscription.number}`}
+        />
+      );
+    case 'html':
+    case 'svg':
+    case 'video':
+      return (
+        <CollectibleIframe
+          icon={<OrdinalIcon size="lg" />}
+          key={inscription.title}
+          onClickCallToAction={() => openInNewTab(inscription.infoUrl)}
+          onClickSend={() => openSendInscriptionModal()}
+          src={inscription.src}
+          subtitle="Ordinal inscription"
+          title={`# ${inscription.number}`}
+        />
+      );
+    case 'image':
       return (
         <CollectibleImage
           icon={<OrdinalIcon size="lg" />}
@@ -38,8 +65,7 @@ export function Inscription({ rawInscription }: InscriptionProps) {
           title={`# ${inscription.number}`}
         />
       );
-    }
-    case 'text': {
+    case 'text':
       return (
         <InscriptionText
           contentSrc={inscription.contentSrc}
@@ -48,8 +74,7 @@ export function Inscription({ rawInscription }: InscriptionProps) {
           onClickSend={() => openSendInscriptionModal()}
         />
       );
-    }
-    case 'other': {
+    case 'other':
       return (
         <CollectibleOther
           key={inscription.title}
@@ -61,9 +86,7 @@ export function Inscription({ rawInscription }: InscriptionProps) {
           <OrdinalIcon />
         </CollectibleOther>
       );
-    }
-    default: {
+    default:
       return null;
-    }
   }
 }
diff --git a/src/app/features/collectibles/components/collectible-hover.tsx b/src/app/features/collectibles/components/collectible-hover.tsx
index d749908879a..bccbd5501e8 100644
--- a/src/app/features/collectibles/components/collectible-hover.tsx
+++ b/src/app/features/collectibles/components/collectible-hover.tsx
@@ -1,9 +1,11 @@
+import { ReactNode } from 'react';
+
 import { Box, styled } from 'leather-styles/jsx';
 
 import { ArrowUpIcon } from '@app/ui/components/icons/arrow-up-icon';
 
 interface CollectibleHoverProps {
-  collectibleTypeIcon?: React.JSX.Element;
+  collectibleTypeIcon?: ReactNode;
   isHovered: boolean;
   onClickCallToAction?(): void;
 }
@@ -24,9 +26,15 @@ export function CollectibleHover({
       style={{ opacity: isHovered ? 'inherit' : '0' }}
       top="0px"
       width="100%"
-      zIndex={999}
     >
-      <Box bottom="space.03" height="30px" left="space.03" position="absolute" width="30px">
+      <Box
+        bottom="space.03"
+        height="30px"
+        left="space.03"
+        position="absolute"
+        width="30px"
+        zIndex={999}
+      >
         {collectibleTypeIcon}
       </Box>
       {onClickCallToAction && (
@@ -48,6 +56,7 @@ export function CollectibleHover({
           top="12px"
           type="button"
           width="30px"
+          zIndex={999}
         >
           <ArrowUpIcon transform="rotate(45deg)" />
         </styled.button>
diff --git a/src/app/features/collectibles/components/collectible-item.layout.tsx b/src/app/features/collectibles/components/collectible-item.layout.tsx
index 636389aeece..e9fba20bc5a 100644
--- a/src/app/features/collectibles/components/collectible-item.layout.tsx
+++ b/src/app/features/collectibles/components/collectible-item.layout.tsx
@@ -12,7 +12,7 @@ export interface CollectibleItemLayoutProps {
   onClickCallToAction?(): void;
   onClickLayout?(): void;
   onClickSend?(): void;
-  collectibleTypeIcon?: React.JSX.Element;
+  collectibleTypeIcon?: ReactNode;
   showBorder?: boolean;
   subtitle: string;
   title: string;
diff --git a/src/app/features/collectibles/components/image-unavailable.tsx b/src/app/features/collectibles/components/image-unavailable.tsx
index 7997acece61..244292196c2 100644
--- a/src/app/features/collectibles/components/image-unavailable.tsx
+++ b/src/app/features/collectibles/components/image-unavailable.tsx
@@ -1,21 +1,16 @@
-import { Flex, styled } from 'leather-styles/jsx';
+import { styled } from 'leather-styles/jsx';
 
 import { EyeSlashIcon } from '@app/ui/components/icons/eye-slash-icon';
 
+import { CollectiblePlaceholderLayout } from './_collectible-types/collectible-placeholder.layout';
+
 export function ImageUnavailable() {
   return (
-    <Flex
-      alignItems="center"
-      bg="accent.component-background-default"
-      flexDirection="column"
-      height="100%"
-      justifyContent="center"
-      textAlign="center"
-      width="100%"
-    >
-      <EyeSlashIcon pb="12px" size="md" />
-      <styled.span textStyle="label.03">Image currently</styled.span>
-      <styled.span textStyle="label.03">unavailable</styled.span>
-    </Flex>
+    <CollectiblePlaceholderLayout>
+      <EyeSlashIcon size="md" />
+      <styled.span pt="space.02" px="space.04" textStyle="label.03">
+        Image currently unavailable
+      </styled.span>
+    </CollectiblePlaceholderLayout>
   );
 }
diff --git a/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts b/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts
index af7006ec376..e1f341f1315 100644
--- a/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts
+++ b/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts
@@ -9,11 +9,11 @@ function areAnyQueriesFetching(...args: number[]) {
 
 export function useIsFetchingCollectiblesRelatedQuery() {
   // Ordinal inscriptions
-  const n1 = useIsFetching([QueryPrefixes.TaprootAddressUtxosMetadata]);
-  const n2 = useIsFetching([QueryPrefixes.InscriptionFromUtxo]);
+  const n1 = useIsFetching([QueryPrefixes.TaprootAddressUtxos]);
+  const n2 = useIsFetching([QueryPrefixes.InscriptionsByAddress]);
   const n3 = useIsFetching([QueryPrefixes.InscriptionMetadata]);
   const n4 = useIsFetching([QueryPrefixes.OrdinalTextContent]);
-  const n5 = useIsFetching([QueryPrefixes.InscriptionFromTxid]);
+  const n5 = useIsFetching([QueryPrefixes.GetInscriptions]);
 
   // BNS
   const n6 = useIsFetching([QueryPrefixes.BnsNamesByAddress]);
diff --git a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
index cca9531c0f9..d1ef6ba0715 100644
--- a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
+++ b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
@@ -45,7 +45,7 @@ export function IncreaseFeeField(props: IncreaseFeeFieldProps): React.JSX.Elemen
           onSelectMultiplier={onSelectMultiplier}
         />
         <Flex>
-          <styled.label display="block" fontSize={1} fontWeight={500} mb="space.02" htmlFor="fee">
+          <styled.label display="block" textStyle="body.02" mb="space.02" htmlFor="fee">
             Fee
           </styled.label>
           <styled.input
diff --git a/src/app/features/message-signer/message-preview-box.tsx b/src/app/features/message-signer/message-preview-box.tsx
index 97bdfde186d..ea764c8ebdd 100644
--- a/src/app/features/message-signer/message-preview-box.tsx
+++ b/src/app/features/message-signer/message-preview-box.tsx
@@ -19,9 +19,7 @@ export function MessagePreviewBox({ message, hash }: MessageBoxProps) {
       <Stack
         bg="accent.background-primary"
         borderRadius="lg"
-        fontSize={2}
         gap="space.02"
-        lineHeight="1.6"
         px="space.05"
         py="space.05"
         overflowX="auto"
diff --git a/src/app/features/stacks-transaction-request/row.tsx b/src/app/features/stacks-transaction-request/row.tsx
index 4b6fed7fb97..5f8134de0b2 100644
--- a/src/app/features/stacks-transaction-request/row.tsx
+++ b/src/app/features/stacks-transaction-request/row.tsx
@@ -21,13 +21,7 @@ export function Row({ name, type, value }: RowProps): React.JSX.Element {
       {type?.toLowerCase() === 'principal' ? (
         <PrincipalValue address={value} />
       ) : (
-        <styled.span
-          display="block"
-          fontSize={2}
-          fontWeight={500}
-          lineHeight="1.6"
-          wordBreak="break-all"
-        >
+        <styled.span display="block" textStyle="body.02" wordBreak="break-all">
           {value}
         </styled.span>
       )}
diff --git a/src/app/pages/bitcoin-contract-list/bitcoin-contract-list.tsx b/src/app/pages/bitcoin-contract-list/bitcoin-contract-list.tsx
index 069ff293fa5..5f8766e5a95 100644
--- a/src/app/pages/bitcoin-contract-list/bitcoin-contract-list.tsx
+++ b/src/app/pages/bitcoin-contract-list/bitcoin-contract-list.tsx
@@ -12,14 +12,14 @@ import { BitcoinContractListItemLayout } from './components/bitcoin-contract-lis
 import { BitcoinContractListLayout } from './components/bitcoin-contract-list-layout';
 
 export function BitcoinContractList() {
-  const { getAllSignedBitcoinContracts } = useBitcoinContracts();
+  const { getAllActiveBitcoinContracts } = useBitcoinContracts();
   const [bitcoinContracts, setBitcoinContracts] = useState<BitcoinContractListItem[]>([]);
   const [isLoading, setLoading] = useState(true);
   const [isError, setError] = useState(false);
 
   useOnMount(() => {
     const fetchAndFormatBitcoinContracts = async () => {
-      const fetchedBitcoinContracts = await getAllSignedBitcoinContracts();
+      const fetchedBitcoinContracts = await getAllActiveBitcoinContracts();
       if (!fetchedBitcoinContracts) {
         setError(true);
         setLoading(false);
diff --git a/src/app/pages/home/components/account-actions.tsx b/src/app/pages/home/components/account-actions.tsx
index 6d3ac41225c..772ede5f61f 100644
--- a/src/app/pages/home/components/account-actions.tsx
+++ b/src/app/pages/home/components/account-actions.tsx
@@ -1,12 +1,15 @@
 import { useLocation, useNavigate } from 'react-router-dom';
 
+import { ChainID } from '@stacks/transactions';
 import { HomePageSelectors } from '@tests/selectors/home.selectors';
 import { Flex, FlexProps } from 'leather-styles/jsx';
 
 import { RouteUrls } from '@shared/route-urls';
 
+import { whenStacksChainId } from '@app/common/utils';
 import { useConfigBitcoinEnabled } from '@app/query/common/remote-config/remote-config.query';
 import { useCurrentStacksAccount } from '@app/store/accounts/blockchain/stacks/stacks-account.hooks';
+import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 import { ArrowDownIcon } from '@app/ui/components/icons/arrow-down-icon';
 import { PlusIcon } from '@app/ui/components/icons/plus-icon';
 import { SwapIcon } from '@app/ui/components/icons/swap-icon';
@@ -19,6 +22,7 @@ export function AccountActions(props: FlexProps) {
   const location = useLocation();
   const isBitcoinEnabled = useConfigBitcoinEnabled();
   const stacksAccount = useCurrentStacksAccount();
+  const currentNetwork = useCurrentNetwork();
 
   const receivePath = isBitcoinEnabled
     ? RouteUrls.Receive
@@ -42,13 +46,17 @@ export function AccountActions(props: FlexProps) {
           onClick={() => navigate(RouteUrls.FundChooseCurrency)}
         />
       )}
-
-      <ActionButton
-        data-testid={HomePageSelectors.SwapBtn}
-        icon={<SwapIcon />}
-        label="Swap"
-        onClick={() => navigate(RouteUrls.Swap)}
-      />
+      {whenStacksChainId(currentNetwork.chain.stacks.chainId)({
+        [ChainID.Mainnet]: (
+          <ActionButton
+            data-testid={HomePageSelectors.SwapBtn}
+            icon={<SwapIcon />}
+            label="Swap"
+            onClick={() => navigate(RouteUrls.Swap)}
+          />
+        ),
+        [ChainID.Testnet]: null,
+      })}
     </Flex>
   );
 }
diff --git a/src/app/pages/onboarding/sign-in/mnemonic-form.tsx b/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
index 594cc3e95e1..56b148ed5d8 100644
--- a/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
+++ b/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
@@ -96,7 +96,7 @@ export function MnemonicForm({ mnemonic, setMnemonic, twentyFourWordMode }: Mnem
               <LeatherButton
                 data-testid={OnboardingSelectors.SignInBtn}
                 aria-disabled={isLoading || showMnemonicErrors}
-                disabled={isEmpty(touched) || !isValid}
+                disabled={isEmpty(touched) || !isValid || !hasFormValues}
                 aria-busy={isLoading}
                 width="100%"
                 type="submit"
diff --git a/src/app/pages/send/locked-bitcoin-summary/locked-bitcoin-summary.tsx b/src/app/pages/send/locked-bitcoin-summary/locked-bitcoin-summary.tsx
index 01b7a04145a..ec29dc4d14c 100644
--- a/src/app/pages/send/locked-bitcoin-summary/locked-bitcoin-summary.tsx
+++ b/src/app/pages/send/locked-bitcoin-summary/locked-bitcoin-summary.tsx
@@ -51,10 +51,9 @@ export function LockBitcoinSummary() {
         symbol={symbol}
         value={Number(satToBtc(txMoney.amount))}
       />
-      <styled.span fontSize={2} fontWeight={200} p="space.05" textAlign="justify">
-        <styled.span style={{ fontWeight: 500 }}>Success!</styled.span> Your bitcoin has been locked
-        securely. All that's left is for it to be confirmed on the blockchain. After confirmation,
-        you can proceed with borrowing against it.
+      <styled.span textStyle="body.02" p="space.05" textAlign="justify">
+        <b>Success!</b> Your bitcoin has been locked securely. All that's left is for it to be
+        confirmed on the blockchain. After confirmation, you can proceed with borrowing against it.
       </styled.span>
       <InfoCardFooter>
         <HStack gap="space.04" width="100%">
diff --git a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
index 8814d761f5f..8e0ea15e638 100644
--- a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
+++ b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
@@ -1,7 +1,7 @@
 import { Outlet, useLocation } from 'react-router-dom';
 
 import { Form, Formik } from 'formik';
-import { Box } from 'leather-styles/jsx';
+import { Box, styled } from 'leather-styles/jsx';
 import get from 'lodash.get';
 
 import { openInNewTab } from '@app/common/utils/open-in-new-tab';
@@ -63,22 +63,20 @@ export function Brc20SendForm() {
                 />
                 <SelectedAssetField icon={<Brc20TokenIcon />} name={tick} symbol={tick} />
                 <InfoLabel title="Sending BRC-20 tokens requires two steps">
-                  {'1. Create transfer inscription with amount to send'}
-                  <br />
-                  {'2. Send transfer inscription to recipient of choice'}
-                  <br /> <br />
+                  <styled.ol mb="space.02">
+                    <li>1. Create transfer inscription with amount to send</li>
+                    <li>2. Send transfer inscription to recipient of choice</li>
+                  </styled.ol>
                   <LeatherButton
                     onClick={() => {
                       openInNewTab(
                         'https://leather.gitbook.io/guides/bitcoin/sending-brc-20-tokens'
                       );
                     }}
-                    fontSize={1}
-                    fontWeight={500}
-                    lineHeight="1.6"
+                    textStyle="body.02"
                     variant="link"
                   >
-                    {'Learn more'}
+                    Learn more
                   </LeatherButton>
                 </InfoLabel>
               </SendCryptoAssetFormLayout>
diff --git a/src/app/pages/send/sent-summary/brc20-sent-summary.tsx b/src/app/pages/send/sent-summary/brc20-sent-summary.tsx
index ae28aac03ee..559c5713804 100644
--- a/src/app/pages/send/sent-summary/brc20-sent-summary.tsx
+++ b/src/app/pages/send/sent-summary/brc20-sent-summary.tsx
@@ -1,6 +1,6 @@
 import { useLocation, useNavigate } from 'react-router-dom';
 
-import { HStack, Stack } from 'leather-styles/jsx';
+import { HStack, Stack, styled } from 'leather-styles/jsx';
 import get from 'lodash.get';
 
 import { createMoney } from '@shared/models/money.model';
@@ -57,19 +57,19 @@ export function Brc20SentSummary() {
 
       <Stack px="space.06" pb="space.06" width="100%">
         <InfoLabel mb="space.05" title="One more step is required to send tokens">
-          {`You'll need to send the transfer inscription to your recipient of choice from the home screen once its status changes to "Ready to send"`}
-          <br />
-          <br />
+          <styled.span mb="space.02">
+            You'll need to send the transfer inscription to your recipient of choice from the home
+            screen once its status changes to "Ready to send"
+          </styled.span>
+
           <LeatherButton
-            fontSize={1}
-            fontWeight={500}
-            lineHeight="1.6"
+            textStyle="body.02"
             onClick={() => {
               openInNewTab('https://leather.gitbook.io/guides/bitcoin/sending-brc-20-tokens');
             }}
             variant="link"
           >
-            {'Learn more'}
+            Learn more
           </LeatherButton>
         </InfoLabel>
         <InfoCardSeparator />
diff --git a/src/app/query/bitcoin/address/utxos-by-address.query.ts b/src/app/query/bitcoin/address/utxos-by-address.query.ts
index ced1322e951..61ac9a4da4d 100644
--- a/src/app/query/bitcoin/address/utxos-by-address.query.ts
+++ b/src/app/query/bitcoin/address/utxos-by-address.query.ts
@@ -4,6 +4,7 @@ import { getTaprootAddress } from '@shared/crypto/bitcoin/bitcoin.utils';
 
 import { createCounter } from '@app/common/utils/counter';
 import { AppUseQueryConfig } from '@app/query/query-config';
+import { QueryPrefixes } from '@app/query/query-prefixes';
 import { useCurrentAccountIndex } from '@app/store/accounts/account';
 import { useCurrentTaprootAccount } from '@app/store/accounts/blockchain/bitcoin/taproot-account.hooks';
 import { useBitcoinClient } from '@app/store/common/api-clients.hooks';
@@ -45,7 +46,7 @@ export function useTaprootAccountUtxosQuery() {
   const currentAccountIndex = useCurrentAccountIndex();
 
   return useQuery(
-    ['taproot-address-utxos-metadata', currentAccountIndex, network.id],
+    [QueryPrefixes.TaprootAddressUtxos, currentAccountIndex, network.id],
     async () => {
       let currentNumberOfAddressesWithoutOrdinals = 0;
       const addressIndexCounter = createCounter(0);
diff --git a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
index 4096b279438..fd3764aa92a 100644
--- a/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
+++ b/src/app/query/bitcoin/ordinals/brc20/brc20-tokens.query.ts
@@ -60,7 +60,7 @@ async function fetchBrc20TokensByAddress(address: string): Promise<Brc20Token[]>
   });
 }
 
-export function useBrc20TokensQuery() {
+export function useGetBrc20TokensQuery() {
   const network = useCurrentNetwork();
   const nativeSegwitSigner = useCurrentAccountNativeSegwitIndexZeroSigner();
   const currentBitcoinAddress = nativeSegwitSigner.address;
@@ -79,7 +79,7 @@ export function useBrc20TokensQuery() {
     [createSigner]
   );
   const query = useInfiniteQuery({
-    queryKey: [QueryPrefixes.Brc20InfiniteQuery, currentBitcoinAddress, network.id],
+    queryKey: [QueryPrefixes.GetBrc20Tokens, currentBitcoinAddress, network.id],
     async queryFn({ pageParam }) {
       const fromIndex: number = pageParam?.fromIndex ?? 0;
       let addressesWithoutTokens = pageParam?.addressesWithoutTokens ?? 0;
diff --git a/src/app/query/bitcoin/ordinals/inscription.hooks.ts b/src/app/query/bitcoin/ordinals/inscription.hooks.ts
index 6c99bfab88e..c51b4362b9b 100644
--- a/src/app/query/bitcoin/ordinals/inscription.hooks.ts
+++ b/src/app/query/bitcoin/ordinals/inscription.hooks.ts
@@ -11,27 +11,59 @@ export function createInscriptionInfoUrl(id: string) {
   return `https://ordinals.hiro.so/inscription/${id}`;
 }
 
+function createIframePreviewUrl(id: string) {
+  return `https://ordinals.com/preview/${id}`;
+}
+
 export function convertInscriptionToSupportedInscriptionType(inscription: Inscription) {
   const title = `Inscription ${inscription.number}`;
   return whenInscriptionType<SupportedInscription>(inscription.content_type, {
+    audio: () => ({
+      infoUrl: createInscriptionInfoUrl(inscription.id),
+      src: createIframePreviewUrl(inscription.id),
+      title,
+      type: 'audio',
+      ...inscription,
+    }),
+    html: () => ({
+      infoUrl: createInscriptionInfoUrl(inscription.id),
+      src: createIframePreviewUrl(inscription.id),
+      title,
+      type: 'html',
+      ...inscription,
+    }),
     image: () => ({
       infoUrl: createInscriptionInfoUrl(inscription.id),
       src: `${HIRO_INSCRIPTIONS_API_URL}/${inscription.id}/content`,
+      title,
       type: 'image',
+      ...inscription,
+    }),
+    svg: () => ({
+      infoUrl: createInscriptionInfoUrl(inscription.id),
+      src: createIframePreviewUrl(inscription.id),
       title,
+      type: 'svg',
       ...inscription,
     }),
     text: () => ({
       contentSrc: `${HIRO_INSCRIPTIONS_API_URL}/${inscription.id}/content`,
       infoUrl: createInscriptionInfoUrl(inscription.id),
+      title,
       type: 'text',
+      ...inscription,
+    }),
+    video: () => ({
+      infoUrl: createInscriptionInfoUrl(inscription.id),
+      src: createIframePreviewUrl(inscription.id),
       title,
+      type: 'video',
       ...inscription,
     }),
     other: () => ({
       infoUrl: createInscriptionInfoUrl(inscription.id),
-      type: 'other',
       title,
+      type: 'other',
       ...inscription,
     }),
   });
diff --git a/src/app/query/bitcoin/ordinals/inscriptions.query.ts b/src/app/query/bitcoin/ordinals/inscriptions.query.ts
index 2759b6feee0..7d91fdfe325 100644
--- a/src/app/query/bitcoin/ordinals/inscriptions.query.ts
+++ b/src/app/query/bitcoin/ordinals/inscriptions.query.ts
@@ -76,7 +76,7 @@ export function useGetInscriptionsInfiniteQuery() {
   );
 
   const query = useInfiniteQuery({
-    queryKey: [QueryPrefixes.InscriptionsFromApiInfiniteQuery, currentBitcoinAddress, network.id],
+    queryKey: [QueryPrefixes.GetInscriptions, currentBitcoinAddress, network.id],
     async queryFn({ pageParam }: InfiniteQueryPageParam) {
       const responsesArr: InscriptionsQueryResponse[] = [];
       let fromIndex = pageParam?.fromIndex ?? 0;
@@ -179,7 +179,7 @@ export function useGetInscriptionsInfiniteQuery() {
     staleTime: 3 * 60 * 1000,
     refetchOnMount: false,
     refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
+    refetchOnWindowFocus: true,
   });
 
   return query;
diff --git a/src/app/query/query-prefixes.ts b/src/app/query/query-prefixes.ts
index b9114877d32..bf0602cb54a 100644
--- a/src/app/query/query-prefixes.ts
+++ b/src/app/query/query-prefixes.ts
@@ -5,17 +5,15 @@
 export enum QueryPrefixes {
   Brc20TokenBalance = 'brc20-token-balance',
   OrdinalTextContent = 'ordinal-text-content',
-  TaprootAddressUtxosMetadata = 'taproot-address-utxos-metadata',
-  InscriptionFromUtxo = 'inscription-from-utxo',
+  TaprootAddressUtxos = 'taproot-address-utxos',
   BnsNamesByAddress = 'bns-names-by-address',
   InscriptionsByAddress = 'inscriptions-by-address',
   InscriptionMetadata = 'inscription-metadata',
-  InscriptionFromTxid = 'inscription-from-txid',
-  InscriptionsFromApiInfiniteQuery = 'inscriptions-from-api-infinite-query',
+  GetInscriptions = 'get-inscriptions',
   GetNftMetadata = 'get-nft-metadata',
   GetNftHoldings = 'get-nft-holdings',
 
   StampCollection = 'stamp-collection',
   StampsByAddress = 'stamps-by-address',
-  Brc20InfiniteQuery = 'brc20-infinite-query',
+  GetBrc20Tokens = 'get-brc20-tokens',
 }
diff --git a/src/app/query/stacks/tokens/non-fungible-tokens/non-fungible-token-metadata.query.ts b/src/app/query/stacks/tokens/non-fungible-tokens/non-fungible-token-metadata.query.ts
index a6b986716db..2dbdbc2493e 100644
--- a/src/app/query/stacks/tokens/non-fungible-tokens/non-fungible-token-metadata.query.ts
+++ b/src/app/query/stacks/tokens/non-fungible-tokens/non-fungible-token-metadata.query.ts
@@ -12,7 +12,7 @@ import { NftAssetResponse } from '../token-metadata.utils';
 import useGetNonFungibleTokenHoldingsQuery from './non-fungible-token-holdings.query';
 
 const queryOptions = {
-  refetchOnWindowFocus: true,
+  refetchOnWindowFocus: false,
   refetchOnMount: false,
   staleTime: 10 * 1000,
 };
diff --git a/src/app/ui/components/icons/audio-icon.tsx b/src/app/ui/components/icons/audio-icon.tsx
new file mode 100644
index 00000000000..e688f824364
--- /dev/null
+++ b/src/app/ui/components/icons/audio-icon.tsx
@@ -0,0 +1,23 @@
+import { styled } from 'leather-styles/jsx';
+
+import { SvgProps } from '@app/ui/ui-types';
+
+export function AudioIcon({ size = 'sm', ...props }: SvgProps) {
+  return (
+    <styled.svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M9.9978 18.5C9.9978 19.8807 8.65466 21 6.9978 21C5.34095 21 3.9978 19.8807 3.9978 18.5C3.9978 17.1193 5.34095 16 6.9978 16C8.65466 16 9.9978 17.1193 9.9978 18.5ZM9.9978 18.5V6.74404C9.9978 6.30243 10.2875 5.91311 10.7105 5.78621L18.7105 3.38621C19.3521 3.19373 19.9978 3.67418 19.9978 4.34404V15.5M19.9978 15.5C19.9978 16.8807 18.6547 18 16.9978 18C15.3409 18 13.9978 16.8807 13.9978 15.5C13.9978 14.1193 15.3409 13 16.9978 13C18.6547 13 19.9978 14.1193 19.9978 15.5Z"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinejoin="round"
+      />
+    </styled.svg>
+  );
+}
diff --git a/src/app/ui/components/iframe.tsx b/src/app/ui/components/iframe.tsx
new file mode 100644
index 00000000000..17d5d46a3be
--- /dev/null
+++ b/src/app/ui/components/iframe.tsx
@@ -0,0 +1,34 @@
+//
+//  __          __     _____  _   _ _____ _   _  _____
+//  \ \        / /\   |  __ \| \ | |_   _| \ | |/ ____|
+//   \ \  /\  / /  \  | |__) |  \| | | | |  \| | |  __
+//    \ \/  \/ / /\ \ |  _  /| . ` | | | | . ` | | |_ |
+//     \  /\  / ____ \| | \ \| |\  |_| |_| |\  | |__| |
+//      \/  \/_/    \_\_|  \_\_| \_|_____|_| \_|\_____|
+//
+// The purpose of this iframe is to wrap content from external sources,
+// primarily for use with inscriptions. Iframes are dangerous and we
+// need to be very careful with our use of them.
+//
+// Below, we use the sandbox attribute to limit what they can do, as well as
+// disabling any interaction with pointer events and user selection.
+import { HTMLStyledProps, styled } from 'leather-styles/jsx';
+
+interface IframeProps extends HTMLStyledProps<'iframe'> {
+  onError(): void;
+  src: string;
+}
+export function Iframe({ onError, src, ...props }: IframeProps) {
+  return (
+    <styled.iframe
+      loading="lazy"
+      onError={onError}
+      overflow="hidden"
+      pointerEvents="none"
+      sandbox="allow-scripts"
+      src={src}
+      userSelect="none"
+      {...props}
+    />
+  );
+}
diff --git a/src/shared/models/inscription.model.ts b/src/shared/models/inscription.model.ts
index 0726a313f0d..0438799c8c5 100644
--- a/src/shared/models/inscription.model.ts
+++ b/src/shared/models/inscription.model.ts
@@ -35,7 +35,15 @@ export interface Inscription extends InscriptionResponseItem {
  * appropriately and securely. Inscriptions of types not ready to be handled by the
  * app should be classified as "other".
  */
-const supportedInscriptionTypes = ['image', 'text', 'other'] as const;
+const supportedInscriptionTypes = [
+  'audio',
+  'html',
+  'image',
+  'svg',
+  'text',
+  'video',
+  'other',
+] as const;
 
 type SupportedInscriptionType = (typeof supportedInscriptionTypes)[number];
 
@@ -49,16 +57,36 @@ interface BaseSupportedInscription extends Inscription {
   infoUrl: string;
 }
 
+interface AudioInscription extends BaseSupportedInscription {
+  type: 'audio';
+  src: string;
+}
+
+interface HtmlInscription extends BaseSupportedInscription {
+  type: 'html';
+  src: string;
+}
+
 interface ImageInscription extends BaseSupportedInscription {
   type: 'image';
   src: string;
 }
 
+interface SvgInscription extends BaseSupportedInscription {
+  type: 'svg';
+  src: string;
+}
+
 interface TextInscription extends BaseSupportedInscription {
   type: 'text';
   contentSrc: string;
 }
 
+interface VideoInscription extends BaseSupportedInscription {
+  type: 'video';
+  src: string;
+}
+
 interface OtherInscription extends BaseSupportedInscription {
   type: 'other';
 }
@@ -68,20 +96,43 @@ interface OtherInscription extends BaseSupportedInscription {
  * type. Typically, API data will be used to construct this object. This is
  * *not* the result of any one API response.
  */
-export type SupportedInscription = ImageInscription | TextInscription | OtherInscription;
+export type SupportedInscription =
+  | AudioInscription
+  | HtmlInscription
+  | ImageInscription
+  | SvgInscription
+  | TextInscription
+  | VideoInscription
+  | OtherInscription;
 
 export function whenInscriptionType<T>(
   mimeType: string,
   branches: { [k in SupportedInscriptionType]?: () => T }
 ) {
+  if (mimeType.startsWith('audio/') && branches.audio) {
+    return branches.audio();
+  }
+
+  if (mimeType.startsWith('text/html') && branches.html) {
+    return branches.html();
+  }
+
   if (mimeType.startsWith('image/') && branches.image) {
     return branches.image();
   }
 
+  if (mimeType.startsWith('image/svg') && branches.svg) {
+    return branches.svg();
+  }
+
   if (mimeType.startsWith('text') && branches.text) {
     return branches.text();
   }
 
+  if (mimeType.startsWith('video/') && branches.video) {
+    return branches.video();
+  }
+
   if (branches.other) return branches.other();
 
   throw new Error('Unhandled inscription type');
diff --git a/test-app/src/components/debugger.tsx b/test-app/src/components/debugger.tsx
index 074aaa7758d..5a886cc0acd 100644
--- a/test-app/src/components/debugger.tsx
+++ b/test-app/src/components/debugger.tsx
@@ -361,7 +361,7 @@ export const Debugger = () => {
       </styled.span>
       {txId && (
         <styled.span>
-          <styled.span color="green" fontSize={1} data-testid="status-message">
+          <styled.span color="green" textStyle="body.02" data-testid="status-message">
             Successfully broadcasted &quot;{txType}&quot;
           </styled.span>
           <ExplorerLink txId={txId} />
diff --git a/test-app/src/components/deploy.tsx b/test-app/src/components/deploy.tsx
index 5746eca4e8b..98358b0b95e 100644
--- a/test-app/src/components/deploy.tsx
+++ b/test-app/src/components/deploy.tsx
@@ -21,7 +21,7 @@ export const Deploy = () => {
     });
   return (
     <Box mb={6} maxWidth="600px" mt={6}>
-      <styled.h2 fontSize={5} mt={6}>
+      <styled.h2 textStyle="body.02" mt={6}>
         Contract Deploy
       </styled.h2>
       <styled.span display="block" my={4}>
diff --git a/test-app/src/components/home.tsx b/test-app/src/components/home.tsx
index d2d25365137..10fb3d70a40 100644
--- a/test-app/src/components/home.tsx
+++ b/test-app/src/components/home.tsx
@@ -72,7 +72,7 @@ export const Home: React.FC = () => {
 
   return (
     <Container>
-      <styled.h1 textStyle="display.large" fontSize={7} mb="space.05" display="block">
+      <styled.h1 textStyle="heading.01" mb="space.05" display="block">
         Testnet Demo
       </styled.h1>
       {state.userData ? <Page tab={tab} setTab={setTab} /> : <Auth />}
diff --git a/test-app/src/components/profile.tsx b/test-app/src/components/profile.tsx
index 5940cf53a69..a8b9023fa7c 100644
--- a/test-app/src/components/profile.tsx
+++ b/test-app/src/components/profile.tsx
@@ -39,7 +39,7 @@ export const Profile = () => {
     <Box py={6}>
       {updatedProfile && (
         <styled.span textStyle="body.large" display="block" my="space.04">
-          <styled.span color="green" fontSize={1}>
+          <styled.span color="green">
             Profile {updatedProfile.profile ? 'successfully ' : 'not'} updated
           </styled.span>
           <styled.span>
diff --git a/test-app/src/components/signature.tsx b/test-app/src/components/signature.tsx
index c0a3e89816d..566e45776df 100644
--- a/test-app/src/components/signature.tsx
+++ b/test-app/src/components/signature.tsx
@@ -191,8 +191,7 @@ export const Signature = () => {
     <Box py={6}>
       {(signature || signatureStructured) && (
         <styled.span textStyle="body.large" display="block" my="space.04">
-          <styled.span color="green" fontSize={1}>
-            {' '}
+          <styled.span color="green">
             Signature {signatureIsVerified ? 'successfully ' : 'not'} verified
           </styled.span>
         </styled.span>
diff --git a/test-app/src/components/status.tsx b/test-app/src/components/status.tsx
index a6c7bd4e887..070877833dd 100644
--- a/test-app/src/components/status.tsx
+++ b/test-app/src/components/status.tsx
@@ -177,7 +177,7 @@ export const Status = () => {
       )}
 
       {error && (
-        <styled.span display="block" color="red" width="100%" fontSize={1} mt={2}>
+        <styled.span display="block" color="red" width="100%" mt={2}>
           {error}
         </styled.span>
       )}
diff --git a/tests/page-object-models/swap.page.ts b/tests/page-object-models/swap.page.ts
index 4ccad05b853..fc79e698690 100644
--- a/tests/page-object-models/swap.page.ts
+++ b/tests/page-object-models/swap.page.ts
@@ -4,27 +4,22 @@ import { createTestSelector } from '@tests/utils';
 
 export class SwapPage {
   readonly page: Page;
-  readonly chooseAssetList: Locator;
-  readonly chooseAssetListItem: Locator;
-  readonly selectAssetBtn: Locator;
-  readonly swapAmountInput: Locator;
   readonly swapBtn: Locator;
   readonly swapDetailsAmount: Locator;
   readonly swapDetailsProtocol: Locator;
   readonly swapDetailsSymbol: Locator;
-  readonly swapReviewBtn: Locator;
+  readonly chooseAssetList = createTestSelector(SwapSelectors.ChooseAssetList);
+  readonly chooseAssetListItem = createTestSelector(SwapSelectors.ChooseAssetListItem);
+  readonly selectAssetBtn = createTestSelector(SwapSelectors.SelectAssetTriggerBtn);
+  readonly swapAmountInput = createTestSelector(SwapSelectors.SwapAmountInput);
+  readonly swapReviewBtn = createTestSelector(SwapSelectors.SwapReviewBtn);
 
   constructor(page: Page) {
     this.page = page;
-    this.chooseAssetList = page.getByTestId(SwapSelectors.ChooseAssetList);
-    this.chooseAssetListItem = page.getByTestId(SwapSelectors.ChooseAssetListItem);
-    this.selectAssetBtn = page.getByTestId(SwapSelectors.SelectAssetTriggerBtn);
-    this.swapAmountInput = page.getByTestId(SwapSelectors.SwapAmountInput);
     this.swapBtn = page.getByTestId(SwapSelectors.SwapBtn);
     this.swapDetailsAmount = page.getByTestId(SwapSelectors.SwapDetailsAmount);
     this.swapDetailsProtocol = page.getByTestId(SwapSelectors.SwapDetailsProtocol);
     this.swapDetailsSymbol = page.getByTestId(SwapSelectors.SwapDetailsSymbol);
-    this.swapReviewBtn = page.getByTestId(SwapSelectors.SwapReviewBtn);
   }
 
   async waitForSwapPageReady() {
@@ -34,11 +29,16 @@ export class SwapPage {
   }
 
   async selectAssetToReceive() {
-    const swapAssetSelectors = await this.selectAssetBtn.all();
+    const swapAssetSelectors = await this.page.locator(this.selectAssetBtn).all();
     await swapAssetSelectors[1].click();
-    await this.chooseAssetList.waitFor();
-    const swapAssets = await this.chooseAssetListItem.all();
+    await this.page.locator(this.chooseAssetList).waitFor();
+    const swapAssets = await this.page.locator(this.chooseAssetListItem).all();
     await swapAssets[0].click();
-    await this.swapReviewBtn.click();
+    await this.page.locator(this.swapReviewBtn).click();
+  }
+
+  async inputSwapAmountFrom() {
+    const swapAmountInputs = await this.page.locator(this.swapAmountInput).all();
+    await swapAmountInputs[0].fill('1');
   }
 }
diff --git a/tests/specs/rpc-stacks-transaction/transaction-signing.spec.ts b/tests/specs/rpc-stacks-transaction/transaction-signing.spec.ts
index bde52856f5f..b5eefa57cf0 100644
--- a/tests/specs/rpc-stacks-transaction/transaction-signing.spec.ts
+++ b/tests/specs/rpc-stacks-transaction/transaction-signing.spec.ts
@@ -53,6 +53,7 @@ test.describe('Transaction signing', () => {
     const multiSignatureTxHex = await generateMultisigUnsignedStxTransfer(
       TEST_ACCOUNT_2_STX_ADDRESS,
       amount,
+      100,
       'mainnet',
       [TEST_ACCOUNT_3_PUBKEY, TEST_ACCOUNT_1_PUBKEY],
       2,
diff --git a/tests/specs/swap/swap.spec.ts b/tests/specs/swap/swap.spec.ts
index 66e4c44747b..ede953fa972 100644
--- a/tests/specs/swap/swap.spec.ts
+++ b/tests/specs/swap/swap.spec.ts
@@ -1,12 +1,12 @@
 import { test } from '../../fixtures/fixtures';
 
 const alexSdkPostRoute = 'https://*.alexlab.co/v1/graphql';
+const hiroApiPostRoute = '*/**/v2/transactions';
 
 test.describe('Swaps', () => {
   test.beforeEach(async ({ extensionId, globalPage, homePage, onboardingPage, swapPage }) => {
     await globalPage.setupAndUseApiCalls(extensionId);
     await onboardingPage.signInWithTestAccount(extensionId);
-    await homePage.enableTestMode();
     await homePage.swapButton.click();
     await swapPage.waitForSwapPageReady();
   });
@@ -16,8 +16,7 @@ test.describe('Swaps', () => {
   });
 
   test('that it shows correct swap review details', async ({ swapPage }) => {
-    const swapAmountInputs = await swapPage.swapAmountInput.all();
-    await swapAmountInputs[0].fill('1');
+    await swapPage.inputSwapAmountFrom();
     await swapPage.selectAssetToReceive();
 
     const swapProtocol = await swapPage.swapDetailsProtocol.innerText();
@@ -37,14 +36,22 @@ test.describe('Swaps', () => {
   });
 
   test('that the swap is broadcast', async ({ swapPage }) => {
-    const requestPromise = swapPage.page.waitForRequest(alexSdkPostRoute);
-
-    await swapPage.page.route(alexSdkPostRoute, async route => {
-      await route.abort();
-    });
-
-    const swapAmountInputs = await swapPage.swapAmountInput.all();
-    await swapAmountInputs[0].fill('1');
+    let requestPromise;
+    const isSponsoredSwap = swapPage.page.getByText('Sponsored');
+
+    if (isSponsoredSwap) {
+      requestPromise = swapPage.page.waitForRequest(alexSdkPostRoute);
+      await swapPage.page.route(alexSdkPostRoute, async route => {
+        await route.abort();
+      });
+    } else {
+      requestPromise = swapPage.page.waitForRequest(hiroApiPostRoute);
+      await swapPage.page.route(alexSdkPostRoute, async route => {
+        await route.abort();
+      });
+    }
+
+    await swapPage.inputSwapAmountFrom();
     await swapPage.selectAssetToReceive();
 
     await swapPage.swapBtn.click();
diff --git a/tests/specs/transactions/transactions.spec.ts b/tests/specs/transactions/transactions.spec.ts
index 3d37d04f9d3..612750835af 100644
--- a/tests/specs/transactions/transactions.spec.ts
+++ b/tests/specs/transactions/transactions.spec.ts
@@ -15,13 +15,6 @@ test.describe('Transaction signing', () => {
 
     testAppPage = await TestAppPage.openDemoPage(context);
     await testAppPage.signIn();
-    const accountsPage = await context.waitForEvent('page');
-    await accountsPage.locator('text="Account 1"').click();
-    await testAppPage.page.bringToFront();
-    await testAppPage.page.click('text=Debugger', {
-      timeout: 30000,
-    });
-    await accountsPage.close();
   });
 
   // These tests often break if ran in parallel
@@ -31,6 +24,14 @@ test.describe('Transaction signing', () => {
     test('that it validates against insufficient funds when performing a contract call', async ({
       context,
     }) => {
+      const accountsPage = await context.waitForEvent('page');
+      await accountsPage.locator('text="Account 2"').click();
+      await testAppPage.page.bringToFront();
+      await testAppPage.page.click('text=Debugger', {
+        timeout: 30000,
+      });
+      await accountsPage.close();
+
       await testAppPage.clickContractCallButton();
       const transactionRequestPage = new TransactionRequestPage(await context.waitForEvent('page'));
       const error =
@@ -42,6 +43,14 @@ test.describe('Transaction signing', () => {
 
   test.describe('App initiated STX transfer', () => {
     test('that it broadcasts correctly with given fee and amount', async ({ context }) => {
+      const accountsPage = await context.waitForEvent('page');
+      await accountsPage.locator('text="Account 1"').click();
+      await testAppPage.page.bringToFront();
+      await testAppPage.page.click('text=Debugger', {
+        timeout: 30000,
+      });
+      await accountsPage.close();
+
       await testAppPage.clickStxTransferButton();
       const transactionRequestPage = new TransactionRequestPage(await context.waitForEvent('page'));
 
diff --git a/tests/utils.ts b/tests/utils.ts
index 4fd69f04390..26fa7d87fdf 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -45,6 +45,7 @@ export async function generateUnsignedStxTransfer(
 export async function generateMultisigUnsignedStxTransfer(
   recipient: string,
   amount: number,
+  fee: number,
   network: any,
   publicKeys: string[],
   threshold: number,
@@ -53,6 +54,7 @@ export async function generateMultisigUnsignedStxTransfer(
   memo?: string
 ) {
   const options = {
+    fee,
     recipient,
     memo,
     publicKeys,
diff --git a/yarn.lock b/yarn.lock
index ac7dec45539..b0a8cc32592 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -899,10 +899,10 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@dlc-link/dlc-tools@1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@dlc-link/dlc-tools/-/dlc-tools-1.0.9.tgz#3dfe1d743e9d5e309732e55c824ffbf77039f2bf"
-  integrity sha512-+lxe6nrZCbuUWcMR4l9X+axqR1yB7lgtjsrP6Pp23GRqSGL+wvts+L8wSCJxTi6rDhBKfGzvau3SLOPrha/3Rw==
+"@dlc-link/dlc-tools@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@dlc-link/dlc-tools/-/dlc-tools-1.1.1.tgz#01e2351babb70b352247cf8e0e20aac9724c4f35"
+  integrity sha512-+4RlBjqv3Ws9ndc9dP+SWS/GZ7j18T3TlpzgEblR/WB8pA0FAV2D8Faz+S32m7q6CXFogArZXc/IoyQ+bx3Wtg==
 
 "@dnd-kit/accessibility@^3.1.0":
   version "3.1.0"
@@ -12065,7 +12065,7 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
-is-unicode-supported@^1.1.0, is-unicode-supported@^1.2.0, is-unicode-supported@^1.3.0:
+is-unicode-supported@^1.1.0, is-unicode-supported@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
   integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==