diff --git a/.env.defaults b/.env.defaults
index 111fe231f2..161bd5cce2 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -4,9 +4,7 @@ BLOCKNATIVE_API_KEY="f60816ff-da02-463f-87a6-67a09c6d53fa"
 READ_REDUX_CACHE=true
 WRITE_REDUX_CACHE=true
 HIDE_EARN_PAGE=true
-HIDE_SEND_BUTTON=false
 HIDE_ADD_SEED=false
-HIDE_SWAP=false
 HIDE_IMPORT_DERIVATION_PATH=true
 HIDE_CREATE_PHRASE=false
 HIDE_IMPORT_LEDGER=false
@@ -18,4 +16,4 @@ USE_MAINNET_FORK=false
 MAINNET_FORK_URL="http://127.0.0.1:8545"
 MAINNET_FORK_CHAIN_ID=1337
 FILE_DIRECTORY_IPFS_HASH="QmYwYkRdYMBCtMqbimgaXjf7UL4RUb5zBQu4TDE67oZbq5"
-PART_GLOSSARY_IPFS_HASH="bafybeibytsozn7qsvqgecogv5urg5en34r7v3zxo326vacumi56ckah5b4"
\ No newline at end of file
+PART_GLOSSARY_IPFS_HASH="bafybeibytsozn7qsvqgecogv5urg5en34r7v3zxo326vacumi56ckah5b4"
diff --git a/background/features/features.ts b/background/features/features.ts
index bdc0692fdf..6db6ccb095 100644
--- a/background/features/features.ts
+++ b/background/features/features.ts
@@ -1,7 +1,5 @@
 export const HIDE_ADD_SEED = process.env.HIDE_ADD_SEED === "true"
-export const HIDE_SEND_BUTTON = process.env.HIDE_SEND_BUTTON === "true"
 export const HIDE_EARN_PAGE = process.env.HIDE_EARN_PAGE === "true"
-export const HIDE_SWAP = process.env.HIDE_SWAP === "true"
 export const HIDE_IMPORT_DERIVATION_PATH =
   process.env.HIDE_IMPORT_DERIVATION_PATH === "true"
 export const HIDE_CREATE_PHRASE = process.env.HIDE_CREATE_PHRASE === "true"
