diff --git a/background/networks.ts b/background/networks.ts
index 322ab8a09..7b05b33d6 100644
--- a/background/networks.ts
+++ b/background/networks.ts
@@ -162,6 +162,7 @@ export type LegacyEVMTransactionRequest = Pick<
   estimatedRollupFee: bigint
   estimatedRollupGwei: bigint
   nonce?: number
+  broadcastOnSign: boolean
 }
 
 /**
@@ -219,6 +220,7 @@ export type EIP1559TransactionRequest = Pick<
   gasLimit: bigint
   chainID: EIP1559Transaction["network"]["chainID"]
   nonce?: number
+  broadcastOnSign: boolean
 }
 
 export type TransactionRequest =
diff --git a/background/services/chain/index.ts b/background/services/chain/index.ts
index d436699c0..f368b7ca2 100644
--- a/background/services/chain/index.ts
+++ b/background/services/chain/index.ts
@@ -530,8 +530,17 @@ export default class ChainService extends BaseService<Events> {
     transactionRequest: EnrichedLegacyTransactionRequest
     gasEstimationError: string | undefined
   }> {
-    const { from, to, value, gasLimit, input, gasPrice, nonce, annotation } =
-      partialRequest
+    const {
+      from,
+      to,
+      value,
+      gasLimit,
+      input,
+      gasPrice,
+      nonce,
+      annotation,
+      broadcastOnSign,
+    } = partialRequest
     // Basic transaction construction based on the provided options, with extra data from the chain service
     const transactionRequest: EnrichedLegacyTransactionRequest = {
       from,
@@ -553,6 +562,7 @@ export default class ChainService extends BaseService<Events> {
           ? await this.estimateL1RollupGasPrice(network)
           : 0n,
       estimatedRollupFee: 0n,
+      broadcastOnSign,
     }
 
     if (network.chainID === OPTIMISM.chainID) {
@@ -628,6 +638,7 @@ export default class ChainService extends BaseService<Events> {
       maxPriorityFeePerGas,
       nonce,
       annotation,
+      broadcastOnSign,
     } = partialRequest
 
     // Basic transaction construction based on the provided options, with extra data from the chain service
@@ -644,6 +655,7 @@ export default class ChainService extends BaseService<Events> {
       chainID: network.chainID,
       nonce,
       annotation,
+      broadcastOnSign,
     }
 
     // Always estimate gas to decide whether the transaction will likely fail.
diff --git a/background/services/chain/tests/index.unit.test.ts b/background/services/chain/tests/index.unit.test.ts
index 9f0196842..1296d3a54 100644
--- a/background/services/chain/tests/index.unit.test.ts
+++ b/background/services/chain/tests/index.unit.test.ts
@@ -67,6 +67,7 @@ describe("Chain Service", () => {
           nonce: 1,
           maxPriorityFeePerGas: 1n,
           maxFeePerGas: 2n,
+          broadcastOnSign: true,
         }
 
       const stub = sandbox.stub(
@@ -98,6 +99,7 @@ describe("Chain Service", () => {
           network: OPTIMISM,
           nonce: 1,
           gasPrice: 1_000n,
+          broadcastOnSign: true,
         }
 
       const stub = sandbox.stub(
diff --git a/background/services/enrichment/types.ts b/background/services/enrichment/types.ts
index 31fd98856..09791703d 100644
--- a/background/services/enrichment/types.ts
+++ b/background/services/enrichment/types.ts
@@ -99,6 +99,7 @@ export type EnrichedEIP1559TransactionSignatureRequest =
     from: string
     annotation?: TransactionAnnotation
     network: EVMNetwork
+    broadcastOnSign: boolean
   }
 
 export type EnrichedLegacyTransactionSignatureRequest =
@@ -106,6 +107,7 @@ export type EnrichedLegacyTransactionSignatureRequest =
     from: string
     annotation?: TransactionAnnotation
     network: EVMNetwork
+    broadcastOnSign: boolean
   }
 
 export type EnrichedEIP1559TransactionRequest = EIP1559TransactionRequest & {
@@ -121,10 +123,18 @@ export type EnrichedEVMTransactionRequest =
   | EnrichedLegacyTransactionRequest
 
 type PartialEIP1559TransactionRequestWithFrom =
-  Partial<EIP1559TransactionRequest> & { from: string; network: EVMNetwork }
+  Partial<EIP1559TransactionRequest> & {
+    from: string
+    network: EVMNetwork
+    broadcastOnSign: boolean
+  }
 
 type PartialLegacyEVMTransactionRequestWithFrom =
-  Partial<LegacyEVMTransactionRequest> & { from: string; network: EVMNetwork }
+  Partial<LegacyEVMTransactionRequest> & {
+    from: string
+    network: EVMNetwork
+    broadcastOnSign: boolean
+  }
 
 export type PartialTransactionRequestWithFrom =
   | PartialEIP1559TransactionRequestWithFrom
diff --git a/background/services/internal-ethereum-provider/index.ts b/background/services/internal-ethereum-provider/index.ts
index 5af289d20..495a528ef 100644
--- a/background/services/internal-ethereum-provider/index.ts
+++ b/background/services/internal-ethereum-provider/index.ts
@@ -109,6 +109,7 @@ type Events = ServiceLifecycleEvents & {
     Partial<EnrichedEVMTransactionRequest> & {
       from: string
       network: EVMNetwork
+      broadcastOnSign: boolean
     },
     SignedTransaction
   >
@@ -245,6 +246,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
             ...(params[0] as JsonRpcTransactionRequest),
           },
           origin,
+          true,
         ).then(async (signed) => {
           await this.chainService.broadcastSignedTransaction(signed)
           return signed.hash
@@ -253,6 +255,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
         return this.signTransaction(
           params[0] as JsonRpcTransactionRequest,
           origin,
+          false,
         ).then((signedTransaction) =>
           serializeEthersTransaction(
             ethersTransactionFromSignedTransaction(signedTransaction),
@@ -394,6 +397,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
   private async signTransaction(
     transactionRequest: JsonRpcTransactionRequest,
     origin: string,
+    broadcastOnSign: boolean,
   ): Promise<SignedTransaction> {
     const annotation =
       origin === TAHO_INTERNAL_ORIGIN &&
@@ -457,6 +461,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
           from,
           network: currentNetwork,
           annotation,
+          broadcastOnSign,
         },
         resolver: resolve,
         rejecter: reject,
diff --git a/background/tests/factories.ts b/background/tests/factories.ts
index 18b7e0c2f..e9736f7f7 100644
--- a/background/tests/factories.ts
+++ b/background/tests/factories.ts
@@ -245,6 +245,7 @@ export const createTransactionRequest = (
   gasLimit: 0n,
   chainID: "0",
   network: ETHEREUM,
+  broadcastOnSign: true,
   ...overrides,
 })
 
@@ -264,6 +265,7 @@ export const createLegacyTransactionRequest = (
   to: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
   type: 0,
   value: 10000000000000000n,
+  broadcastOnSign: true,
   ...overrides,
 })
 
diff --git a/ui/components/DAppConnection/DAppConnectionInfoBar.tsx b/ui/components/DAppConnection/DAppConnectionInfoBar.tsx
index 4527c18e4..609dfe068 100644
--- a/ui/components/DAppConnection/DAppConnectionInfoBar.tsx
+++ b/ui/components/DAppConnection/DAppConnectionInfoBar.tsx
@@ -35,6 +35,7 @@ function DefaultConnectionPopover({ close }: PopoverProps): ReactElement {
     >
       <section>
         <SharedIcon
+          id="close"
           icon="close.svg"
           width={12}
           aria-label={tShared("close")}
diff --git a/ui/components/Shared/SharedAddress.tsx b/ui/components/Shared/SharedAddress.tsx
index 6f3c1befa..e7b49c42b 100644
--- a/ui/components/Shared/SharedAddress.tsx
+++ b/ui/components/Shared/SharedAddress.tsx
@@ -8,6 +8,7 @@ import SharedTooltip from "./SharedTooltip"
 import { trimWithEllipsis } from "../../utils/textUtils"
 
 type SharedAddressProps = {
+  id?: string
   address: string
   name?: string | undefined
   elide: boolean
@@ -31,6 +32,7 @@ type SharedAddressProps = {
  * `nameResolverSystem` prop is ignored.
  */
 export default function SharedAddress({
+  id,
   name,
   address,
   elide,
@@ -48,6 +50,7 @@ export default function SharedAddress({
 
   return (
     <button
+      id={id}
       type="button"
       onClick={copyAddress}
       title={`Copy to clipboard:\n${address}`}
diff --git a/ui/components/Shared/SharedCurrentAccountInformation.tsx b/ui/components/Shared/SharedCurrentAccountInformation.tsx
index 70070e404..d2e1ec20e 100644
--- a/ui/components/Shared/SharedCurrentAccountInformation.tsx
+++ b/ui/components/Shared/SharedCurrentAccountInformation.tsx
@@ -5,6 +5,7 @@ import { useAreInternalSignersUnlocked } from "../../hooks/signing-hooks"
 import SharedAvatar from "./SharedAvatar"
 
 type Props = {
+  address: string
   shortenedAddress: string
   name: string | undefined
   avatarURL: string | undefined
@@ -13,6 +14,7 @@ type Props = {
 }
 
 export default function SharedCurrentAccountInformation({
+  address,
   shortenedAddress,
   name,
   avatarURL,
@@ -23,7 +25,7 @@ export default function SharedCurrentAccountInformation({
   const icon = areInternalSignersUnlocked ? "unlock" : "lock"
   return (
     <div className={classNames("account_info_wrap", { hover: showHoverStyle })}>
-      <span className="account_info_label ellipsis">
+      <span title={address} className="account_info_label ellipsis">
         {name ?? shortenedAddress}
       </span>
       <SharedAvatar
diff --git a/ui/components/Shared/SharedIcon.tsx b/ui/components/Shared/SharedIcon.tsx
index 2b7cc8d3a..14820f93f 100644
--- a/ui/components/Shared/SharedIcon.tsx
+++ b/ui/components/Shared/SharedIcon.tsx
@@ -1,6 +1,7 @@
 import React, { CSSProperties, ReactElement } from "react"
 
 type Props = {
+  id?: string
   icon: string
   width: number
   height?: number
@@ -14,7 +15,14 @@ type Props = {
 }
 
 export default function SharedIcon(props: Props): ReactElement {
-  const { icon, width, height = width, color = "transparent", style } = props
+  const {
+    id,
+    icon,
+    width,
+    height = width,
+    color = "transparent",
+    style,
+  } = props
 
   if ("onClick" in props) {
     const {
@@ -27,6 +35,7 @@ export default function SharedIcon(props: Props): ReactElement {
 
     return (
       <button
+        id={id}
         className="icon"
         type="button"
         onClick={onClick}
@@ -60,7 +69,7 @@ export default function SharedIcon(props: Props): ReactElement {
   }
 
   return (
-    <i className="icon" style={style}>
+    <i id={id} className="icon" style={style}>
       <style jsx>{`
         .icon {
           display: inline-block;
diff --git a/ui/components/Shared/__tests__/SharedCurrentAccountInformation.test.tsx b/ui/components/Shared/__tests__/SharedCurrentAccountInformation.test.tsx
index 107095a04..91eee524a 100644
--- a/ui/components/Shared/__tests__/SharedCurrentAccountInformation.test.tsx
+++ b/ui/components/Shared/__tests__/SharedCurrentAccountInformation.test.tsx
@@ -4,6 +4,7 @@ import SharedCurrentAccountInformation from "../SharedCurrentAccountInformation"
 import { renderWithProviders } from "../../../tests/test-utils"
 
 const name = "Name"
+const address = "0x208e0000000000000000000000000000000090cd"
 const shortenedAddress = "0x208e…090cd"
 const keyringId = "lock"
 const lock = "lock"
@@ -14,6 +15,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
       />,
@@ -26,6 +28,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={undefined}
+        address={address}
         shortenedAddress={shortenedAddress}
         avatarURL={undefined}
       />,
@@ -38,6 +41,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus={false}
@@ -52,6 +56,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus
@@ -68,6 +73,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus
diff --git a/ui/components/SignData/EIP191Info.tsx b/ui/components/SignData/EIP191Info.tsx
index 1eef37c7e..25ed3ff60 100644
--- a/ui/components/SignData/EIP191Info.tsx
+++ b/ui/components/SignData/EIP191Info.tsx
@@ -17,7 +17,7 @@ export default function EIP191Info({
     <>
       <div className="message">
         <div className="message-title">{t("message")}</div>
-        <div className="light">{`${signingData}`}</div>
+        <div id="message-content" className="light">{`${signingData}`}</div>
       </div>
       <div className="message">
         <div className="signed">{t("signed")}</div>
diff --git a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/ContractInteractionSummary.tsx b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/ContractInteractionSummary.tsx
index afe0d9b97..87d6ad70d 100644
--- a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/ContractInteractionSummary.tsx
+++ b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/ContractInteractionSummary.tsx
@@ -23,6 +23,7 @@ export default function ContractInteractionSummary({
             t("newlyCreatedContract")
           ) : (
             <SharedAddress
+              id="recipientAddress"
               address={transactionRequest.to}
               name={
                 annotation !== undefined && "contractInfo" in annotation
diff --git a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/TransferSummary.tsx b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/TransferSummary.tsx
index 8b3388bd6..49a18ada7 100644
--- a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/TransferSummary.tsx
+++ b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/TransferSummary.tsx
@@ -51,7 +51,11 @@ export function TransferSummaryBase({
         <div className="container">
           <div className="label">{t("sendTo")}</div>
           <div className="send_to">
-            <SharedAddress address={recipientAddress} name={recipientName} />
+            <SharedAddress
+              id="recipientAddress"
+              address={recipientAddress}
+              name={recipientName}
+            />
           </div>
         </div>
         <div className="divider" />
diff --git a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/index.tsx b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/index.tsx
index 670928bdf..a334cc8c5 100644
--- a/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/index.tsx
+++ b/ui/components/Signing/SignatureDetails/TransactionSignatureDetails/index.tsx
@@ -11,12 +11,12 @@ export type TransactionSignatureDetailsProps = {
 export default function TransactionSignatureDetails({
   transactionRequest,
 }: TransactionSignatureDetailsProps): ReactElement {
-  const { annotation } = transactionRequest
+  const { annotation, broadcastOnSign } = transactionRequest
   const annotatedTransactionType = annotation?.type ?? "contract-interaction"
 
   return (
     <>
-      <div className="standard_width">
+      <div className="standard_width" data-broadcast-on-sign={broadcastOnSign}>
         <TransactionSignatureSummary
           transactionRequest={transactionRequest}
           annotation={annotation}
diff --git a/ui/components/Signing/Signer/SignerBaseFrame.tsx b/ui/components/Signing/Signer/SignerBaseFrame.tsx
index 31b14a08f..c92293e1d 100644
--- a/ui/components/Signing/Signer/SignerBaseFrame.tsx
+++ b/ui/components/Signing/Signer/SignerBaseFrame.tsx
@@ -30,11 +30,17 @@ export default function SignerBaseFrame({
     <>
       <div className="signature-details">{children}</div>
       <footer>
-        <TransactionButton size="large" type="secondary" onClick={onReject}>
+        <TransactionButton
+          id="reject"
+          size="large"
+          type="secondary"
+          onClick={onReject}
+        >
           {t("reject")}
         </TransactionButton>
 
         <TransactionButton
+          id="sign"
           type="primaryGreen"
           size="large"
           onClick={onConfirm}
diff --git a/ui/components/Signing/Signer/TransactionButton.tsx b/ui/components/Signing/Signer/TransactionButton.tsx
index b2aa1ed89..454882fa8 100644
--- a/ui/components/Signing/Signer/TransactionButton.tsx
+++ b/ui/components/Signing/Signer/TransactionButton.tsx
@@ -18,6 +18,7 @@ export type TransactionButtonProps = SharedButtonProps & {
 
 // TODO: Rename this to signing button
 export default function TransactionButton({
+  id,
   type,
   size,
   isDisabled,
@@ -93,6 +94,7 @@ export default function TransactionButton({
 
   const renderButton = () => (
     <SharedButton
+      id={id}
       type={type}
       size={size}
       onClick={onClick}
diff --git a/ui/components/Signing/SigningNetworkAccountInfoTopBar.tsx b/ui/components/Signing/SigningNetworkAccountInfoTopBar.tsx
index 2f3a0f25d..da36e45c2 100644
--- a/ui/components/Signing/SigningNetworkAccountInfoTopBar.tsx
+++ b/ui/components/Signing/SigningNetworkAccountInfoTopBar.tsx
@@ -26,6 +26,7 @@ export default function SigningNetworkAccountInfoTopBar({
       </div>
       <div className="row_part account">
         <SharedCurrentAccountInformation
+          address={accountTotal.address}
           shortenedAddress={shortenedAddress}
           name={name}
           avatarURL={avatarURL}
diff --git a/ui/components/Signing/index.tsx b/ui/components/Signing/index.tsx
old mode 100644
new mode 100755
diff --git a/ui/components/TopMenu/TopMenuProfileButton.tsx b/ui/components/TopMenu/TopMenuProfileButton.tsx
index ac233921c..95473a8f0 100644
--- a/ui/components/TopMenu/TopMenuProfileButton.tsx
+++ b/ui/components/TopMenu/TopMenuProfileButton.tsx
@@ -65,6 +65,7 @@ export default function TopMenuProfileButton(props: {
       >
         {truncatedAddress !== undefined && (
           <SharedCurrentAccountInformation
+            address={address ?? ""}
             shortenedAddress={truncatedAddress}
             name={name}
             avatarURL={avatarURL}
diff --git a/ui/pages/DAppConnect/DAppConnectPage.tsx b/ui/pages/DAppConnect/DAppConnectPage.tsx
index 844033b79..95a824e29 100644
--- a/ui/pages/DAppConnect/DAppConnectPage.tsx
+++ b/ui/pages/DAppConnect/DAppConnectPage.tsx
@@ -80,10 +80,20 @@ export default function DAppConnectPage({
         </ul>
       </section>
       <div className="footer_actions">
-        <SharedButton size="large" type="secondary" onClick={denyPermission}>
+        <SharedButton
+          id="denyPermission"
+          size="large"
+          type="secondary"
+          onClick={denyPermission}
+        >
           {t("rejectConnection")}
         </SharedButton>
-        <SharedButton type="primary" size="large" onClick={grantPermission}>
+        <SharedButton
+          id="grantPermission"
+          type="primary"
+          size="large"
+          onClick={grantPermission}
+        >
           {t("acceptConnection")}
         </SharedButton>
       </div>
diff --git a/ui/pages/NewCustomNetworkRequest.tsx b/ui/pages/NewCustomNetworkRequest.tsx
index 995b0648f..29a13c15c 100644
--- a/ui/pages/NewCustomNetworkRequest.tsx
+++ b/ui/pages/NewCustomNetworkRequest.tsx
@@ -156,7 +156,12 @@ export default function NewCustomNetworkRequest(): JSX.Element | null {
               >
                 {t("addNewChain.cancel")}
               </SharedButton>
-              <SharedButton size="large" type="primary" isFormSubmit>
+              <SharedButton
+                id="addNewChain"
+                size="large"
+                type="primary"
+                isFormSubmit
+              >
                 {t("addNewChain.submit")}
               </SharedButton>
             </>
diff --git a/ui/pages/Onboarding/Tabbed/AddWalletOptions.tsx b/ui/pages/Onboarding/Tabbed/AddWalletOptions.tsx
index fffdfaecb..542449377 100644
--- a/ui/pages/Onboarding/Tabbed/AddWalletOptions.tsx
+++ b/ui/pages/Onboarding/Tabbed/AddWalletOptions.tsx
@@ -7,6 +7,7 @@ import SharedButton from "../../../components/Shared/SharedButton"
 import SharedIcon from "../../../components/Shared/SharedIcon"
 
 type AddWalletRowProps = {
+  id: string
   icon: string
   label: string
   url?: string
@@ -14,6 +15,7 @@ type AddWalletRowProps = {
 }
 
 export function AddWalletRow({
+  id,
   icon,
   url,
   label,
@@ -21,6 +23,7 @@ export function AddWalletRow({
 }: AddWalletRowProps): JSX.Element {
   return (
     <SharedButton
+      id={id}
       style={{ width: "100%" }}
       type="unstyled"
       size="medium"
@@ -66,24 +69,28 @@ export default function AddWalletOptions(): JSX.Element {
   const optionsWithSpacer = useMemo(() => {
     const options = [
       {
+        id: "importSeed",
         label: t("options.importSeed"),
         icon: "add_wallet/import.svg",
         url: OnboardingRoutes.IMPORT_SEED,
         isAvailable: true,
       },
       {
+        id: "importPrivateKey",
         label: t("options.importPrivateKey"),
         icon: "key-light.svg",
         url: OnboardingRoutes.IMPORT_PRIVATE_KEY,
         isAvailable: true,
       },
       {
+        id: "ledger",
         label: t("options.ledger"),
         icon: "add_wallet/ledger.svg",
         url: OnboardingRoutes.LEDGER,
         isAvailable: isLedgerSupported,
       },
       {
+        id: "viewOnly",
         label: t("options.readOnly"),
         icon: "add_wallet/preview.svg",
         url: OnboardingRoutes.VIEW_ONLY_WALLET,
@@ -101,10 +108,10 @@ export default function AddWalletOptions(): JSX.Element {
           return <li key={option} className="spacer" role="presentation" />
         }
 
-        const { label, icon, url } = option
+        const { id, label, icon, url } = option
         return (
           <li key={url}>
-            <AddWalletRow icon={icon} url={url} label={label} />
+            <AddWalletRow id={id} icon={icon} url={url} label={label} />
           </li>
         )
       })}
diff --git a/ui/pages/Onboarding/Tabbed/ImportSeed.tsx b/ui/pages/Onboarding/Tabbed/ImportSeed.tsx
index 3eccbb941..290eaa87e 100644
--- a/ui/pages/Onboarding/Tabbed/ImportSeed.tsx
+++ b/ui/pages/Onboarding/Tabbed/ImportSeed.tsx
@@ -120,6 +120,7 @@ export default function ImportSeed(props: Props): ReactElement {
           />
           <div className="bottom">
             <SharedButton
+              id="import"
               style={{
                 width: "100%",
                 boxSizing: "border-box",
diff --git a/ui/pages/Onboarding/Tabbed/Intro.tsx b/ui/pages/Onboarding/Tabbed/Intro.tsx
index 16194c2e9..524547aa9 100644
--- a/ui/pages/Onboarding/Tabbed/Intro.tsx
+++ b/ui/pages/Onboarding/Tabbed/Intro.tsx
@@ -20,6 +20,7 @@ export default function Intro(): ReactElement {
       </header>
       <div className="actions">
         <SharedButton
+          id="existingWallet"
           type="primary"
           size="large"
           linkTo={OnboardingRoutes.ADD_WALLET}
@@ -36,6 +37,7 @@ export default function Intro(): ReactElement {
           {t("useExisting")}
         </SharedButton>
         <SharedButton
+          id="newWallet"
           type="secondary"
           size="large"
           linkTo={OnboardingRoutes.NEW_SEED}
diff --git a/ui/pages/Onboarding/Tabbed/OnboardingAdditionalWallet.tsx b/ui/pages/Onboarding/Tabbed/OnboardingAdditionalWallet.tsx
index 15409b7d2..7bd56c1ff 100644
--- a/ui/pages/Onboarding/Tabbed/OnboardingAdditionalWallet.tsx
+++ b/ui/pages/Onboarding/Tabbed/OnboardingAdditionalWallet.tsx
@@ -33,6 +33,7 @@ export default function OnboardingAdditionalWallet(): JSX.Element {
           <ul className="list_container">
             <li>
               <AddWalletRow
+                id="newSeed"
                 icon="icons/m/wallet.svg"
                 label={t("options.createNew")}
                 url={OnboardingRoutes.NEW_SEED}
diff --git a/ui/pages/Onboarding/Tabbed/SetPassword.tsx b/ui/pages/Onboarding/Tabbed/SetPassword.tsx
index 82963dbf3..03d4bbb88 100644
--- a/ui/pages/Onboarding/Tabbed/SetPassword.tsx
+++ b/ui/pages/Onboarding/Tabbed/SetPassword.tsx
@@ -191,6 +191,7 @@ export default function SetPassword(): JSX.Element {
         >
           <div className="input_wrap">
             <PasswordInput
+              id="password"
               label="Password"
               name="password"
               onChange={handleInputChange(setPassword)}
@@ -204,6 +205,7 @@ export default function SetPassword(): JSX.Element {
           </div>
           <div className="input_wrap repeat_password_wrap">
             <PasswordInput
+              id="passwordConfirm"
               name="confirm_password"
               label="Repeat Password"
               onChange={handleInputChange(setPasswordConfirmation)}
@@ -215,6 +217,7 @@ export default function SetPassword(): JSX.Element {
             <WalletDefaultToggle />
           </div>
           <SharedButton
+            id="confirm"
             type="primary"
             size="large"
             showLoadingOnClick={!passwordErrorMessage}