diff --git a/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx b/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx
index 0840232f2b..de343c03df 100644
--- a/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx
+++ b/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx
@@ -15,14 +15,13 @@ import {
 import dayjs from 'dayjs'
 import { getProviderForChainId } from '@/token-bridge-sdk/utils'
 
-import { isTokenDeposit } from '../../state/app/utils'
 import {
   ChainPair,
   UseTransactionHistoryResult
 } from '../../hooks/useTransactionHistory'
 import { Tooltip } from '../common/Tooltip'
 import { getNetworkName } from '../../util/networks'
-import { isTxPending } from './helpers'
+import { getTransactionType, isTxPending } from './helpers'
 import { PendingDepositWarning } from './PendingDepositWarning'
 import { TransactionsTableRow } from './TransactionsTableRow'
 import { EmptyTransactionHistory } from './EmptyTransactionHistory'
@@ -176,9 +175,13 @@ export const TransactionHistoryTable = (
     )
   }, [contentWrapperRef.current?.offsetTop, transactions.length])
 
-  const pendingTokenDepositsCount = useMemo(() => {
-    return transactions.filter(tx => isTokenDeposit(tx) && isTxPending(tx))
-      .length
+  const hasPendingArbitrumBridgeDeposits = useMemo(() => {
+    return transactions.some(
+      tx =>
+        !tx.isWithdrawal &&
+        isTxPending(tx) &&
+        getTransactionType(tx) === 'arbitrum'
+    )
   }, [transactions])
 
   const topmostPendingTxId = useMemo(() => {
@@ -237,7 +240,9 @@ export const TransactionHistoryTable = (
             {!completed && <LoadMoreButton onClick={resume} />}
           </div>
         )}
-        <div>{pendingTokenDepositsCount > 0 && <PendingDepositWarning />}</div>
+        <div>
+          {hasPendingArbitrumBridgeDeposits && <PendingDepositWarning />}
+        </div>
       </div>
 
       <Table
diff --git a/packages/arb-token-bridge-ui/src/token-bridge-sdk/EthDepositStarter.ts b/packages/arb-token-bridge-ui/src/token-bridge-sdk/EthDepositStarter.ts
index f074ad4ba7..1800fd2f83 100644
--- a/packages/arb-token-bridge-ui/src/token-bridge-sdk/EthDepositStarter.ts
+++ b/packages/arb-token-bridge-ui/src/token-bridge-sdk/EthDepositStarter.ts
@@ -180,9 +180,9 @@ export class EthDepositStarter extends BridgeTransferStarter {
       destinationAddress: destinationAddress ?? address,
       overrides: parentChainOverrides,
       retryableGasOverrides: {
-        // the gas limit may vary by about 20k due to SSTORE (zero vs nonzero)
-        // the 30% gas limit increase should cover the difference
-        gasLimit: { percentIncrease: BigNumber.from(30) }
+        gasLimit: {
+          percentIncrease: BigNumber.from(DEFAULT_GAS_PRICE_PERCENT_INCREASE)
+        }
       }
     })