diff --git a/background/lib/logger.ts b/background/lib/logger.ts
index 60cae36cca..238d5289b5 100644
--- a/background/lib/logger.ts
+++ b/background/lib/logger.ts
@@ -81,7 +81,6 @@ function logLabelFromStackEntry(
     return stackEntry
       .split(WEBKIT_GECKO_DELIMITER)[0]
       .split(GECKO_MARKER)
-      .reverse()
       .filter((item) => item.replace(/(?:promise)?</, "").trim() !== "")
       .slice(-2)
       .join(".")
diff --git a/background/main.ts b/background/main.ts
index fdbd86c4d1..4dcf316d10 100644
--- a/background/main.ts
+++ b/background/main.ts
@@ -58,12 +58,12 @@ import {
   estimatedFeesPerGas,
   emitter as transactionConstructionSliceEmitter,
   transactionRequest,
-  signed,
   updateTransactionOptions,
   clearTransactionState,
   selectDefaultNetworkFeeSettings,
   TransactionConstructionStatus,
   rejectTransactionSignature,
+  transactionSigned,
 } from "./redux-slices/transaction-construction"
 import { allAliases } from "./redux-slices/utils"
 import {
@@ -117,7 +117,7 @@ const devToolsSanitizer = (input: unknown) => {
 
 // The version of persisted Redux state the extension is expecting. Any previous
 // state without this version, or with a lower version, ought to be migrated.
-const REDUX_STATE_VERSION = 5
+const REDUX_STATE_VERSION = 6
 
 type Migration = (prevState: Record<string, unknown>) => Record<string, unknown>
 
@@ -210,6 +210,13 @@ const REDUX_MIGRATIONS: { [version: number]: Migration } = {
     const { ...newState } = prevState
     newState.keyrings.keyringMetadata = {}
 
+    return newState
+  },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  6: (prevState: any) => {
+    const { ...newState } = prevState
+    newState.ledger.isArbitraryDataSigningEnabled = false
+
     return newState
   },
 }
@@ -731,14 +738,17 @@ export default class Main extends BaseService<never> {
             await this.chainService.populateEVMTransactionNonce(transaction)
 
           try {
-            const signedTx = await this.keyringService.signTransaction(
-              {
-                address: transaction.from,
-                network: this.chainService.ethereumNetwork,
-              },
-              transactionWithNonce
+            const signedTransactionResult =
+              await this.keyringService.signTransaction(
+                {
+                  address: transaction.from,
+                  network: this.chainService.ethereumNetwork,
+                },
+                transactionWithNonce
+              )
+            await this.store.dispatch(
+              transactionSigned(signedTransactionResult)
             )
-            this.store.dispatch(signed(signedTx))
           } catch (exception) {
             logger.error(
               "Error signing transaction; releasing nonce",
@@ -748,11 +758,11 @@ export default class Main extends BaseService<never> {
           }
         } else {
           try {
-            const signedTx = await this.signingService.signTransaction(
-              transaction,
-              method
+            const signedTransactionResult =
+              await this.signingService.signTransaction(transaction, method)
+            await this.store.dispatch(
+              transactionSigned(signedTransactionResult)
             )
-            this.store.dispatch(signed(signedTx))
           } catch (exception) {
             logger.error("Error signing transaction", exception)
             this.store.dispatch(
@@ -1015,9 +1025,11 @@ export default class Main extends BaseService<never> {
           }
         }
 
-        const resolveAndClear = (signedTransaction: SignedEVMTransaction) => {
+        const resolveAndClear = (
+          signedTransactionResult: SignedEVMTransaction
+        ) => {
           clear()
-          resolver(signedTransaction)
+          resolver(signedTransactionResult)
         }
 
         const rejectAndClear = () => {
diff --git a/background/redux-slices/0x-swap.ts b/background/redux-slices/0x-swap.ts
index 52db23d68c..417b459918 100644
--- a/background/redux-slices/0x-swap.ts
+++ b/background/redux-slices/0x-swap.ts
@@ -47,10 +47,6 @@ export const initialState: SwapState = {
   inProgressApprovalContract: undefined,
 }
 
-// The magic string used by the 0x API to signify we're dealing with ETH rather
-// than an ERC-20
-const ZEROX_ETH_SIGNIFIER = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
-
 const swapSlice = createSlice({
   name: "0x-swap",
   initialState,
@@ -132,7 +128,7 @@ const gatedHeaders: { [header: string]: string } =
 function build0xUrlFromSwapRequest(
   requestPath: string,
   { assets, amount, slippageTolerance, gasPrice }: SwapQuoteRequest,
-  additionalParameters?: Record<string, string>
+  additionalParameters: Record<string, string>
 ): URL {
   const requestUrl = new URL(`https://${zeroXApiBase}/swap/v1${requestPath}`)
   const tradeAmount = utils.parseUnits(
@@ -165,6 +161,16 @@ function build0xUrlFromSwapRequest(
     ...gatedParameters,
     ...additionalParameters,
   }).forEach(([parameter, value]) => {
+    // Do not set buyTokenPercentageFee if swapping to ETH. Currently the 0x
+    // `GET /quote` endpoint does not support a `sellTokenPercentageFee` and
+    // errors when passing in a `buyTokenPercentageFee` when the buy token is
+    // ETH.
+    if (
+      buyToken === "ETH" &&
+      (parameter === "buyTokenPercentageFee" || parameter === "feeRecipient")
+    ) {
+      return
+    }
     requestUrl.searchParams.set(parameter, value.toString())
   })
 
@@ -249,7 +255,7 @@ export const fetchSwapPrice = createBackgroundAsyncThunk(
     let needsApproval = false
     // If we aren't selling ETH, check whether we need an approval to swap
     // TODO Handle other non-ETH base assets
-    if (quote.sellTokenAddress !== ZEROX_ETH_SIGNIFIER) {
+    if (quote.allowanceTarget !== ethers.constants.AddressZero) {
       const assetContract = new ethers.Contract(
         quote.sellTokenAddress,
         ERC20_ABI,
diff --git a/background/redux-slices/assets.ts b/background/redux-slices/assets.ts
index 20ed06c5f3..849d62b9fd 100644
--- a/background/redux-slices/assets.ts
+++ b/background/redux-slices/assets.ts
@@ -1,7 +1,20 @@
 import { createSelector, createSlice } from "@reduxjs/toolkit"
-import { AnyAsset, PricePoint } from "../assets"
+import { ethers } from "ethers"
+import {
+  AnyAsset,
+  AnyAssetAmount,
+  isSmartContractFungibleAsset,
+  PricePoint,
+} from "../assets"
+import { AddressOnNetwork } from "../accounts"
 import { findClosestAssetIndex } from "../lib/asset-similarity"
 import { normalizeEVMAddress } from "../lib/utils"
+import { createBackgroundAsyncThunk } from "./utils"
+import { isNetworkBaseAsset } from "./utils/asset-utils"
+import { getProvider } from "./utils/contract-utils"
+import { sameNetwork } from "../networks"
+import { ERC20_INTERFACE } from "../lib/erc20"
+import logger from "../lib/logger"
 
 type SingleAssetState = AnyAsset & {
   prices: PricePoint[]
@@ -145,6 +158,72 @@ const selectPairedAssetSymbol = (
   pairedAssetSymbol: string
 ) => pairedAssetSymbol
 
+/**
+ * Executes an asset transfer between two addresses, for a set amount. Supports
+ * an optional fixed gas limit.
+ *
+ * If the from address is not a writeable address in the wallet, this signature
+ * will not be possible.
+ */
+export const transferAsset = createBackgroundAsyncThunk(
+  "assets/transferAsset",
+  async ({
+    fromAddressNetwork: { address: fromAddress, network: fromNetwork },
+    toAddressNetwork: { address: toAddress, network: toNetwork },
+    assetAmount,
+    gasLimit,
+  }: {
+    fromAddressNetwork: AddressOnNetwork
+    toAddressNetwork: AddressOnNetwork
+    assetAmount: AnyAssetAmount
+    gasLimit: bigint | undefined
+  }) => {
+    if (!sameNetwork(fromNetwork, toNetwork)) {
+      throw new Error("Only same-network transfers are supported for now.")
+    }
+
+    const provider = getProvider()
+    const signer = provider.getSigner()
+
+    if (isNetworkBaseAsset(assetAmount.asset, fromNetwork)) {
+      logger.debug(
+        `Sending ${assetAmount.amount} ${assetAmount.asset.symbol} from ` +
+          `${fromAddress} to ${toAddress} as a base asset transfer.`
+      )
+      await signer.sendTransaction({
+        from: fromAddress,
+        to: toAddress,
+        value: assetAmount.amount,
+        gasLimit,
+      })
+    } else if (isSmartContractFungibleAsset(assetAmount.asset)) {
+      logger.debug(
+        `Sending ${assetAmount.amount} ${assetAmount.asset.symbol} from ` +
+          `${fromAddress} to ${toAddress} as an ERC20 transfer.`
+      )
+      const token = new ethers.Contract(
+        assetAmount.asset.contractAddress,
+        ERC20_INTERFACE,
+        signer
+      )
+
+      const transactionDetails = await token.populateTransaction.transfer(
+        toAddress,
+        assetAmount.amount
+      )
+
+      await signer.sendUncheckedTransaction({
+        ...transactionDetails,
+        gasLimit: gasLimit ?? transactionDetails.gasLimit,
+      })
+    } else {
+      throw new Error(
+        "Only base and fungible smart contract asset transfers are supported for now."
+      )
+    }
+  }
+)
+
 /**
  * Selects a particular asset price point given the asset symbol and the paired
  * asset symbol used to price it.
diff --git a/background/redux-slices/transaction-construction.ts b/background/redux-slices/transaction-construction.ts
index c67b26b3f6..7258e0ac6c 100644
--- a/background/redux-slices/transaction-construction.ts
+++ b/background/redux-slices/transaction-construction.ts
@@ -47,10 +47,7 @@ export enum NetworkFeeTypeChosen {
 }
 export type TransactionConstruction = {
   status: TransactionConstructionStatus
-  // @TODO Check if this can still be both types
-  transactionRequest?:
-    | EIP1559TransactionRequest
-    | EnrichedEIP1559TransactionRequest
+  transactionRequest?: EnrichedEIP1559TransactionRequest
   signedTransaction?: SignedEVMTransaction
   broadcastOnSign?: boolean
   transactionLikelyFails?: boolean
@@ -106,13 +103,6 @@ export const signTransaction = createBackgroundAsyncThunk(
   }
 )
 
-export const broadcastSignedTransaction = createBackgroundAsyncThunk(
-  "transaction-construction/broadcast",
-  async (transaction: SignedEVMTransaction) => {
-    await emitter.emit("broadcastSignedTransaction", transaction)
-  }
-)
-
 const transactionSlice = createSlice({
   name: "transaction-construction",
   initialState,
@@ -252,6 +242,28 @@ export const {
 
 export default transactionSlice.reducer
 
+export const broadcastSignedTransaction = createBackgroundAsyncThunk(
+  "transaction-construction/broadcast",
+  async (transaction: SignedEVMTransaction) => {
+    await emitter.emit("broadcastSignedTransaction", transaction)
+  }
+)
+
+export const transactionSigned = createBackgroundAsyncThunk(
+  "transaction-construction/transaction-signed",
+  async (transaction: SignedEVMTransaction, { dispatch, getState }) => {
+    await dispatch(signed(transaction))
+
+    const { transactionConstruction } = getState() as {
+      transactionConstruction: TransactionConstruction
+    }
+
+    if (transactionConstruction.broadcastOnSign ?? false) {
+      await dispatch(broadcastSignedTransaction(transaction))
+    }
+  }
+)
+
 export const rejectTransactionSignature = createBackgroundAsyncThunk(
   "transaction-construction/reject",
   async (_, { dispatch }) => {
@@ -313,6 +325,12 @@ export const selectTransactionData = createSelector(
   (transactionRequestData) => transactionRequestData
 )
 
+export const selectIsTransactionPendingSignature = createSelector(
+  (state: { transactionConstruction: TransactionConstruction }) =>
+    state.transactionConstruction.status,
+  (status) => status === "loaded" || status === "pending"
+)
+
 export const selectIsTransactionLoaded = createSelector(
   (state: { transactionConstruction: TransactionConstruction }) =>
     state.transactionConstruction.status,
diff --git a/background/redux-slices/utils/asset-utils.ts b/background/redux-slices/utils/asset-utils.ts
index 3c6dec4753..1612ae9fb2 100644
--- a/background/redux-slices/utils/asset-utils.ts
+++ b/background/redux-slices/utils/asset-utils.ts
@@ -7,8 +7,10 @@ import {
   PricePoint,
   FungibleAsset,
   UnitPricePoint,
+  AnyAsset,
 } from "../../assets"
 import { fromFixedPointNumber } from "../../lib/fixed-point"
+import { AnyNetwork } from "../../networks"
 
 /**
  * Adds user-specific amounts based on preferences. This is the combination of
@@ -33,6 +35,28 @@ export type AssetDecimalAmount = {
   localizedDecimalAmount: string
 }
 
+/**
+ * Given an asset and a network, determines whether the given asset is the base
+ * asset for the given network. Used to special-case transactions that should
+ * work differently for base assets vs, for example, smart contract assets.
+ *
+ * @param asset The asset that could be a base asset for a network.
+ * @param network The network whose base asset `asset` should be checked against.
+ *
+ * @return True if the passed asset is the base asset for the passed network.
+ */
+export function isNetworkBaseAsset(
+  asset: AnyAsset,
+  network: AnyNetwork
+): boolean {
+  return (
+    !("homeNetwork" in asset) &&
+    "family" in network &&
+    network.family === "EVM" &&
+    asset.symbol === network.baseAsset.symbol
+  )
+}
+
 /**
  * Given an asset symbol, price as a JavaScript number, and a number of desired
  * decimals during formatting, format the price in a localized way as a
diff --git a/background/services/ledger/index.ts b/background/services/ledger/index.ts
index 4c921f3e44..c8b447b051 100644
--- a/background/services/ledger/index.ts
+++ b/background/services/ledger/index.ts
@@ -227,22 +227,23 @@ export default class LedgerService extends BaseService<Events> {
     this.onConnection(event.device.productId)
   }
 
-  #handleUSBDisconnect = async (event: USBConnectionEvent): Promise<void> => {
-    this.emitter.emit(
-      "usbDeviceCount",
-      (await navigator.usb.getDevices()).length
-    )
-    if (!this.#currentLedgerId) {
-      return
-    }
+  #handleUSBDisconnect =
+    async (/* event: USBConnectionEvent */): Promise<void> => {
+      this.emitter.emit(
+        "usbDeviceCount",
+        (await navigator.usb.getDevices()).length
+      )
+      if (!this.#currentLedgerId) {
+        return
+      }
 
-    this.emitter.emit("disconnected", {
-      id: this.#currentLedgerId,
-      type: LedgerType.LEDGER_NANO_S,
-    })
+      this.emitter.emit("disconnected", {
+        id: this.#currentLedgerId,
+        type: LedgerType.LEDGER_NANO_S,
+      })
 
-    this.#currentLedgerId = null
-  }
+      this.#currentLedgerId = null
+    }
 
   protected async internalStartService(): Promise<void> {
     await super.internalStartService() // Not needed, but better to stick to the patterns
diff --git a/background/tests/keyring-integration.test.ts b/background/tests/keyring-integration.test.ts
index ac037ee5be..095f488bd3 100644
--- a/background/tests/keyring-integration.test.ts
+++ b/background/tests/keyring-integration.test.ts
@@ -79,7 +79,7 @@ function expectBase64String(
 
 const mockAlarms = (mock: MockzillaDeep<Browser>) => {
   mock.alarms.create.mock(() => ({}))
-  mock.alarms.onAlarm.addListener.mock((_, __) => ({}))
+  mock.alarms.onAlarm.addListener.mock(() => ({}))
 }
 
 describe("KeyringService when uninitialized", () => {
diff --git a/provider-bridge-shared/eip-1193.ts b/provider-bridge-shared/eip-1193.ts
index c568c64fc5..af1fbcc57a 100644
--- a/provider-bridge-shared/eip-1193.ts
+++ b/provider-bridge-shared/eip-1193.ts
@@ -48,7 +48,7 @@ export class EIP1193Error extends Error {
     super(eip1193Error.message)
   }
 
-  toJSON() {
+  toJSON(): unknown {
     return this.eip1193Error
   }
 }
diff --git a/provider-bridge-shared/runtime-typechecks.ts b/provider-bridge-shared/runtime-typechecks.ts
index 38bbc16de3..2ca2909190 100644
--- a/provider-bridge-shared/runtime-typechecks.ts
+++ b/provider-bridge-shared/runtime-typechecks.ts
@@ -7,7 +7,7 @@ import {
   TallyAccountPayload,
 } from "./types"
 
-export function getType(arg: unknown) {
+export function getType(arg: unknown): string {
   return Object.prototype.toString.call(arg).slice("[object ".length, -1)
 }
 
diff --git a/ui/components/BrowserTab/BrowserTabContainer.tsx b/ui/components/BrowserTab/BrowserTabContainer.tsx
index 16610fc173..e131698040 100644
--- a/ui/components/BrowserTab/BrowserTabContainer.tsx
+++ b/ui/components/BrowserTab/BrowserTabContainer.tsx
@@ -11,7 +11,7 @@ export default function BrowserTabContainer({
       <style jsx>{`
         .container {
           height: 100%;
-          background: no-repeat 2rem 2rem / auto
+          background: no-repeat 2rem 2rem / 205px auto
               url("/images/logo_horizontal.svg"),
             no-repeat bottom / cover url("/images/tab_background.svg"),
             linear-gradient(to top, #10322f, var(--hunter-green) 100%);
diff --git a/ui/components/Core/CorePage.tsx b/ui/components/Core/CorePage.tsx
index 6aa217bce9..c63fdd4285 100644
--- a/ui/components/Core/CorePage.tsx
+++ b/ui/components/Core/CorePage.tsx
@@ -3,12 +3,11 @@ import Snackbar from "../Snackbar/Snackbar"
 
 interface Props {
   children: React.ReactNode
-  hasTabBar: boolean
   hasTopBar: boolean
 }
 
 export default function CorePage(props: Props): ReactElement {
-  const { children, hasTabBar, hasTopBar } = props
+  const { children, hasTopBar } = props
 
   return (
     <main>
@@ -26,7 +25,7 @@ export default function CorePage(props: Props): ReactElement {
             align-items: center;
             background-color: var(--hunter-green);
             z-index: 10;
-            height: ${hasTopBar && hasTabBar ? "480px" : "100vh"};
+            height: ${hasTopBar ? "480px" : "100vh"};
             margin-top: ${hasTopBar ? "0px" : "-64px"};
           }
           .top_menu_wrap {
@@ -40,6 +39,5 @@ export default function CorePage(props: Props): ReactElement {
 }
 
 CorePage.defaultProps = {
-  hasTabBar: true,
   hasTopBar: true,
 }
diff --git a/ui/components/NetworkFees/NetworkSettingsSelect.tsx b/ui/components/NetworkFees/NetworkSettingsSelect.tsx
index 73c2b5508a..7cd74ba841 100644
--- a/ui/components/NetworkFees/NetworkSettingsSelect.tsx
+++ b/ui/components/NetworkFees/NetworkSettingsSelect.tsx
@@ -12,8 +12,7 @@ import { weiToGwei } from "@tallyho/tally-background/lib/utils"
 import { ETH } from "@tallyho/tally-background/constants"
 import { PricePoint } from "@tallyho/tally-background/assets"
 import { enrichAssetAmountWithMainCurrencyValues } from "@tallyho/tally-background/redux-slices/utils/asset-utils"
-import logger from "@tallyho/tally-background/lib/logger"
-import SharedInput from "../Shared/SharedInput"
+import { SharedTypedInput } from "../Shared/SharedInput"
 import { useBackgroundSelector } from "../../hooks"
 import capitalize from "../../utils/capitalize"
 
@@ -201,25 +200,8 @@ export default function NetworkSettingsSelect({
     updateGasOptions()
   }, [updateGasOptions])
 
-  const setGasLimit = (newGasLimit: string) => {
-    try {
-      if (newGasLimit.trim() === "") {
-        onNetworkSettingsChange({
-          ...networkSettings,
-          gasLimit: undefined,
-        })
-      } else {
-        const parsedGasLimit = BigInt(newGasLimit)
-        if (parsedGasLimit >= 0n) {
-          onNetworkSettingsChange({
-            ...networkSettings,
-            gasLimit: parsedGasLimit,
-          })
-        }
-      }
-    } catch (error) {
-      logger.debug("Failed to parse network settings gas limit", newGasLimit)
-    }
+  const setGasLimit = (gasLimit: bigint | undefined) => {
+    onNetworkSettingsChange({ ...networkSettings, gasLimit })
   }
 
   return (
@@ -249,11 +231,28 @@ export default function NetworkSettingsSelect({
       })}
       <div className="info">
         <div className="limit">
-          <SharedInput
+          <SharedTypedInput
             id="gasLimit"
             value={networkSettings.gasLimit?.toString() ?? ""}
             placeholder={networkSettings.suggestedGasLimit?.toString() ?? ""}
             onChange={setGasLimit}
+            parseAndValidate={(value) => {
+              if (value.trim() === "") {
+                return { parsed: undefined }
+              }
+              try {
+                const parsed = BigInt(value)
+                if (parsed < 0n) {
+                  return {
+                    error: "Gas Limit must be greater than 0",
+                  }
+                }
+
+                return { parsed }
+              } catch (e) {
+                return { error: "Gas Limit must be a number" }
+              }
+            }}
             label="Gas limit"
             type="number"
             focusedLabelBackgroundColor="var(--green-95)"
diff --git a/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx b/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx
index 9c29d2a40e..2caf65f058 100644
--- a/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx
+++ b/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx
@@ -177,7 +177,6 @@ export default function OnboardingDerivationPathSelect({
       </SharedModal>
       <SharedSelect
         label="Derivation path"
-        placeholder="Add custom path"
         options={derivationPaths}
         onChange={onChange}
         defaultIndex={defaultIndex}
diff --git a/ui/components/Shared/SharedButton.tsx b/ui/components/Shared/SharedButton.tsx
index 7bc5999c47..c6a0af9680 100644
--- a/ui/components/Shared/SharedButton.tsx
+++ b/ui/components/Shared/SharedButton.tsx
@@ -25,6 +25,7 @@ interface Props {
   isDisabled?: boolean
   linkTo?: History.LocationDescriptor<unknown>
   showLoadingOnClick: boolean
+  isLoading: boolean
   isFormSubmit: boolean
 }
 
@@ -41,6 +42,7 @@ export default function SharedButton(props: Props): ReactElement {
     iconPosition,
     linkTo,
     showLoadingOnClick,
+    isLoading,
     isFormSubmit,
   } = props
 
@@ -68,7 +70,7 @@ export default function SharedButton(props: Props): ReactElement {
     }
   }
 
-  const isShowingLoadingSpinner = isClicked && showLoadingOnClick
+  const isShowingLoadingSpinner = isLoading || (isClicked && showLoadingOnClick)
 
   return (
     <button
@@ -317,5 +319,6 @@ SharedButton.defaultProps = {
   iconPosition: "right",
   linkTo: null,
   showLoadingOnClick: false,
+  isLoading: false,
   isFormSubmit: false,
 }
diff --git a/ui/components/Shared/SharedInput.tsx b/ui/components/Shared/SharedInput.tsx
index 62514ed624..e5d53fdf4a 100644
--- a/ui/components/Shared/SharedInput.tsx
+++ b/ui/components/Shared/SharedInput.tsx
@@ -1,23 +1,30 @@
-import React, { ReactElement, useEffect, useRef } from "react"
+import React, {
+  ChangeEventHandler,
+  ReactElement,
+  useEffect,
+  useRef,
+  useState,
+} from "react"
 import classNames from "classnames"
 import { useRunOnFirstRender } from "../../hooks"
 
-interface Props {
+interface Props<T> {
   id?: string
   label: string
   focusedLabelBackgroundColor: string
-  defaultValue?: string
+  defaultValue?: T
   placeholder?: string
   type: "password" | "text" | "number"
   value?: string | number | undefined
-  onChange?: (value: string) => void
+  onChange?: (value: T) => void
   onFocus?: () => void
   errorMessage?: string
   autoFocus?: boolean
   autoSelect?: boolean
+  parseAndValidate: (value: string) => { parsed: T } | { error: string }
 }
 
-export default function SharedInput(props: Props): ReactElement {
+export function SharedTypedInput<T = string>(props: Props<T>): ReactElement {
   const {
     id,
     label,
@@ -31,9 +38,10 @@ export default function SharedInput(props: Props): ReactElement {
     errorMessage,
     autoFocus = false,
     autoSelect = false,
+    parseAndValidate,
   } = props
-
   const inputRef = useRef<HTMLInputElement | null>(null)
+  const [parserError, setParserError] = useState<string | undefined>(undefined)
 
   useEffect(() => {
     if (autoFocus) inputRef.current?.focus()
@@ -49,6 +57,18 @@ export default function SharedInput(props: Props): ReactElement {
     }
   })
 
+  const onInputChange: ChangeEventHandler<HTMLInputElement> = ({
+    target: { value: inputValue },
+  }) => {
+    const result = parseAndValidate(inputValue)
+    if ("error" in result) {
+      setParserError(result.error)
+    } else {
+      setParserError(undefined)
+      onChange?.(result.parsed)
+    }
+  }
+
   return (
     <>
       <input
@@ -61,7 +81,7 @@ export default function SharedInput(props: Props): ReactElement {
         }
         value={value}
         spellCheck={false}
-        onChange={(event) => onChange?.(event.target.value)}
+        onChange={onInputChange}
         onFocus={onFocus}
         className={classNames({
           error: errorMessage,
@@ -70,6 +90,7 @@ export default function SharedInput(props: Props): ReactElement {
       />
       <label htmlFor={id}>{label}</label>
       {errorMessage && <div className="error_message">{errorMessage}</div>}
+      {parserError && <div className="error_message">{parserError}</div>}
       <style jsx>
         {`
           input {
@@ -132,7 +153,16 @@ export default function SharedInput(props: Props): ReactElement {
   )
 }
 
-SharedInput.defaultProps = {
+SharedTypedInput.defaultProps = {
   type: "text",
   focusedLabelBackgroundColor: "var(--hunter-green)",
 }
+
+export default function SharedInput(props: Props<string>): ReactElement {
+  return SharedTypedInput(props)
+}
+
+SharedInput.defaultProps = {
+  ...SharedTypedInput.defaultProps,
+  parseAndValidate: (v: string) => ({ parsed: v }),
+}
diff --git a/ui/components/Shared/SharedSelect.tsx b/ui/components/Shared/SharedSelect.tsx
index a1735247ec..fb5564f61d 100644
--- a/ui/components/Shared/SharedSelect.tsx
+++ b/ui/components/Shared/SharedSelect.tsx
@@ -15,7 +15,6 @@ type Props = {
   options: Option[] | string[]
   onChange: (value: string) => void
   defaultIndex?: number
-  placeholder?: string
   label?: string
   placement?: "top" | "bottom"
   triggerLabel?: string
@@ -29,7 +28,6 @@ export default function SharedSelect(props: Props): ReactElement {
     onChange,
     defaultIndex = 0,
     label,
-    placeholder,
     placement = "bottom",
     triggerLabel,
     onTrigger,
diff --git a/ui/components/SignTransaction/SignTransactionDetailPanel.tsx b/ui/components/SignTransaction/SignTransactionDetailPanel.tsx
index d9f5888b5e..10a7108c79 100644
--- a/ui/components/SignTransaction/SignTransactionDetailPanel.tsx
+++ b/ui/components/SignTransaction/SignTransactionDetailPanel.tsx
@@ -5,7 +5,6 @@ import {
   selectTransactionData,
   updateTransactionOptions,
 } from "@tallyho/tally-background/redux-slices/transaction-construction"
-import logger from "@tallyho/tally-background/lib/logger"
 import { useBackgroundDispatch, useBackgroundSelector } from "../../hooks"
 import FeeSettingsButton from "../NetworkFees/FeeSettingsButton"
 import NetworkSettingsChooser from "../NetworkFees/NetworkSettingsChooser"
diff --git a/ui/components/SignTransaction/SignTransactionTransferInfoProvider.tsx b/ui/components/SignTransaction/SignTransactionTransferInfoProvider.tsx
index a194585165..009369f125 100644
--- a/ui/components/SignTransaction/SignTransactionTransferInfoProvider.tsx
+++ b/ui/components/SignTransaction/SignTransactionTransferInfoProvider.tsx
@@ -1,7 +1,4 @@
-import {
-  truncateAddress,
-  truncateDecimalAmount,
-} from "@tallyho/tally-background/lib/utils"
+import { truncateDecimalAmount } from "@tallyho/tally-background/lib/utils"
 import { selectAssetPricePoint } from "@tallyho/tally-background/redux-slices/assets"
 import {
   getAssetsState,
@@ -38,10 +35,6 @@ export default function SignTransactionTransferInfoProvider({
     enrichAssetAmountWithMainCurrencyValues(assetAmount, assetPricePoint, 2)
       .localizedMainCurrencyAmount ?? "-"
 
-  const recipientAddressSpan = (
-    <span title={recipientAddress}>{truncateAddress(recipientAddress)}</span>
-  )
-
   return (
     <SignTransactionBaseInfoProvider
       title="Sign Transfer"
diff --git a/ui/components/SignTransaction/useSigningLedgerState.tsx b/ui/components/SignTransaction/useSigningLedgerState.tsx
index ea3afd5193..90ff5331af 100644
--- a/ui/components/SignTransaction/useSigningLedgerState.tsx
+++ b/ui/components/SignTransaction/useSigningLedgerState.tsx
@@ -32,7 +32,7 @@ export function useSigningLedgerState(
       case "available":
         return {
           state: "available",
-          arbitraryDataEnabled: device.isArbitraryDataSigningEnabled ?? false,
+          arbitraryDataEnabled: device?.isArbitraryDataSigningEnabled ?? false,
         }
       case "busy":
         return { state: "busy" }
diff --git a/ui/components/Swap/SwapQuote.tsx b/ui/components/Swap/SwapQuote.tsx
index 504c7b453d..491298afb9 100644
--- a/ui/components/Swap/SwapQuote.tsx
+++ b/ui/components/Swap/SwapQuote.tsx
@@ -7,10 +7,6 @@ import {
 } from "@tallyho/tally-background/redux-slices/0x-swap"
 import { useHistory } from "react-router-dom"
 import { FungibleAsset } from "@tallyho/tally-background/assets"
-import {
-  clearTransactionState,
-  TransactionConstructionStatus,
-} from "@tallyho/tally-background/redux-slices/transaction-construction"
 import SharedButton from "../Shared/SharedButton"
 import SharedActivityHeader from "../Shared/SharedActivityHeader"
 import SwapQuoteAssetCard from "./SwapQuoteAssetCard"
@@ -51,11 +47,7 @@ export default function SwapQuote({
   const handleConfirmClick = useCallback(async () => {
     const { gasPrice, ...quoteWithoutGasPrice } = finalQuote
 
-    // FIXME Set state to pending so SignTransaction doesn't redirect back; drop after
-    // FIXME proper transaction queueing is in effect.
-    await dispatch(clearTransactionState(TransactionConstructionStatus.Pending))
-
-    dispatch(
+    await dispatch(
       executeSwap({
         ...quoteWithoutGasPrice,
         gasPrice:
@@ -64,9 +56,7 @@ export default function SwapQuote({
       })
     )
 
-    history.push("/sign-transaction", {
-      redirectTo: { path: "/" },
-    })
+    history.push("/")
   }, [
     finalQuote,
     dispatch,
diff --git a/ui/components/Wallet/WalletAccountBalanceControl.tsx b/ui/components/Wallet/WalletAccountBalanceControl.tsx
index 3221021a3b..8af34eecf1 100644
--- a/ui/components/Wallet/WalletAccountBalanceControl.tsx
+++ b/ui/components/Wallet/WalletAccountBalanceControl.tsx
@@ -3,7 +3,6 @@ import classNames from "classnames"
 import { useDispatch } from "react-redux"
 import { refreshBackgroundPage } from "@tallyho/tally-background/redux-slices/ui"
 import { selectCurrentAccountSigningMethod } from "@tallyho/tally-background/redux-slices/selectors"
-import { HIDE_SEND_BUTTON } from "@tallyho/tally-background/features/features"
 import { useBackgroundSelector, useLocalStorage } from "../../hooks"
 import SharedButton from "../Shared/SharedButton"
 import SharedSlideUpMenu from "../Shared/SharedSlideUpMenu"
@@ -158,7 +157,7 @@ export default function WalletAccountBalanceControl(
           </span>
         </span>
         <div className="balance_actions">
-          {currentAccountSigningMethod && !HIDE_SEND_BUTTON ? (
+          {currentAccountSigningMethod ? (
             <>
               {hasSavedSeed ? (
                 <div className="send_receive_button_wrap">
diff --git a/ui/components/Wallet/WalletActivityDetails.tsx b/ui/components/Wallet/WalletActivityDetails.tsx
index 49ca7166fe..52f6133066 100644
--- a/ui/components/Wallet/WalletActivityDetails.tsx
+++ b/ui/components/Wallet/WalletActivityDetails.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, ReactElement } from "react"
 import { ActivityItem } from "@tallyho/tally-background/redux-slices/activities"
-import { truncateAddress } from "@tallyho/tally-background/lib/utils"
 import { getRecipient } from "@tallyho/tally-background/redux-slices/utils/activity-utils"
 import SharedButton from "../Shared/SharedButton"
 import SharedAddress from "../Shared/SharedAddress"
diff --git a/ui/components/Wallet/WalletAssetListItem.tsx b/ui/components/Wallet/WalletAssetListItem.tsx
index f67146e745..092b4eede7 100644
--- a/ui/components/Wallet/WalletAssetListItem.tsx
+++ b/ui/components/Wallet/WalletAssetListItem.tsx
@@ -26,10 +26,7 @@ export default function WalletAssetListItem(props: Props): ReactElement {
       <Link
         to={{
           pathname: "/singleAsset",
-          state: {
-            symbol: assetAmount.asset.symbol,
-            contractAddress,
-          },
+          state: assetAmount.asset,
         }}
       >
         <div className="wallet_asset_list_item">
@@ -60,18 +57,13 @@ export default function WalletAssetListItem(props: Props): ReactElement {
             </div>
           </div>
           <div className="right">
-            {!contractAddress && (
-              <Link
-                to={{
-                  pathname: "/send",
-                  state: {
-                    symbol: assetAmount.asset.symbol,
-                    contractAddress,
-                  },
-                }}
-                className="asset_list_item_icon asset_list_item_icon_send_asset"
-              />
-            )}
+            <Link
+              to={{
+                pathname: "/send",
+                state: assetAmount.asset,
+              }}
+              className="asset_list_item_icon asset_list_item_icon_send_asset"
+            />
             <Link
               to={{
                 pathname: "/swap",
diff --git a/ui/pages/Onboarding/OnboardingInfoIntro.tsx b/ui/pages/Onboarding/OnboardingInfoIntro.tsx
index 5f3cd03220..bae3f2720b 100644
--- a/ui/pages/Onboarding/OnboardingInfoIntro.tsx
+++ b/ui/pages/Onboarding/OnboardingInfoIntro.tsx
@@ -1,5 +1,6 @@
 import React, { ReactElement, useState } from "react"
 import { Redirect } from "react-router-dom"
+import { useBackgroundSelector } from "../../hooks"
 import SharedButton from "../../components/Shared/SharedButton"
 import SharedProgressIndicator from "../../components/Shared/SharedProgressIndicator"
 
@@ -54,10 +55,19 @@ export default function OnboardingInfoIntro(): ReactElement {
   const [activeStep, setActiveStep] = useState(1)
   const [redirectToAddWallet, setRedirectToAddWallet] = useState(false)
 
+  const hasAccounts = useBackgroundSelector(
+    (state) => Object.keys(state.account.accountsData).length > 0
+  )
+
   if (redirectToAddWallet) {
     return <Redirect push to="/onboarding/add-wallet" />
   }
 
+  // If there's an account, return to /wallet
+  if (hasAccounts) {
+    return <Redirect to="/wallet" />
+  }
+
   return (
     <section>
       <div className="illustration_section">
diff --git a/ui/pages/Popup.tsx b/ui/pages/Popup.tsx
index e9670605d4..f76328efac 100644
--- a/ui/pages/Popup.tsx
+++ b/ui/pages/Popup.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useState, useRef, useEffect } from "react"
+import React, { ReactElement, useState, useEffect } from "react"
 import { MemoryRouter as Router, Switch, Route } from "react-router-dom"
 import { ErrorBoundary } from "react-error-boundary"
 
@@ -15,6 +15,8 @@ import { isAllowedQueryParamPage } from "@tallyho/provider-bridge-shared"
 import { PERSIST_UI_LOCATION } from "@tallyho/tally-background/features/features"
 import { runtime } from "webextension-polyfill"
 import { popupMonitorPortName } from "@tallyho/tally-background/main"
+import { selectKeyringStatus } from "@tallyho/tally-background/redux-slices/selectors"
+import { selectIsTransactionPendingSignature } from "@tallyho/tally-background/redux-slices/transaction-construction"
 import {
   useIsDappPopup,
   useBackgroundDispatch,
@@ -39,7 +41,11 @@ const pagePreferences = Object.fromEntries(
   ])
 )
 
-function transformLocation(inputLocation: Location): Location {
+function transformLocation(
+  inputLocation: Location,
+  isTransactionPendingSignature: boolean,
+  keyringStatus: "locked" | "unlocked" | "uninitialized"
+): Location {
   // The inputLocation is not populated with the actual query string — even though it should be
   // so I need to grab it from the window
   const params = new URLSearchParams(window.location.search)
@@ -53,6 +59,11 @@ function transformLocation(inputLocation: Location): Location {
     pathname = maybePage
   }
 
+  if (isTransactionPendingSignature) {
+    pathname =
+      keyringStatus === "unlocked" ? "/sign-transaction" : "/keyring/unlock"
+  }
+
   return {
     ...inputLocation,
     pathname,
@@ -76,41 +87,33 @@ export function Main(): ReactElement {
   const [shouldDisplayDecoy, setShouldDisplayDecoy] = useState(false)
   const [isDirectionRight, setIsDirectionRight] = useState(true)
   const [showTabBar, setShowTabBar] = useState(true)
-  const renderCount = useRef(0)
 
   const routeHistoryEntries = useBackgroundSelector(
     (state) => state.ui.routeHistoryEntries
   )
 
+  // See comment above call of saveHistoryEntries
   function saveHistoryEntries(routeHistoryEntities: Location[]) {
-    const isNotOnKeyringRelatedPage =
-      routeHistoryEntities[routeHistoryEntities.length - 1].pathname !==
-        "/sign-transaction" &&
-      !routeHistoryEntities[routeHistoryEntities.length - 1].pathname.includes(
-        "/keyring/"
-      )
-
-    // Initial extension load takes two renders because of setting
-    // animation control states. `initialEntries` needs to be a reversed
-    // version of route history entities. Without avoiding the initial load,
-    // entries will keep reversing.
-    if (renderCount.current > 1 && isNotOnKeyringRelatedPage) {
-      const entries = routeHistoryEntities
-        .reduce((agg: Partial<Location>[], entity) => {
-          const { ...entityCopy } = entity as Partial<Location>
-          delete entityCopy.hash
-          delete entityCopy.key
-          agg.push(entityCopy)
-          return agg
-        }, [])
-        .reverse()
-
-      if (JSON.stringify(routeHistoryEntries) !== JSON.stringify(entries)) {
-        dispatch(setRouteHistoryEntries(entries))
-      }
+    const entries = routeHistoryEntities
+      .reduce((agg: Partial<Location>[], entity) => {
+        const { ...entityCopy } = entity as Partial<Location>
+        delete entityCopy.hash
+        delete entityCopy.key
+        agg.push(entityCopy)
+        return agg
+      }, [])
+      .reverse()
+
+    if (JSON.stringify(routeHistoryEntries) !== JSON.stringify(entries)) {
+      dispatch(setRouteHistoryEntries(entries))
     }
   }
 
+  const isTransactionPendingSignature = useBackgroundSelector(
+    selectIsTransactionPendingSignature
+  )
+  const keyringStatus = useBackgroundSelector(selectKeyringStatus)
+
   useConnectPopupMonitor()
 
   return (
@@ -121,19 +124,30 @@ export function Main(): ReactElement {
       <Router initialEntries={routeHistoryEntries}>
         <Route
           render={(routeProps) => {
-            const transformedLocation = transformLocation(routeProps.location)
+            const transformedLocation = transformLocation(
+              routeProps.location,
+              isTransactionPendingSignature,
+              keyringStatus
+            )
 
             const normalizedPathname =
               transformedLocation.pathname !== "/wallet"
                 ? transformedLocation.pathname
                 : "/"
 
+            // `initialEntries` needs to be a reversed version of route history
+            // entities. Without avoiding the initial load, entries will keep reversing.
+            // Given that restoring our route history is a "POP" `history.action`,
+            // by specifying "PUSH" we know that the most recent navigation change is by
+            // the user or explicitly added. That said, we can still certainly "POP" via
+            // history.goBack(). This case is not yet accounted for.
             if (
               PERSIST_UI_LOCATION &&
-              pagePreferences[normalizedPathname].persistOnClose
+              pagePreferences[normalizedPathname].persistOnClose &&
+              routeProps.history.action === "PUSH"
             ) {
               // @ts-expect-error TODO: fix the typing
-              saveHistoryEntries(routeProps?.history?.entries)
+              saveHistoryEntries(routeProps.history.entries)
             }
 
             setAnimationConditions(
@@ -143,7 +157,6 @@ export function Main(): ReactElement {
               setIsDirectionRight
             )
             setShowTabBar(pagePreferences[normalizedPathname].hasTabBar)
-            renderCount.current += 1
 
             return (
               <TransitionGroup>
@@ -168,24 +181,17 @@ export function Main(): ReactElement {
                     </div>
                     {/* @ts-expect-error TODO: fix the typing when the feature works */}
                     <Switch location={transformedLocation}>
-                      {pageList.map(
-                        ({ path, Component, hasTabBar, hasTopBar }) => {
-                          return (
-                            <Route path={path} key={path}>
-                              <CorePage
-                                hasTabBar={hasTabBar}
-                                hasTopBar={hasTopBar}
-                              >
-                                <ErrorBoundary
-                                  FallbackComponent={ErrorFallback}
-                                >
-                                  <Component location={transformedLocation} />
-                                </ErrorBoundary>
-                              </CorePage>
-                            </Route>
-                          )
-                        }
-                      )}
+                      {pageList.map(({ path, Component, hasTopBar }) => {
+                        return (
+                          <Route path={path} key={path}>
+                            <CorePage hasTopBar={hasTopBar}>
+                              <ErrorBoundary FallbackComponent={ErrorFallback}>
+                                <Component location={transformedLocation} />
+                              </ErrorBoundary>
+                            </CorePage>
+                          </Route>
+                        )
+                      })}
                     </Switch>
                   </div>
                 </CSSTransition>
diff --git a/ui/pages/Send.tsx b/ui/pages/Send.tsx
index 484ad52c6c..a9291267a3 100644
--- a/ui/pages/Send.tsx
+++ b/ui/pages/Send.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useState } from "react"
+import React, { ReactElement, useCallback, useState } from "react"
 import { isAddress } from "@ethersproject/address"
 import {
   selectCurrentAccount,
@@ -6,13 +6,10 @@ import {
   selectMainCurrencySymbol,
 } from "@tallyho/tally-background/redux-slices/selectors"
 import {
-  broadcastOnSign,
   NetworkFeeSettings,
   selectEstimatedFeesPerGas,
   setFeeType,
-  updateTransactionOptions,
 } from "@tallyho/tally-background/redux-slices/transaction-construction"
-import { utils } from "ethers"
 import {
   FungibleAsset,
   isFungibleAssetAmount,
@@ -22,9 +19,13 @@ import {
   convertFixedPointNumber,
   parseToFixedPointNumber,
 } from "@tallyho/tally-background/lib/fixed-point"
-import { selectAssetPricePoint } from "@tallyho/tally-background/redux-slices/assets"
+import {
+  selectAssetPricePoint,
+  transferAsset,
+} from "@tallyho/tally-background/redux-slices/assets"
 import { CompleteAssetAmount } from "@tallyho/tally-background/redux-slices/accounts"
 import { enrichAssetAmountWithMainCurrencyValues } from "@tallyho/tally-background/redux-slices/utils/asset-utils"
+import { useHistory, useLocation } from "react-router-dom"
 import NetworkSettingsChooser from "../components/NetworkFees/NetworkSettingsChooser"
 import SharedAssetInput from "../components/Shared/SharedAssetInput"
 import SharedBackButton from "../components/Shared/SharedBackButton"
@@ -34,17 +35,23 @@ import SharedSlideUpMenu from "../components/Shared/SharedSlideUpMenu"
 import FeeSettingsButton from "../components/NetworkFees/FeeSettingsButton"
 
 export default function Send(): ReactElement {
-  const [selectedAsset, setSelectedAsset] = useState<FungibleAsset>(ETH)
+  const location = useLocation<FungibleAsset>()
+  const [selectedAsset, setSelectedAsset] = useState<FungibleAsset>(
+    location.state ?? ETH
+  )
   const [destinationAddress, setDestinationAddress] = useState("")
   const [amount, setAmount] = useState("")
   const [gasLimit, setGasLimit] = useState<bigint | undefined>(undefined)
+  const [isSendingTransactionRequest, setIsSendingTransactionRequest] =
+    useState(false)
   const [hasError, setHasError] = useState(false)
   const [networkSettingsModalOpen, setNetworkSettingsModalOpen] =
     useState(false)
 
-  const estimatedFeesPerGas = useBackgroundSelector(selectEstimatedFeesPerGas)
+  const history = useHistory()
 
   const dispatch = useBackgroundDispatch()
+  const estimatedFeesPerGas = useBackgroundSelector(selectEstimatedFeesPerGas)
   const currentAccount = useBackgroundSelector(selectCurrentAccount)
   const balanceData = useBackgroundSelector(selectCurrentAccountBalances)
   const mainCurrencySymbol = useBackgroundSelector(selectMainCurrencySymbol)
@@ -86,17 +93,38 @@ export default function Send(): ReactElement {
 
   const assetAmount = assetAmountFromForm()
 
-  const sendTransactionRequest = async () => {
-    dispatch(broadcastOnSign(true))
-    const transaction = {
-      from: currentAccount.address,
-      to: destinationAddress,
-      // eslint-disable-next-line no-underscore-dangle
-      value: BigInt(utils.parseEther(amount?.toString())._hex),
-      gasLimit,
+  const sendTransactionRequest = useCallback(async () => {
+    if (assetAmount === undefined) {
+      return
     }
-    return dispatch(updateTransactionOptions(transaction))
-  }
+
+    try {
+      setIsSendingTransactionRequest(true)
+
+      await dispatch(
+        transferAsset({
+          fromAddressNetwork: currentAccount,
+          toAddressNetwork: {
+            address: destinationAddress,
+            network: currentAccount.network,
+          },
+          assetAmount,
+          gasLimit,
+        })
+      )
+    } finally {
+      setIsSendingTransactionRequest(false)
+    }
+
+    history.push("/singleAsset", assetAmount.asset)
+  }, [
+    assetAmount,
+    currentAccount,
+    destinationAddress,
+    dispatch,
+    gasLimit,
+    history,
+  ])
 
   const networkSettingsSaved = (networkSetting: NetworkFeeSettings) => {
     setGasLimit(networkSetting.gasLimit)
@@ -130,7 +158,6 @@ export default function Send(): ReactElement {
               }}
               selectedAsset={selectedAsset}
               amount={amount}
-              disableDropdown
             />
             <div className="value">
               ${assetAmount?.localizedMainCurrencyAmount ?? "-"}
@@ -173,16 +200,9 @@ export default function Send(): ReactElement {
                 !isAddress(destinationAddress) ||
                 hasError
               }
-              linkTo={{
-                pathname: "/sign-transaction",
-                state: {
-                  redirectTo: {
-                    path: "/singleAsset",
-                    state: { symbol: selectedAsset.symbol },
-                  },
-                },
-              }}
               onClick={sendTransactionRequest}
+              isFormSubmit
+              isLoading={isSendingTransactionRequest}
             >
               Send
             </SharedButton>
diff --git a/ui/pages/SignTransaction.tsx b/ui/pages/SignTransaction.tsx
index a906788ee7..0444ef26ee 100644
--- a/ui/pages/SignTransaction.tsx
+++ b/ui/pages/SignTransaction.tsx
@@ -1,58 +1,27 @@
-import React, { ReactElement, useEffect, useState } from "react"
-import { useHistory } from "react-router-dom"
+import React, { ReactElement, useState } from "react"
 import {
-  broadcastSignedTransaction,
   rejectTransactionSignature,
   selectIsTransactionLoaded,
-  selectIsTransactionSigned,
   selectTransactionData,
   signTransaction,
-  TransactionConstructionStatus,
 } from "@tallyho/tally-background/redux-slices/transaction-construction"
 import { getAccountTotal } from "@tallyho/tally-background/redux-slices/selectors"
 import {
   useBackgroundDispatch,
   useBackgroundSelector,
-  useIsBackgroundSettled,
   useIsSigningMethodLocked,
 } from "../hooks"
 import SignTransactionContainer from "../components/SignTransaction/SignTransactionContainer"
 import SignTransactionInfoProvider from "../components/SignTransaction/SignTransactionInfoProvider"
 import SignTransactionPanelSwitcher from "../components/SignTransaction/SignTransactionPanelSwitcher"
 
-export default function SignTransaction({
-  location,
-}: {
-  location: {
-    key?: string
-    pathname: string
-    state?: { redirectTo: { path: string; state: unknown } }
-  }
-}): ReactElement {
-  const history = useHistory()
+export default function SignTransaction(): ReactElement {
   const dispatch = useBackgroundDispatch()
-  const isBackgroundSettled = useIsBackgroundSettled()
   const transactionDetails = useBackgroundSelector(selectTransactionData)
 
   const isTransactionDataReady = useBackgroundSelector(
     selectIsTransactionLoaded
   )
-  const signedTransaction = useBackgroundSelector(
-    ({ transactionConstruction }) => transactionConstruction.signedTransaction
-  )
-
-  const isTransactionSigned = useBackgroundSelector(selectIsTransactionSigned)
-
-  const shouldBroadcastOnSign = useBackgroundSelector(
-    ({ transactionConstruction }) =>
-      transactionConstruction.broadcastOnSign ?? false
-  )
-
-  const isTransactionMissingOrRejected =
-    useBackgroundSelector(
-      ({ transactionConstruction }) =>
-        transactionConstruction.status === TransactionConstructionStatus.Idle
-    ) && isBackgroundSettled
 
   const signerAccountTotal = useBackgroundSelector((state) => {
     if (typeof transactionDetails !== "undefined") {
@@ -67,40 +36,6 @@ export default function SignTransaction({
 
   const isLocked = useIsSigningMethodLocked(signingMethod)
 
-  useEffect(() => {
-    if (isLocked) return
-    if (isTransactionSigned && isTransactionSigning) {
-      if (shouldBroadcastOnSign && typeof signedTransaction !== "undefined") {
-        dispatch(broadcastSignedTransaction(signedTransaction))
-      }
-
-      // Request broadcast if not dApp...
-      if (typeof location.state !== "undefined") {
-        history.push(
-          location.state.redirectTo.path,
-          location.state.redirectTo.state
-        )
-      } else {
-        history.goBack()
-      }
-    }
-  }, [
-    dispatch,
-    history,
-    isTransactionSigned,
-    isTransactionSigning,
-    isLocked,
-    location.state,
-    shouldBroadcastOnSign,
-    signedTransaction,
-  ])
-
-  useEffect(() => {
-    if (isTransactionMissingOrRejected) {
-      history.goBack()
-    }
-  }, [history, isTransactionMissingOrRejected])
-
   if (isLocked) return <></>
 
   if (
diff --git a/ui/pages/SingleAsset.tsx b/ui/pages/SingleAsset.tsx
index 10bf848601..23a93cb310 100644
--- a/ui/pages/SingleAsset.tsx
+++ b/ui/pages/SingleAsset.tsx
@@ -5,12 +5,11 @@ import {
   selectCurrentAccountBalances,
   selectCurrentAccountSigningMethod,
 } from "@tallyho/tally-background/redux-slices/selectors"
-import {
-  HIDE_SEND_BUTTON,
-  HIDE_SWAP,
-} from "@tallyho/tally-background/features/features"
 import { normalizeEVMAddress } from "@tallyho/tally-background/lib/utils"
-import { isSmartContractFungibleAsset } from "@tallyho/tally-background/assets"
+import {
+  AnyAsset,
+  isSmartContractFungibleAsset,
+} from "@tallyho/tally-background/assets"
 import { useBackgroundSelector } from "../hooks"
 import SharedAssetIcon from "../components/Shared/SharedAssetIcon"
 import SharedButton from "../components/Shared/SharedButton"
@@ -19,8 +18,13 @@ import SharedBackButton from "../components/Shared/SharedBackButton"
 import SharedTooltip from "../components/Shared/SharedTooltip"
 
 export default function SingleAsset(): ReactElement {
-  const location = useLocation<{ symbol: string; contractAddress?: string }>()
-  const { symbol, contractAddress } = location.state
+  const location = useLocation<AnyAsset>()
+  const locationAsset = location.state
+  const { symbol } = locationAsset
+  const contractAddress =
+    "contractAddress" in locationAsset
+      ? locationAsset.contractAddress
+      : undefined
 
   const currentAccountSigningMethod = useBackgroundSelector(
     selectCurrentAccountSigningMethod
@@ -123,44 +127,28 @@ export default function SingleAsset(): ReactElement {
           <div className="right">
             {currentAccountSigningMethod ? (
               <>
-                {!HIDE_SEND_BUTTON && symbol === "ETH" && (
-                  <SharedButton
-                    type="primary"
-                    size="medium"
-                    icon="send"
-                    linkTo={{
-                      pathname: "/send",
-                      state: {
-                        symbol,
-                        contractAddress:
-                          "contractAddress" in asset
-                            ? asset.contractAddress
-                            : undefined,
-                      },
-                    }}
-                  >
-                    Send
-                  </SharedButton>
-                )}
-                {!HIDE_SWAP && symbol !== "ETH" && (
-                  <SharedButton
-                    type="primary"
-                    size="medium"
-                    icon="swap"
-                    linkTo={{
-                      pathname: "/swap",
-                      state: {
-                        symbol,
-                        contractAddress:
-                          "contractAddress" in asset
-                            ? asset.contractAddress
-                            : undefined,
-                      },
-                    }}
-                  >
-                    Swap
-                  </SharedButton>
-                )}
+                <SharedButton
+                  type="primary"
+                  size="medium"
+                  icon="send"
+                  linkTo={{
+                    pathname: "/send",
+                    state: asset,
+                  }}
+                >
+                  Send
+                </SharedButton>
+                <SharedButton
+                  type="primary"
+                  size="medium"
+                  icon="swap"
+                  linkTo={{
+                    pathname: "/swap",
+                    state: asset,
+                  }}
+                >
+                  Swap
+                </SharedButton>
               </>
             ) : (
               <></>
diff --git a/ui/pages/Swap.tsx b/ui/pages/Swap.tsx
index c22de36d4e..474005b11d 100644
--- a/ui/pages/Swap.tsx
+++ b/ui/pages/Swap.tsx
@@ -18,6 +18,7 @@ import { selectCurrentAccountBalances } from "@tallyho/tally-background/redux-sl
 import {
   AnyAsset,
   FungibleAsset,
+  isFungibleAsset,
   isSmartContractFungibleAsset,
   SmartContractFungibleAsset,
 } from "@tallyho/tally-background/assets"
@@ -27,11 +28,7 @@ import logger from "@tallyho/tally-background/lib/logger"
 import { useHistory, useLocation } from "react-router-dom"
 import { normalizeEVMAddress } from "@tallyho/tally-background/lib/utils"
 import { CompleteAssetAmount } from "@tallyho/tally-background/redux-slices/accounts"
-import {
-  clearTransactionState,
-  selectDefaultNetworkFeeSettings,
-  TransactionConstructionStatus,
-} from "@tallyho/tally-background/redux-slices/transaction-construction"
+import { selectDefaultNetworkFeeSettings } from "@tallyho/tally-background/redux-slices/transaction-construction"
 import CorePage from "../components/Core/CorePage"
 import SharedAssetInput from "../components/Shared/SharedAssetInput"
 import SharedButton from "../components/Shared/SharedButton"
@@ -71,7 +68,6 @@ function isSameAsset(asset1: AnyAsset, asset2: AnyAsset) {
 
 export default function Swap(): ReactElement {
   const dispatch = useBackgroundDispatch()
-  const history = useHistory()
   const location = useLocation<
     { symbol: string; contractAddress?: string } | undefined
   >()
@@ -95,7 +91,13 @@ export default function Swap(): ReactElement {
     // Some type massaging needed to remind TypeScript how these types fit
     // together.
     const knownAssets: AnyAsset[] = state.assets
-    return knownAssets.filter(isSmartContractFungibleAsset)
+    return knownAssets.filter(
+      (asset): asset is SmartContractFungibleAsset | FungibleAsset =>
+        isSmartContractFungibleAsset(asset) ||
+        // Explicity add ETH even though it is not an ERC-20 token
+        // @TODO change as part of multi-network refactor.
+        (isFungibleAsset(asset) && asset.symbol === "ETH")
+    )
   })
 
   const {
@@ -238,18 +240,12 @@ export default function Swap(): ReactElement {
       return
     }
 
-    // FIXME Set state to pending so SignTransaction doesn't redirect back; drop after
-    // FIXME proper transaction queueing is in effect.
-    await dispatch(clearTransactionState(TransactionConstructionStatus.Pending))
-
-    dispatch(
+    await dispatch(
       approveTransfer({
         assetContractAddress: sellAsset.contractAddress,
         approvalTarget,
       })
     )
-
-    history.push("/sign-transaction")
   }
 
   const updateSwapData = useCallback(
diff --git a/ui/public/images/logo_horizontal.svg b/ui/public/images/logo_horizontal.svg
new file mode 100644
index 0000000000..e814da2e09
--- /dev/null
+++ b/ui/public/images/logo_horizontal.svg
@@ -0,0 +1,6 @@
+<svg width="374" height="82" viewBox="0 0 374 82" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.2775 56.9208V13.472C87.2775 9.40916 86.1894 7.96042 81.4053 8.41114V6.33785L92.0615 4.07786C94.1412 3.62714 95.4032 4.61871 95.4032 6.78857V56.7277C95.4032 59.8891 97.3027 60.43 99.9104 59.8891V61.1769C98.8287 62.7994 96.1179 63.7975 93.5875 63.7975C90.0075 63.8103 87.2775 61.8014 87.2775 56.9208ZM20.4238 56.2899C20.4238 59.6316 18.5308 60.4364 11.2099 61.0803V63.2437H38.961V61.0803C31.6401 60.4429 29.657 59.6316 29.657 56.2899V15.8222C29.657 11.4824 30.3781 10.4007 36.8813 10.4007C43.217 10.4007 45.2968 12.3002 47.8272 19.3442H50.1709L48.6385 7.87029C48.6219 7.73306 48.578 7.60053 48.5095 7.48051C48.4409 7.36048 48.349 7.25539 48.2392 7.1714C48.1294 7.08741 48.004 7.02621 47.8702 6.99143C47.7364 6.95665 47.597 6.94898 47.4602 6.96887C46.0952 7.05901 43.848 7.14916 41.588 7.14916H8.52495C6.25206 7.14916 4.01781 7.05901 2.73005 6.96887C1.98316 6.96887 1.53244 7.22642 1.4423 7.87029L0 19.3442H2.34372C4.88704 12.3002 6.96676 10.4007 13.2896 10.4007C19.7799 10.4007 20.4238 11.4824 20.4238 15.8222V56.2899ZM68.1222 39.3044C48.5225 41.6545 42.9208 46.8055 42.9208 53.8496C42.9208 60.9 48.7028 63.7975 54.6651 63.7975C60.6274 63.7975 66.0489 61.061 69.2103 57.1977C69.8413 56.3864 70.5624 56.3864 70.5624 57.2879C70.7427 61.5374 73.183 63.7975 76.8853 63.7975C79.4157 63.7975 82.0363 62.7994 83.118 61.1769V59.8891C80.4975 60.43 78.6946 59.8891 78.6946 56.7277V36.9671C78.6946 26.2079 74.445 21.7008 63.7889 21.7008C55.0257 21.7008 45.6315 24.4952 45.6315 31.3589C45.6315 33.9795 46.9837 35.7824 49.6944 35.7824C52.2248 35.7824 54.1243 34.1598 54.1243 30.8181C54.1243 26.7488 56.1975 24.3085 61.3486 24.3085C67.7616 24.3085 70.5624 28.2619 70.5624 34.7006V36.6902C70.5624 38.5832 69.7512 39.1241 68.1222 39.3044ZM70.5624 44.816V48.5247C70.5624 54.6673 65.4114 59.1809 59.2624 59.1809C53.9375 59.1809 51.4972 55.8391 51.4972 52.1368C51.4972 47.9774 54.3046 43.2835 66.9503 41.9249C69.9186 41.5644 70.5624 42.7427 70.5624 44.816ZM105.345 13.472V56.9208C105.345 61.8014 108.036 63.8103 111.655 63.7975C114.185 63.7975 116.889 62.7994 117.978 61.1769V59.8891C115.37 60.43 113.47 59.8891 113.47 56.7277V6.78857C113.47 4.61871 112.208 3.62714 110.129 4.07786L99.4726 6.33785V8.41114C104.257 7.96042 105.345 9.40916 105.345 13.472ZM121.062 75.2585C121.048 74.6424 121.161 74.0302 121.393 73.4594C121.625 72.8887 121.972 72.3716 122.412 71.9402C122.852 71.5087 123.375 71.1721 123.95 70.951C124.526 70.7299 125.14 70.6291 125.756 70.6547C128.829 70.6547 129.264 72.8019 129.658 74.7403C129.981 76.3353 130.276 77.7889 131.988 77.7889C134.068 77.7889 135.852 74.8078 137.139 71.6463C138.949 66.9525 137.86 63.1536 136.598 60.1724L125.653 32.8012C123.393 27.2896 122.311 26.0276 118.428 24.5853V22.5056H137.217V24.5853C132.336 26.0276 131.975 27.1995 134.326 32.8012L142.097 52.0467C143.269 54.8476 144.261 54.8476 145.439 51.9565L149.231 42.1052C155.104 27.2961 153.475 26.0083 148.15 24.5853V22.5056H164.498V24.5853C159.257 26.0276 157.814 27.3798 155.735 32.8012L140.874 69.7533C138.073 76.7973 135.543 81.1306 128.859 81.1306C124.043 81.1306 121.062 78.6968 121.062 75.2585ZM224.134 56.2899V14.103C224.134 10.7613 226.033 9.85988 229.729 9.31902V7.14916H209.228V9.31902C212.93 9.85988 214.92 10.7613 214.92 14.103V30.9726C214.92 33.136 213.658 34.0439 211.488 34.0439H190.439C188.27 34.0439 187.098 33.136 187.098 30.9726V14.103C187.098 10.7613 188.991 9.85988 192.7 9.31902V7.14916H172.192V9.31902C175.862 9.85988 177.794 10.7613 177.794 14.103V56.2899C177.794 59.6316 175.894 60.4364 172.192 61.0803V63.2437H192.68V61.0803C188.971 60.4429 187.078 59.6316 187.078 56.2899V39.8517C187.078 37.6818 188.25 36.7804 190.33 36.7804H211.578C213.632 36.7804 214.92 37.6818 214.92 39.8517V56.2899C214.92 59.6316 212.93 60.4364 209.228 61.0803V63.2437H229.735V61.0803C226.065 60.4429 224.134 59.6316 224.134 56.2899ZM232.42 42.8328C232.42 29.5496 242.355 21.6943 253.469 21.6943C264.582 21.6943 274.427 29.4595 274.427 42.6525C274.427 55.8456 264.498 63.8103 253.379 63.8103C242.259 63.8103 232.42 56.0194 232.42 42.8328ZM265.664 46.0844C265.664 34.4302 259.869 24.405 251.389 24.405C245.427 24.405 241.177 29.189 241.177 39.3945C241.177 51.0487 246.972 60.9901 255.452 60.9901C261.324 60.9901 265.664 56.2898 265.664 46.0844ZM284.632 5.70043C281.201 5.70043 279.031 8.32101 279.031 12.4805C279.031 16.2988 279.767 20.3121 280.614 24.9285C281.689 30.7899 282.942 37.6236 283.094 46.2647H286.075C286.24 37.6383 287.518 30.8132 288.614 24.9584C289.481 20.3295 290.234 16.3071 290.234 12.4805C290.234 8.32101 288.064 5.70043 284.632 5.70043ZM280.954 54.8081C279.973 55.7723 279.412 57.0843 279.391 58.4597C279.373 59.5 279.665 60.522 280.23 61.3957C280.795 62.2694 281.607 62.9552 282.563 63.3657C283.519 63.7763 284.576 63.893 285.599 63.7011C286.621 63.5091 287.563 63.0172 288.305 62.2879C289.047 61.5587 289.556 60.625 289.765 59.606C289.975 58.5869 289.877 57.5285 289.483 56.5655C289.089 55.6026 288.417 54.7786 287.553 54.1987C286.69 53.6187 285.673 53.3089 284.632 53.3087C283.257 53.3052 281.935 53.8439 280.954 54.8081Z" fill="#CCD3D3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M373.043 34.0115C373.043 52.6275 357.952 67.7188 339.336 67.7188C320.72 67.7188 305.629 52.6275 305.629 34.0115C305.629 15.3955 320.72 0.304199 339.336 0.304199C357.952 0.304199 373.043 15.3955 373.043 34.0115ZM339.336 66.8492C357.472 66.8492 372.174 52.1473 372.174 34.0115C372.174 15.8757 357.472 1.17376 339.336 1.17376C321.2 1.17376 306.498 15.8757 306.498 34.0115C306.498 52.1473 321.2 66.8492 339.336 66.8492Z" fill="#CCD3D3"/>
+<path d="M356.955 20.2031L357.212 17.5615C357.219 17.5174 357.243 17.4775 357.277 17.4488C357.311 17.42 357.355 17.4043 357.399 17.4043C357.444 17.4043 357.487 17.42 357.522 17.4488C357.556 17.4775 357.579 17.5174 357.587 17.5615L357.838 20.1971C357.855 20.4011 357.945 20.592 358.092 20.7345C358.239 20.877 358.432 20.9614 358.637 20.9723L361.493 21.1452C361.537 21.1531 361.577 21.1762 361.606 21.2106C361.634 21.2449 361.65 21.2882 361.65 21.333C361.65 21.3778 361.634 21.4212 361.606 21.4555C361.577 21.4898 361.537 21.513 361.493 21.5209L358.631 21.6938C358.428 21.7082 358.236 21.7939 358.09 21.9357C357.944 22.0775 357.852 22.2663 357.832 22.469L357.581 25.1105C357.573 25.1546 357.55 25.1945 357.516 25.2232C357.481 25.252 357.438 25.2677 357.393 25.2677C357.349 25.2677 357.305 25.252 357.271 25.2232C357.237 25.1945 357.213 25.1546 357.206 25.1105L356.955 22.4749C356.936 22.2719 356.845 22.0823 356.698 21.9403C356.552 21.7983 356.36 21.713 356.156 21.6997L353.3 21.5268C353.256 21.5189 353.216 21.4958 353.187 21.4615C353.158 21.4271 353.143 21.3838 353.143 21.339C353.143 21.2942 353.158 21.2508 353.187 21.2165C353.216 21.1822 353.256 21.159 353.3 21.1512L356.156 20.9723C356.36 20.9616 356.552 20.878 356.699 20.7367C356.846 20.5954 356.937 20.406 356.955 20.2031V20.2031Z" fill="#CCD3D3"/>
+<path d="M352.412 32.5285C353.13 32.4035 353.863 32.3815 354.588 32.4629C354.836 32.5091 355.092 32.4864 355.327 32.3973L355.238 32.3198C353.527 30.845 351.685 29.5297 349.734 28.3903C347.14 26.8757 345.393 23.0714 344.88 21.9205C344.475 21.0283 343.752 20.3186 342.853 19.929C343.293 19.9019 343.733 19.9765 344.14 20.1472C344.546 20.3178 344.908 20.5798 345.196 20.9128C345.65 21.2885 347.289 24.2282 348.136 24.3117C348.439 24.3005 348.739 24.2545 349.031 24.1745H349.096L349.496 24.0791H349.537L349.853 24.0016L350.45 23.8287L350.396 23.7929C349.49 23.1966 348.911 22.177 348.279 21.0798C347.947 20.4925 347.546 19.9462 347.087 19.4519C346.958 19.3134 346.819 19.1857 346.669 19.0703C346.516 18.9586 346.355 18.8589 346.186 18.7722C345.876 18.6171 345.59 18.4919 345.286 18.3727C344.982 18.2534 344.69 18.1461 344.469 18.0268L343.628 17.6094L341.935 16.7865C340.787 16.2401 339.609 15.7622 338.405 15.3554C337.18 14.9527 335.917 14.6769 334.636 14.5326C334.306 14.492 333.973 14.4681 333.64 14.461C333.245 14.4581 332.854 14.5437 332.496 14.7114C332.162 14.8605 331.899 15.0215 331.661 15.1229C331.422 15.2242 331.064 15.3852 330.79 15.5283C329.629 16.0862 328.534 16.7701 327.523 17.5677C326.996 17.9592 326.502 18.3919 326.044 18.8616C325.658 19.2719 325.331 19.7334 325.072 20.2331C325.345 20.1831 325.623 20.1611 325.901 20.1675C326.849 20.2231 327.785 20.4138 328.679 20.7339C327.845 20.7339 323.515 20.5014 321.208 22.0517C320.764 22.3503 320.397 22.7485 320.135 23.2145C320.039 23.3993 319.914 23.6677 319.777 24.0016C319.759 24.0503 319.74 24.0981 319.717 24.1447C319.318 25.1917 318.993 26.2657 318.745 27.3587C318.3 29.2565 318.074 31.1992 318.071 33.1486C318.071 33.4468 318.071 33.7449 318.071 34.049C318.071 34.3531 318.113 34.5559 318.137 34.8123V34.9733C318.161 35.1959 318.191 35.4165 318.226 35.6351L318.262 35.8439C318.35 36.3811 318.47 36.9127 318.62 37.4359C318.903 38.3429 319.304 39.2089 319.813 40.0119C320.051 40.3041 320.29 40.4233 320.498 40.149L320.647 39.9403C320.82 39.6959 321.077 39.3441 321.387 38.8432L321.768 38.2469V38.2111L322.132 37.6148L322.216 37.4836C322.484 37.0484 322.812 36.5713 323.086 36.0585L323.211 35.8498L323.581 35.2178L323.688 35.0389L324.159 34.222L324.273 34.0252C324.398 33.7986 324.523 33.572 324.654 33.3454C324.696 33.2619 324.744 33.1785 324.792 33.095L325.275 32.2005C325.811 31.1928 326.336 30.1553 326.813 29.1237C327.045 28.6347 327.284 28.1518 327.54 27.6747C327.91 26.9504 328.343 26.26 328.834 25.6116C329.088 25.2777 329.382 24.9772 329.711 24.7171C330.035 24.4493 330.436 24.2907 330.856 24.264C329.52 25.4565 328.387 28.7123 327.445 32.29C326.849 34.5976 327.135 35.7186 325.376 41.1568C323.629 46.4876 325.233 48.4315 327.368 49.9759C331.798 53.0169 336.526 53.0467 337.039 57.1313L337.314 59.272L338.423 57.4235C338.82 56.7464 339.135 56.0236 339.359 55.2709V55.1695L340.259 55.8374C340.823 54.7966 341.057 53.6092 340.93 52.4324C340.803 51.2557 340.322 50.1453 339.55 49.2484C339.621 49.4034 339.693 49.5585 339.758 49.7195C340.032 50.3359 340.232 50.9823 340.355 51.6455C340.484 52.3686 340.431 53.1126 340.2 53.81L339.907 54.6388L339.198 54.1141C339.091 54.0378 338.977 53.9719 338.858 53.9173C338.804 54.3196 338.725 54.7179 338.619 55.1099C338.417 55.7944 338.13 56.4513 337.767 57.0657C337.063 51.4368 331.708 51.6276 328.614 49.314C325.519 47.0004 325.275 44.2455 327.183 39.4812C327.765 38.0162 328.189 36.4929 328.447 34.9375C328.5 34.5857 328.566 34.2398 328.644 33.894C328.64 33.8444 328.64 33.7946 328.644 33.7449L328.697 33.4945C328.697 34.0311 328.697 34.5618 328.781 35.0866C328.809 35.5931 328.91 36.093 329.079 36.5713C329.154 36.7769 329.27 36.9655 329.419 37.1259C329.49 37.2034 329.574 37.269 329.687 37.3823C329.768 37.4723 329.853 37.5579 329.943 37.6387C330.323 37.9272 330.746 38.1545 331.196 38.3125C332.147 38.645 333.137 38.8573 334.141 38.9446C335.107 39.0578 336.091 39.0817 337.081 39.1055H337.23C338.257 39.1115 339.277 39.2868 340.247 39.6243C341.115 39.9155 342.022 40.0743 342.937 40.0954C344.862 40.2808 346.762 40.6665 348.607 41.2462C349.394 41.27 350.181 41.1999 350.951 41.0375C351.493 40.9302 352.03 40.7871 352.561 40.6261C353.753 40.1192 354.576 38.7418 352.948 38.9267C352.565 38.9511 352.185 39.0029 351.809 39.0817C351.267 39.189 350.724 39.4752 350.02 39.678C349.359 39.8285 348.67 39.8101 348.017 39.6243C347.446 39.3936 346.842 39.2528 346.228 39.2069C346.515 39.0435 346.835 38.9458 347.164 38.9207C347.498 38.9207 347.814 38.9207 348.112 38.9207C348.671 38.9913 349.237 38.9671 349.788 38.8491C350.289 38.706 350.808 38.3244 351.446 38.068C352.067 37.8068 352.733 37.6652 353.407 37.6506H353.36C353.509 37.6506 353.658 37.6506 353.813 37.6506C354.284 36.9947 354.683 36.2911 354.528 35.6709C354.346 35.4249 354.092 35.2416 353.801 35.1462C353.443 35.021 351.505 34.6274 350.855 34.0311C350.617 33.6376 350.849 32.8565 352.412 32.5285ZM342.149 24.6635C341.98 24.813 341.852 25.005 341.781 25.2198C341.71 25.4346 341.697 25.6645 341.744 25.8859C341.798 26.5835 340.963 27.1381 339.955 27.2454C338.661 27.3885 337.969 26.6491 338.166 25.7666C338.506 24.3117 337.761 24.7887 337.26 25.3731C337.25 25.3845 337.237 25.3925 337.222 25.3958C337.207 25.3992 337.192 25.3978 337.178 25.3919C337.164 25.3859 337.152 25.3756 337.144 25.3626C337.137 25.3496 337.133 25.3345 337.135 25.3194C337.349 23.8227 338.226 23.7631 338.619 23.7631C339.803 23.8473 340.975 24.047 342.12 24.3594C342.149 24.3713 342.174 24.3909 342.193 24.4161C342.211 24.4413 342.223 24.4712 342.226 24.5024C342.229 24.5337 342.224 24.5652 342.21 24.5936C342.197 24.622 342.176 24.6461 342.149 24.6635Z" fill="#D08E39"/>
+</svg>
diff --git a/ui/utils/tabs.ts b/ui/utils/tabs.ts
index e893f59626..2019a139fb 100644
--- a/ui/utils/tabs.ts
+++ b/ui/utils/tabs.ts
@@ -1,11 +1,8 @@
-import {
-  HIDE_SWAP,
-  HIDE_EARN_PAGE,
-} from "@tallyho/tally-background/features/features"
+import { HIDE_EARN_PAGE } from "@tallyho/tally-background/features/features"
 
 const tabs: string[] = ["overview", "wallet", "swap", "earn", "menu"].filter(
   (tab) => {
-    if ((tab === "earn" && HIDE_EARN_PAGE) || (tab === "swap" && HIDE_SWAP)) {
+    if (tab === "earn" && HIDE_EARN_PAGE) {
       return false
     }
     return true
diff --git a/window-provider/index.ts b/window-provider/index.ts
index 753f9247a8..bdb8a29bea 100644
--- a/window-provider/index.ts
+++ b/window-provider/index.ts
@@ -77,7 +77,7 @@ export default class TallyWindowProvider extends EventEmitter {
   }
 
   // deprecated EIP-1193 method
-  async enable() {
+  async enable(): Promise<unknown> {
     return this.request({ method: "eth_requestAccounts" })
   }
 
@@ -207,7 +207,7 @@ export default class TallyWindowProvider extends EventEmitter {
     })
   }
 
-  handleAddressChange(address: Array<string>) {
+  handleAddressChange(address: Array<string>): void {
     if (this.selectedAddress !== address[0]) {
       // eslint-disable-next-line prefer-destructuring
       this.selectedAddress = address[0]