diff --git a/.containerversion b/.containerversion
index bb95160cb6..a787364590 100644
--- a/.containerversion
+++ b/.containerversion
@@ -1 +1 @@
-33
+34
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53c813ebd1..8f5a051002 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -239,8 +239,6 @@ jobs:
       - name: Build Windows app
         run: |
           make qt-windows
-          cd frontends/qt
-          makensis setup.nsi
       - name: Upload Installer
         id: upload
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 7dee330ef2..457d24417d 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -10,11 +10,66 @@ on:
   workflow_dispatch:
 
 jobs:
+  compute-version:
+    name: Compute firmware container version
+    runs-on: ubuntu-latest
+    outputs:
+      firmware_version: ${{ steps.get_version.outputs.firmware_version }}
+    steps:
+      - name: Checkout firmware repo
+        uses: actions/checkout@v4
+        with:
+          repository: BitBoxSwiss/bitbox02-firmware
+          path: bitbox02-firmware
+
+      - name: Read .containerversion
+        id: get_version
+        run: |
+          version=$(cat bitbox02-firmware/.containerversion)
+          echo "Firmware version: $version"
+          echo "firmware_version=$version" >> $GITHUB_OUTPUT
+
+  build-simulator:
+    name: Build simulator in container
+    runs-on: ubuntu-latest
+    needs: compute-version
+    container:
+      image: shiftcrypto/firmware_v2:${{ needs.compute-version.outputs.firmware_version }}
+    steps:
+      - name: Checkout firmware repo
+        uses: actions/checkout@v4
+        with:
+          repository: BitBoxSwiss/bitbox02-firmware
+          submodules: true
+          path: bitbox02-firmware
+
+      - name: Fetch tags
+        working-directory: bitbox02-firmware
+        run: git fetch --tags
+
+      - name: Build simulator
+        working-directory: bitbox02-firmware
+        run: make simulator
+
+      - name: Upload simulator binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: simulator-binary
+          path: bitbox02-firmware/build-build-noasan/bin/simulator
+
   run-tests:
     runs-on: ubuntu-latest
+    needs: build-simulator
     steps:
       - uses: actions/checkout@v3
 
+      - name: Download simulator artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: simulator-binary
+          path: ./simulator-bin
+
+
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
@@ -28,13 +83,19 @@ jobs:
       - name: Install Playwright browsers
         run: |
           cd frontends/web
-          npx playwright install --with-deps
+          npx playwright install --with-deps chromium webkit
+
+
+      - name: Restore executable permission
+        run: chmod +x simulator-bin/simulator
 
       - name: Run Playwright tests
+        env:
+          SIMULATOR_PATH: ${{ github.workspace }}/simulator-bin/simulator
         run: make webe2etest
 
       - name: Upload Playwright artifacts
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: playwright-artifacts
diff --git a/APP_VERSION b/APP_VERSION
new file mode 100644
index 0000000000..9590e88895
--- /dev/null
+++ b/APP_VERSION
@@ -0,0 +1 @@
+4.49.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed6799c964..3c388b2b6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
 ## Unreleased
+- Add a dropdown on the "Receiver address" input in the send screen to select an account
+
+## v4.49.0
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
 - Added BTC Direct sell option
 - Added a banner to remind user to backup their seed phrase when an account reaches a certain threshold.
@@ -21,11 +24,16 @@
 - More efficient account initialization by fetching all account Bitcoin xpubs at once
 - Enable search transactions by note, address, or txid
 - Move "Export" (export transactions) to account info page
-- Add a dropdown on the "Receiver address" input in the send screen to select an account
+- Show coinfinty logo when requesting an address
+- Update decimal formatting for stablecoin transactions
+- Change block explorer to mempool.space
+- Integrate Bitrefill and add spending section
+
+## v4.48.8
+- Bundle BitBox02 Nova firmware version v9.23.3
 
 ## v4.48.7
 - ios: fix Pocket user verification button
-- Change block explorer to mempool.space
 
 ## v4.48.6
 - Android: restore support for Android 6 and Android 5
@@ -33,7 +41,6 @@
 ## v4.48.5
 - Bundle BitBox02 firmware version v9.23.2
 - iOS: fix wrong timezone when confirming time on BitBox02 (it would always show the time in UTC)
-- Integrate Bitrefill and add spending section
 
 ## v4.48.4
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
diff --git a/Dockerfile b/Dockerfile
index a1bf4b87fc..dcf7497fc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN --mount=target=/mnt,source=scripts DEBIAN_FRONTEND=noninteractive /mnt/docke
 ARG SYS_GOPATH=/opt/go
 ENV PATH=${SYS_GOPATH}/bin:/usr/local/go/bin:$PATH
 
-RUN --mount=target=/mnt/Makefile,source=Makefile GOPATH=${SYS_GOPATH} make -C /mnt envinit
+RUN --mount=target=/mnt/Makefile,source=Makefile --mount=target=/mnt/version.mk.inc,source=version.mk.inc GOPATH=${SYS_GOPATH} make -C /mnt envinit
 
 ENV PATH=/opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
 
diff --git a/Makefile b/Makefile
index acc1646605..cd0801bdea 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,11 @@
 SHELL    := /bin/bash
 WEBROOT  := frontends/web
 
+include version.mk.inc
+
+GO_LDFLAGS := $(GO_VERSION_LDFLAGS)
+GO_RUN := go run -mod=vendor -ldflags "$(GO_LDFLAGS)"
+
 catch:
 	@echo "Choose a make target."
 envinit:
@@ -28,15 +33,17 @@ gomobileinit:
 	git clone https://github.com/BitBoxSwiss/mobile.git /tmp/mobile && cd /tmp/mobile/cmd/gomobile && go install .
 	gomobile init
 servewallet:
-	go run -mod=vendor ./cmd/servewallet
+	$(GO_RUN) ./cmd/servewallet
 servewallet-mainnet:
-	go run -mod=vendor ./cmd/servewallet -mainnet
+	$(GO_RUN) ./cmd/servewallet -mainnet
 servewallet-regtest:
-	rm -f appfolder.dev/cache/headers-rbtc.bin && rm -rf appfolder.dev/cache/account-*rbtc* && go run -mod=vendor ./cmd/servewallet -regtest
+	rm -f appfolder.dev/cache/headers-rbtc.bin && rm -rf appfolder.dev/cache/account-*rbtc* && $(GO_RUN) ./cmd/servewallet -regtest
 servewallet-prodservers:
-	go run -mod=vendor ./cmd/servewallet -devservers=false
+	$(GO_RUN) ./cmd/servewallet -devservers=false
 servewallet-mainnet-prodservers:
-	go run -mod=vendor ./cmd/servewallet -mainnet -devservers=false
+	$(GO_RUN) ./cmd/servewallet -mainnet -devservers=false
+servewallet-simulator:
+	$(GO_RUN) ./cmd/servewallet -simulator=true
 buildweb:
 	node --version
 	npm --version
diff --git a/README.md b/README.md
index a3bb139d8d..df85fbe10a 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,27 @@ Run `make servewallet` and `make webdev` in seperate terminals.
 Before the first use of `make webdev`, you also need to run `make buildweb`, to install the dev
 dependencies.
 
+#### Local development with BB02 simulator
+
+The app can be used together with a [BB02 simulator](https://github.com/BitBoxSwiss/bitbox02-firmware/tree/master/test/simulator).
+
+In order to do so:
+
+* Build the simulator (checkout https://github.com/BitBoxSwiss/bitbox02-firmware/, then from the root repo run `make dockerdev` followed by `make simulator`)
+
+* Execute the simulator.
+
+  * Use `--port` if you want it to listen to a custom port (default is 15423)
+
+  * Set the environment variable `FAKE_MEMORY_FILEPATH` to a filepath if you want the simulator to write to file rather than in memory. This allows to re-use the same seed across different executions.
+
+* Launch the BBApp in simulator mode by providing a custom flag `--simulator`.
+
+
+If the simulator is listening on a custom port, `--simulatorPort=<port>` must also be provided.
+
+Note: the simulator is currently only supported in the servewallet and in the Qt app and only when the app runs in testnet mode.
+
 #### Watch and build the UI
 
 Run `make webdev` to develop the UI inside a web browser (for quick development, automatic rebuilds
diff --git a/backend/accounts.go b/backend/accounts.go
index f40141f2ee..38c503c96f 100644
--- a/backend/accounts.go
+++ b/backend/accounts.go
@@ -1722,20 +1722,23 @@ func (backend *Backend) checkAccountUsed(account accounts.Interface) {
 			return
 		}
 	}
+
 	log := backend.log.WithField("accountCode", account.Config().Config.Code)
-	txs, err := account.Transactions()
-	if err != nil {
-		log.WithError(err).Error("discoverAccount")
-		return
-	}
+	if !account.Config().Config.Used {
+		txs, err := account.Transactions()
+		if err != nil {
+			log.WithError(err).Error("discoverAccount")
+			return
+		}
 
-	if len(txs) == 0 {
-		// Invoke this here too because even if an account is unused, we scan up to 5 accounts.
-		backend.maybeAddHiddenUnusedAccounts()
-		return
+		if len(txs) == 0 {
+			// Invoke this here too because even if an account is unused, we scan up to 5 accounts.
+			backend.maybeAddHiddenUnusedAccounts()
+			return
+		}
 	}
 	log.Info("marking account as used")
-	err = backend.config.ModifyAccountsConfig(func(accountsConfig *config.AccountsConfig) error {
+	err := backend.config.ModifyAccountsConfig(func(accountsConfig *config.AccountsConfig) error {
 		acct := accountsConfig.Lookup(account.Config().Config.Code)
 		if acct == nil {
 			return errp.Newf("could not find account")
diff --git a/backend/accounts_test.go b/backend/accounts_test.go
index 77c7536dea..1887035406 100644
--- a/backend/accounts_test.go
+++ b/backend/accounts_test.go
@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts"
+	accountsMocks "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/mocks"
 	accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/addresses"
@@ -1676,3 +1677,60 @@ func TestAccountsFiatAndCoinBalance(t *testing.T) {
 	}
 
 }
+
+func TestCheckAccountUsed(t *testing.T) {
+	b := newBackend(t, testnetDisabled, regtestDisabled)
+	b.tstCheckAccountUsed = nil
+	defer b.Close()
+	accountMocks := map[accountsTypes.Code]*accountsMocks.InterfaceMock{}
+	// A Transactions function that always returns one transaction, so the account is always used.
+	txFunc := func() (accounts.OrderedTransactions, error) {
+		return accounts.OrderedTransactions{&accounts.TransactionData{}}, nil
+	}
+
+	b.makeBtcAccount = func(config *accounts.AccountConfig, coin *btc.Coin, gapLimits *types.GapLimits, getAddress func(coinpkg.Code, blockchain.ScriptHashHex) (*addresses.AccountAddress, error), log *logrus.Entry) accounts.Interface {
+		accountMock := MockBtcAccount(t, config, coin, gapLimits, log)
+		accountMock.TransactionsFunc = txFunc
+		accountMocks[config.Config.Code] = accountMock
+		return accountMock
+	}
+
+	b.makeEthAccount = func(config *accounts.AccountConfig, coin *eth.Coin, httpClient *http.Client, log *logrus.Entry) accounts.Interface {
+		accountMock := MockEthAccount(config, coin, httpClient, log)
+		accountMock.TransactionsFunc = txFunc
+		accountMocks[config.Config.Code] = accountMock
+		return accountMock
+	}
+
+	ks1 := makeBitBox02Multi()
+
+	ks1Fingerprint, err := ks1.RootFingerprint()
+	require.NoError(t, err)
+
+	b.registerKeystore(ks1)
+	require.NoError(t, b.SetWatchonly(ks1Fingerprint, true))
+
+	accountsByKestore, err := b.AccountsByKeystore()
+	require.NoError(t, err)
+
+	accountList, ok := accountsByKestore[hex.EncodeToString(ks1Fingerprint)]
+	require.True(t, ok, "Expected accounts for keystore with fingerprint %s", hex.EncodeToString(ks1Fingerprint))
+
+	// Check all accounts, make sure they are set as used.
+	for _, acct := range accountList {
+		mock, ok := accountMocks[acct.Config().Config.Code]
+		require.True(t, ok, "No mock for account %s", acct.Config().Config.Code)
+
+		b.checkAccountUsed(acct)
+		// Ensure that Transactions is called
+		require.Len(t, mock.TransactionsCalls(), 1)
+		require.True(t, acct.Config().Config.Used)
+
+		// Call checkAccountUsed again, Transactions should not be called again.
+		b.checkAccountUsed(acct)
+		require.Len(t, mock.TransactionsCalls(), 1)
+		// And Used should still be true.
+		require.True(t, acct.Config().Config.Used)
+	}
+
+}
diff --git a/backend/backend.go b/backend/backend.go
index d29f11bfa7..62a5fabdb6 100644
--- a/backend/backend.go
+++ b/backend/backend.go
@@ -52,6 +52,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore/software"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/rates"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo"
 	utilConfig "github.com/BitBoxSwiss/bitbox-wallet-app/util/config"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/locker"
@@ -66,7 +67,7 @@ import (
 )
 
 func init() {
-	electrum.SetClientSoftwareVersion(Version)
+	electrum.SetClientSoftwareVersion(versioninfo.Version)
 }
 
 // fixedURLWhitelist is always allowed by SystemOpen, in addition to some
diff --git a/backend/bridgecommon/bridgecommon.go b/backend/bridgecommon/bridgecommon.go
index c57e14f434..760d63eafe 100644
--- a/backend/bridgecommon/bridgecommon.go
+++ b/backend/bridgecommon/bridgecommon.go
@@ -32,6 +32,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/bluetooth"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/usb"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/handlers"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/config"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/jsonp"
@@ -286,6 +287,7 @@ func (env *BackendEnvironment) BluetoothConnect(identifier string) {
 // Serve serves the BitBox API for use in a native client.
 func Serve(
 	testnet bool,
+	simulator bool,
 	gapLimits *btctypes.GapLimits,
 	communication NativeCommunication,
 	backendEnvironment backend.Environment) {
@@ -301,9 +303,14 @@ func Serve(
 	log.Info("--------------- Started application --------------")
 	log.WithField("goos", runtime.GOOS).
 		WithField("goarch", runtime.GOARCH).
-		WithField("version", backend.Version).
+		WithField("version", versioninfo.Version).
 		Info("environment")
 
+	if simulator {
+		log.Info("Simulator mode enabled, ensuring testnet mode is enabled")
+		testnet = true
+	}
+
 	var err error
 	globalBackend, err = backend.NewBackend(
 		arguments.NewArguments(
diff --git a/backend/bridgecommon/bridgecommon_test.go b/backend/bridgecommon/bridgecommon_test.go
index 4a41f47337..1dce858b74 100644
--- a/backend/bridgecommon/bridgecommon_test.go
+++ b/backend/bridgecommon/bridgecommon_test.go
@@ -78,6 +78,7 @@ func (e environment) BluetoothConnect(string) {}
 // TestServeShutdownServe checks that you can call Serve twice in a row.
 func TestServeShutdownServe(t *testing.T) {
 	bridgecommon.Serve(
+		false,
 		false,
 		nil,
 		communication{},
@@ -88,6 +89,7 @@ func TestServeShutdownServe(t *testing.T) {
 	done := make(chan struct{})
 	go func() {
 		bridgecommon.Serve(
+			false,
 			false,
 			nil,
 			communication{},
diff --git a/backend/coins/eth/account.go b/backend/coins/eth/account.go
index 693fb97185..88bd70ab5a 100644
--- a/backend/coins/eth/account.go
+++ b/backend/coins/eth/account.go
@@ -702,11 +702,13 @@ func (account *Account) SendTx(txNote string) (string, error) {
 // If the service should not be reachable, we fallback to only one priority, estimated by
 // the ETH RPC eth_gasPrice endpoint.
 func (account *Account) feeTargets() []*ethtypes.FeeTarget {
-	etherscanFeeTargets, err := account.coin.client.FeeTargets(context.TODO())
-	if err == nil {
-		return etherscanFeeTargets
+	if account.coin.code != coin.CodeSEPETH {
+		etherscanFeeTargets, err := account.coin.client.FeeTargets(context.TODO())
+		if err == nil {
+			return etherscanFeeTargets
+		}
+		account.log.WithError(err).Error("Could not get fee targets from eth gas station, falling back to RPC eth_gasPrice")
 	}
-	account.log.WithError(err).Error("Could not get fee targets from eth gas station, falling back to RPC eth_gasPrice")
 	suggestedGasPrice, err := account.coin.client.SuggestGasPrice(context.TODO())
 	if err != nil {
 		account.log.WithError(err).Error("Fallback to RPC eth_gasPrice failed")
diff --git a/backend/coins/eth/coin.go b/backend/coins/eth/coin.go
index ad4162ffb1..ecc29b1c65 100644
--- a/backend/coins/eth/coin.go
+++ b/backend/coins/eth/coin.go
@@ -158,7 +158,15 @@ func (coin *Coin) unitFactor(isFee bool) *big.Int {
 func (coin *Coin) FormatAmount(amount coinpkg.Amount, isFee bool) string {
 	factor := coin.unitFactor(isFee)
 	s := new(big.Rat).SetFrac(amount.BigInt(), factor).FloatString(18)
-	return strings.TrimRight(strings.TrimRight(s, "0"), ".")
+	s = strings.TrimRight(strings.TrimRight(s, "0"), ".")
+	// For USDC/USDT, display 2 decimals when there's only 1
+	if coin.unit == "USDC" || coin.unit == "USDT" {
+		parts := strings.Split(s, ".")
+		if len(parts) == 2 && len(parts[1]) == 1 {
+			s += "0"
+		}
+	}
+	return s
 }
 
 // ToUnit implements coin.Coin.
diff --git a/backend/coins/eth/coin_test.go b/backend/coins/eth/coin_test.go
index 94d61eddf7..a35cf205e7 100644
--- a/backend/coins/eth/coin_test.go
+++ b/backend/coins/eth/coin_test.go
@@ -28,6 +28,8 @@ type testSuite struct {
 	suite.Suite
 	coin      *Coin
 	ERC20Coin *Coin
+	USDTCoin  *Coin
+	USDCCoin  *Coin
 }
 
 func (s *testSuite) SetupTest() {
@@ -54,6 +56,30 @@ func (s *testSuite) SetupTest() {
 		nil,
 		erc20.NewToken("0x0000000000000000000000000000000000000001", 12),
 	)
+
+	s.USDTCoin = NewCoin(
+		nil,
+		"eth-erc20-usdt",
+		"Tether USD",
+		"USDT",
+		"ETH",
+		params.MainnetChainConfig,
+		"",
+		nil,
+		erc20.NewToken("0xdac17f958d2ee523a2206206994597c13d831ec7", 6),
+	)
+
+	s.USDCCoin = NewCoin(
+		nil,
+		"eth-erc20-usdc",
+		"USD Coin",
+		"USDC",
+		"ETH",
+		params.MainnetChainConfig,
+		"",
+		nil,
+		erc20.NewToken("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", 6),
+	)
 }
 
 func TestSuite(t *testing.T) {
@@ -92,6 +118,29 @@ func (s *testSuite) TestFormatAmount() {
 		"0.123456789012345678",
 		s.ERC20Coin.FormatAmount(coin.NewAmountFromInt64(123456789012345678), true),
 	)
+
+	stablecoinTests := []struct {
+		amount   int64
+		expected string
+	}{
+		{1100000, "1.10"},
+		{1000000, "1"},
+		{1120000, "1.12"},
+		{1123000, "1.123"},
+		{100000, "0.10"},
+		{1000000000, "1000"},
+	}
+
+	for _, test := range stablecoinTests {
+		s.Require().Equal(
+			test.expected,
+			s.USDTCoin.FormatAmount(coin.NewAmountFromInt64(test.amount), false),
+		)
+		s.Require().Equal(
+			test.expected,
+			s.USDCCoin.FormatAmount(coin.NewAmountFromInt64(test.amount), false),
+		)
+	}
 }
 
 func (s *testSuite) TestSetAmount() {
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.gz
deleted file mode 100644
index 4de25f9aa8..0000000000
Binary files a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.gz and /dev/null differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.sha256
deleted file mode 100644
index 380a07afdc..0000000000
--- a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.sha256
+++ /dev/null
@@ -1 +0,0 @@
-7476febce1e914f52c9d1c7ce860823cf5e965bded76eb420982c55f8dbd9dfe
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.gz
new file mode 100644
index 0000000000..590a7e8ace
Binary files /dev/null and b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.gz differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.sha256
new file mode 100644
index 0000000000..ea2682b1a7
--- /dev/null
+++ b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.sha256
@@ -0,0 +1 @@
+eea1dce4d281b557e8034ffe3fac8ba24432e2c1b583b6038cb8be730e93d7c3
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz
deleted file mode 100644
index eb9a81cfdb..0000000000
Binary files a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz and /dev/null differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz.sha256
deleted file mode 100644
index 86bbf80e8e..0000000000
--- a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-473f0f110ffa969444e3b37dd1399a6fac8463e8cbaed267af88f92f1c2c8281
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.gz
new file mode 100644
index 0000000000..e202cb92f2
Binary files /dev/null and b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.gz differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.sha256
new file mode 100644
index 0000000000..e1cae5a734
--- /dev/null
+++ b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02-multi.v9.24.0.signed.bin.sha256
@@ -0,0 +1 @@
+41f1053ecdf2edc02834408f5cef0cd3d685913f3846619fbbbfa29b0461d9bc
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz
deleted file mode 100644
index 0d6540b092..0000000000
Binary files a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz and /dev/null differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz.sha256
deleted file mode 100644
index 380a07afdc..0000000000
--- a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-7476febce1e914f52c9d1c7ce860823cf5e965bded76eb420982c55f8dbd9dfe
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.gz
new file mode 100644
index 0000000000..585b689b0e
Binary files /dev/null and b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.gz differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.sha256
new file mode 100644
index 0000000000..ea2682b1a7
--- /dev/null
+++ b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.sha256
@@ -0,0 +1 @@
+eea1dce4d281b557e8034ffe3fac8ba24432e2c1b583b6038cb8be730e93d7c3
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz
deleted file mode 100644
index 1104ba11f6..0000000000
Binary files a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz and /dev/null differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz.sha256
deleted file mode 100644
index 86bbf80e8e..0000000000
--- a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-473f0f110ffa969444e3b37dd1399a6fac8463e8cbaed267af88f92f1c2c8281
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.gz b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.gz
new file mode 100644
index 0000000000..7a3213d247
Binary files /dev/null and b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.gz differ
diff --git a/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.sha256 b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.sha256
new file mode 100644
index 0000000000..e1cae5a734
--- /dev/null
+++ b/backend/devices/bitbox02bootloader/assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.sha256
@@ -0,0 +1 @@
+41f1053ecdf2edc02834408f5cef0cd3d685913f3846619fbbbfa29b0461d9bc
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
index 50fc855f8b..1d9c687dcd 100644
--- a/backend/devices/bitbox02bootloader/firmware.go
+++ b/backend/devices/bitbox02bootloader/firmware.go
@@ -34,30 +34,30 @@ var intermediateFirmwareBinaryMulti_9_17_1 []byte
 
 // BitBox02
 
-//go:embed assets/firmware-bitbox02-btconly.v9.23.2.signed.bin.gz
+//go:embed assets/firmware-bitbox02-btconly.v9.24.0.signed.bin.gz
 var firmwareBinaryBTCOnly []byte
-var firmwareVersionBTCOnly = semver.NewSemVer(9, 23, 2)
-var firmwareMonotonicVersionBtcOnly uint32 = 45
+var firmwareVersionBTCOnly = semver.NewSemVer(9, 24, 0)
+var firmwareMonotonicVersionBtcOnly uint32 = 47
 
-//go:embed assets/firmware-bitbox02-multi.v9.23.2.signed.bin.gz
+//go:embed assets/firmware-bitbox02-multi.v9.24.0.signed.bin.gz
 var firmwareBinaryMulti []byte
-var firmwareVersionMulti = semver.NewSemVer(9, 23, 2)
-var firmwareMonotonicVersionMulti uint32 = 45
+var firmwareVersionMulti = semver.NewSemVer(9, 24, 0)
+var firmwareMonotonicVersionMulti uint32 = 47
 
 // BitBox02 Nova.
 
-//go:embed assets/firmware-bitbox02nova-btconly.v9.23.2.signed.bin.gz
+//go:embed assets/firmware-bitbox02nova-btconly.v9.24.0.signed.bin.gz
 var firmwareBB02PlusBinaryBTCOnly []byte
-var firmwareBB02PlusVersionBTCOnly = semver.NewSemVer(9, 23, 2)
-var firmwareBB02PlusMonotonicVersionBtcOnly uint32 = 45
+var firmwareBB02PlusVersionBTCOnly = semver.NewSemVer(9, 24, 0)
+var firmwareBB02PlusMonotonicVersionBtcOnly uint32 = 47
 
 // TODO: set to false / remove before production. This is only to allow upgrading unsigned firmware.
 const plusIsPlaceholder = false
 
-//go:embed assets/firmware-bitbox02nova-multi.v9.23.2.signed.bin.gz
+//go:embed assets/firmware-bitbox02nova-multi.v9.24.0.signed.bin.gz
 var firmwareBB02PlusBinaryMulti []byte
-var firmwareBB02PlusVersionMulti = semver.NewSemVer(9, 23, 2)
-var firmwareBB02PlusMonotonicVersionMulti uint32 = 45
+var firmwareBB02PlusVersionMulti = semver.NewSemVer(9, 24, 0)
+var firmwareBB02PlusMonotonicVersionMulti uint32 = 47
 
 type firmwareInfo struct {
 	version          *semver.SemVer
diff --git a/backend/devices/bitbox02bootloader/firmware_test.go b/backend/devices/bitbox02bootloader/firmware_test.go
index 232d655153..cbf9ad882f 100644
--- a/backend/devices/bitbox02bootloader/firmware_test.go
+++ b/backend/devices/bitbox02bootloader/firmware_test.go
@@ -45,7 +45,7 @@ func testHash(t *testing.T, info firmwareInfo, expectedProduct bitbox02common.Pr
 func TestBundledFirmware(t *testing.T) {
 	for _, fw := range bundledFirmwares[bitbox02common.ProductBitBox02Multi] {
 		t.Run("bitbox02-multi/"+fw.version.String(), func(t *testing.T) {
-			filename := fmt.Sprintf("assets/firmware-bitbox02-multi.v%s.signed.bin.gz.sha256", fw.version)
+			filename := fmt.Sprintf("assets/firmware-bitbox02-multi.v%s.signed.bin.sha256", fw.version)
 			if fw.version.String() == "9.17.1" {
 				filename = fmt.Sprintf("assets/firmware.v%s.signed.bin.sha256", fw.version)
 			}
@@ -65,13 +65,13 @@ func TestBundledFirmware(t *testing.T) {
 
 	for _, fw := range bundledFirmwares[bitbox02common.ProductBitBox02PlusMulti] {
 		t.Run("bitbox02nova-multi/"+fw.version.String(), func(t *testing.T) {
-			testHash(t, fw, bitbox02common.ProductBitBox02PlusMulti, fmt.Sprintf("assets/firmware-bitbox02nova-multi.v%s.signed.bin.gz.sha256", fw.version))
+			testHash(t, fw, bitbox02common.ProductBitBox02PlusMulti, fmt.Sprintf("assets/firmware-bitbox02nova-multi.v%s.signed.bin.sha256", fw.version))
 		})
 	}
 
 	for _, fw := range bundledFirmwares[bitbox02common.ProductBitBox02PlusBTCOnly] {
 		t.Run("bitbox02nova-btconly/"+fw.version.String(), func(t *testing.T) {
-			testHash(t, fw, bitbox02common.ProductBitBox02PlusBTCOnly, fmt.Sprintf("assets/firmware-bitbox02nova-btconly.v%s.signed.bin.gz.sha256", fw.version))
+			testHash(t, fw, bitbox02common.ProductBitBox02PlusBTCOnly, fmt.Sprintf("assets/firmware-bitbox02nova-btconly.v%s.signed.bin.sha256", fw.version))
 		})
 	}
 }
diff --git a/backend/handlers/handlers.go b/backend/handlers/handlers.go
index d137bb33f7..809dbc15ff 100644
--- a/backend/handlers/handlers.go
+++ b/backend/handlers/handlers.go
@@ -50,6 +50,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/market"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/rates"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo"
 	utilConfig "github.com/BitBoxSwiss/bitbox-wallet-app/util/config"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/jsonp"
@@ -547,7 +548,7 @@ func (handlers *Handlers) getDetectDarkTheme(r *http.Request) interface{} {
 }
 
 func (handlers *Handlers) getVersion(*http.Request) interface{} {
-	return backend.Version.String()
+	return versioninfo.Version.String()
 }
 
 func (handlers *Handlers) getTesting(*http.Request) interface{} {
diff --git a/backend/mobileserver/Makefile b/backend/mobileserver/Makefile
index 0621d8ae74..3da5c3d6e8 100644
--- a/backend/mobileserver/Makefile
+++ b/backend/mobileserver/Makefile
@@ -1,10 +1,11 @@
 include ../../android-env.mk.inc
+include ../../version.mk.inc
 
 # Set -glflags to fix the vendor issue with gomobile, see: https://github.com/golang/go/issues/67927#issuecomment-2241523694
 build-android:
 	# androidapi version should match minSdkVersion in frontends/android/BitBoxApp/app/build.gradle
-	ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w" -trimpath -target android -androidapi 21 .
+	ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w $(GO_VERSION_LDFLAGS)" -trimpath -target android -androidapi 21 .
 build-ios:
-	gomobile bind -x -a -glflags="-mod=readonly" -tags="timetzdata" -trimpath -ldflags="-s -w" -target ios,iossimulator .
+	gomobile bind -x -a -glflags="-mod=readonly" -tags="timetzdata" -trimpath -ldflags="-s -w $(GO_VERSION_LDFLAGS)" -target ios,iossimulator .
 clean:
 	rm -f mobileserver.aar mobileserver-sources.jar
diff --git a/backend/mobileserver/mobileserver.go b/backend/mobileserver/mobileserver.go
index c3856946e3..59417f34b4 100644
--- a/backend/mobileserver/mobileserver.go
+++ b/backend/mobileserver/mobileserver.go
@@ -185,6 +185,7 @@ func Serve(dataDir string, testnet bool, environment GoEnvironmentInterface, goA
 
 	bridgecommon.Serve(
 		testnet,
+		false,
 		nil,
 		goAPI,
 		&bridgecommon.BackendEnvironment{
diff --git a/backend/update.go b/backend/update.go
index 6d67a81aa3..f87e2fce9a 100644
--- a/backend/update.go
+++ b/backend/update.go
@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
 	"github.com/BitBoxSwiss/bitbox02-api-go/util/semver"
@@ -25,11 +26,6 @@ import (
 
 const updateFileURL = "https://bitboxapp.shiftcrypto.io/desktop.json"
 
-var (
-	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 48, 7)
-)
-
 // UpdateFile is retrieved from the server.
 type UpdateFile struct {
 	// CurrentVersion stores the current version and is not loaded from the server.
@@ -66,11 +62,11 @@ func (backend *Backend) checkForUpdate() (*UpdateFile, error) {
 		return nil, errp.WithStack(err)
 	}
 
-	if Version.AtLeast(updateFile.NewVersion) {
+	if versioninfo.Version.AtLeast(updateFile.NewVersion) {
 		return nil, nil
 	}
 
-	updateFile.CurrentVersion = Version
+	updateFile.CurrentVersion = versioninfo.Version
 	return &updateFile, nil
 }
 
diff --git a/backend/versioninfo/versioninfo.go b/backend/versioninfo/versioninfo.go
new file mode 100644
index 0000000000..990854d517
--- /dev/null
+++ b/backend/versioninfo/versioninfo.go
@@ -0,0 +1,34 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package versioninfo
+
+import (
+	"github.com/BitBoxSwiss/bitbox02-api-go/util/semver"
+)
+
+var (
+	// versionString is overridden at build time via go ldflags.
+	versionString = "0.0.1"
+	// Version of the backend as displayed to the user.
+	Version *semver.SemVer
+)
+
+func init() {
+	parsed, err := semver.NewSemVerFromString(versionString)
+	if err != nil {
+		panic(err)
+	}
+	Version = parsed
+}
diff --git a/cmd/servewallet/main.go b/cmd/servewallet/main.go
index bcb9f95273..afac902fb1 100644
--- a/cmd/servewallet/main.go
+++ b/cmd/servewallet/main.go
@@ -29,6 +29,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/bitbox02/simulator"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/usb"
 	backendHandlers "github.com/BitBoxSwiss/bitbox-wallet-app/backend/handlers"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/config"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/system"
@@ -74,7 +75,7 @@ func (webdevEnvironment) DeviceInfos() []usb.DeviceInfo {
 	testDeviceInfo := simulator.TestDeviceInfo()
 	if testDeviceInfo != nil {
 		// We are in "test device" mode.
-		return []usb.DeviceInfo{*testDeviceInfo}
+		return []usb.DeviceInfo{testDeviceInfo}
 	}
 	return usb.DeviceInfos()
 }
@@ -179,6 +180,11 @@ func main() {
 		}
 	}(log)
 	log.Info("--------------- Started application --------------")
+	log.WithField("goos", runtime.GOOS).
+		WithField("goarch", runtime.GOARCH).
+		WithField("version", versioninfo.Version).
+		Info("environment")
+
 	// since we are in dev-mode, we can drop the authorization token
 	connectionData := backendHandlers.NewConnectionData(-1, "")
 	newBackend, err := backendPkg.NewBackend(
@@ -199,6 +205,10 @@ func main() {
 	fmt.Printf("Listening on: http://localhost:%d\n", port)
 
 	if *useSimulator {
+		// The simulator is only allowed when running in testnet mode.
+		if !backend.Testing() {
+			log.Panic("The BitBox02 simulator can only be used in testnet mode.")
+		}
 		simulator.Init(*simulatorPort)
 	}
 
diff --git a/docs/BUILD.md b/docs/BUILD.md
index 1a691c96a9..436befb8ab 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -105,9 +105,7 @@ Build the QT frontend for Windows: `make qt-windows`
 
 Build artifacts:
 * `frontends\qt\build\windows\*`
-
-To create the installer, run the NSIS UI, then: compile NSI scripts -> frontend/qt/setup.nsi, or run
-`makensis setup.nsi`.
+* `frontends\qt\build\BitBox-installer.exe`
 
 ## Android
 
diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle
index 737f9fcf5c..d984940ad0 100644
--- a/frontends/android/BitBoxApp/app/build.gradle
+++ b/frontends/android/BitBoxApp/app/build.gradle
@@ -1,5 +1,12 @@
 apply plugin: 'com.android.application'
 
+def repoRoot = project.projectDir.parentFile.parentFile.parentFile.parentFile
+def appVersionFile = new File(repoRoot, "APP_VERSION")
+if (!appVersionFile.exists()) {
+    throw new GradleException("APP_VERSION not found at ${appVersionFile}")
+}
+def appVersion = appVersionFile.text.trim()
+
 android {
     compileSdk 35
     // Keep in sync with android-env.mk.inc and the NDK installed in docker_install.sh.
@@ -10,8 +17,8 @@ android {
         // in backend/mobileserver/Makefile
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 64
-        versionName "android-4.48.6"
+        versionCode 66
+        versionName "${appVersion}"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/frontends/ios/.gitignore b/frontends/ios/.gitignore
index 48b07741bb..78a36e109c 100644
--- a/frontends/ios/.gitignore
+++ b/frontends/ios/.gitignore
@@ -1,2 +1,3 @@
 xcuserdata
-/BitBoxApp/BitBoxApp/assets/web/
\ No newline at end of file
+/BitBoxApp/BitBoxApp/assets/web/
+/BitBoxApp/AppVersion.xcconfig
diff --git a/frontends/ios/BitBoxApp/BitBoxApp.xcodeproj/project.pbxproj b/frontends/ios/BitBoxApp/BitBoxApp.xcodeproj/project.pbxproj
index 1ed49e2122..9fabce9c32 100644
--- a/frontends/ios/BitBoxApp/BitBoxApp.xcodeproj/project.pbxproj
+++ b/frontends/ios/BitBoxApp/BitBoxApp.xcodeproj/project.pbxproj
@@ -657,7 +657,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"BitBoxApp/Preview Content\"";
-				DEVELOPMENT_TEAM = MXZQ99HRD6;
+				DEVELOPMENT_TEAM = XK248TQN88;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitBoxApp/Info.plist;
@@ -689,7 +689,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"BitBoxApp/Preview Content\"";
-				DEVELOPMENT_TEAM = MXZQ99HRD6;
+				DEVELOPMENT_TEAM = XK248TQN88;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitBoxApp/Info.plist;
diff --git a/frontends/ios/BitBoxApp/Config.xcconfig b/frontends/ios/BitBoxApp/Config.xcconfig
index e0dd7c43a7..69ffa6a244 100644
--- a/frontends/ios/BitBoxApp/Config.xcconfig
+++ b/frontends/ios/BitBoxApp/Config.xcconfig
@@ -1,9 +1,9 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-// App version
-MARKETING_VERSION = 4.48.7
+// AppVersion.xcconfig is generated by `make prepare`.
+#include "AppVersion.xcconfig"
 
 // Build number, increment this for every separate publication,
 // even if the app version is the same.
-CURRENT_PROJECT_VERSION = 12
+CURRENT_PROJECT_VERSION = 14
diff --git a/frontends/ios/Makefile b/frontends/ios/Makefile
index f9b0882d52..0acd6c17c3 100644
--- a/frontends/ios/Makefile
+++ b/frontends/ios/Makefile
@@ -3,6 +3,7 @@ prepare:
 	rm -rf BitBoxApp/BitBoxApp/assets/web/
 	mkdir -p BitBoxApp/BitBoxApp/assets/web/
 	cp -aR ../web/build/* BitBoxApp/BitBoxApp/assets/web/
+	echo MARKETING_VERSION = $(shell cat ../../APP_VERSION) > BitBoxApp/AppVersion.xcconfig
 	# Build Mobileserver.xcframework. No need to copy it, the xcode project references it
 	# directly from the mobileserver folder.
 	cd ../../backend/mobileserver && ${MAKE} build-ios
diff --git a/frontends/qt/BitBox.pro b/frontends/qt/BitBox.pro
index ae95c46509..3c80241ff4 100644
--- a/frontends/qt/BitBox.pro
+++ b/frontends/qt/BitBox.pro
@@ -32,7 +32,6 @@ include(external/singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 
 win32 {
-    # -llibssp would be nice to have on Windows
     LIBS += -L$$PWD/server/ -llibserver
     DESTDIR = $$PWD/build/windows
     RC_ICONS += $$PWD/resources/win/icon.ico
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
index 0268a65051..a85b196d52 100644
--- a/frontends/qt/Makefile
+++ b/frontends/qt/Makefile
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 include ../../env.mk.inc
+include ../../version.mk.inc
 
 # Add Wayland libs so the app can run natively on Wayland too.
 # The linuxdeployqt maintainer unfortunately refuses to support it automatically: https://github.com/probonopd/linuxdeployqt/issues/189
@@ -54,8 +55,8 @@ linux:
 	cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
 	mkdir build/tmp-deb/opt/
 	cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.48.5 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.48.5 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v $(APP_VERSION) -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v $(APP_VERSION) -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && \
 		./squashfs-root/AppRun BitBox \
@@ -74,6 +75,8 @@ osx:
 	mkdir build/osx
 	mv build/BitBox.app build/osx/
 	cp resources/MacOS/Info.plist build/osx/BitBox.app/Contents/
+	/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $(APP_VERSION)" build/osx/BitBox.app/Contents/Info.plist
+	/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $(APP_VERSION)" build/osx/BitBox.app/Contents/Info.plist
 	mkdir -p build/osx/BitBox.app/Contents/Resources
 	cp resources/MacOS/icon.icns build/osx/BitBox.app/Contents/Resources/
 	cd build/osx/ && macdeployqt BitBox.app
diff --git a/frontends/qt/make_windows.sh b/frontends/qt/make_windows.sh
index 1d268d528d..65026c1f6a 100644
--- a/frontends/qt/make_windows.sh
+++ b/frontends/qt/make_windows.sh
@@ -21,4 +21,6 @@ env -u MAKE -u MAKEFLAGS cmd "/C compile_windows.bat"
 cp build/assets.rcc build/windows/
 cp server/libserver.dll build/windows/
 windeployqt build/windows/BitBox.exe
-cp "$MINGW_BIN/libssp-0.dll" build/windows/
+
+APP_VERSION="$(cat ../../APP_VERSION)"
+makensis -DVERSION="${APP_VERSION}.0" setup.nsi
diff --git a/frontends/qt/resources/MacOS/Info.plist b/frontends/qt/resources/MacOS/Info.plist
index 8182449535..b11767e66a 100644
--- a/frontends/qt/resources/MacOS/Info.plist
+++ b/frontends/qt/resources/MacOS/Info.plist
@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.48.5</string>
+	<string>0.0.1</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.48.5</string>
+	<string>0.0.1</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>
diff --git a/frontends/qt/server/Makefile.linux b/frontends/qt/server/Makefile.linux
index 70e0c04a25..1e4961db87 100644
--- a/frontends/qt/server/Makefile.linux
+++ b/frontends/qt/server/Makefile.linux
@@ -1,5 +1,6 @@
 include ../../../hardening.mk.inc
 include ../../../env.mk.inc
+include ../../../version.mk.inc
 CGO=1
 BUILDMODE=c-shared
 GOARCH=amd64
@@ -12,7 +13,8 @@ linux:
 	CGO_LDFLAGS="${GOLNXLDFLAGS} ${LFLAGS}" \
 	GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \
 	go build -trimpath -x -mod=vendor -buildmode=${BUILDMODE} -ldflags \
-		-extldflags="${GOLNXEXTLDFLAGS}" -o ${LIBNAME}.so
+		"$(GO_VERSION_LDFLAGS) -extldflags=\"$(GOLNXEXTLDFLAGS)\"" \
+		-o ${LIBNAME}.so
 
 clean:
 	-rm -f ${LIBNAME}.so
diff --git a/frontends/qt/server/Makefile.macosx b/frontends/qt/server/Makefile.macosx
index c76d0d816c..aa52ad15d8 100644
--- a/frontends/qt/server/Makefile.macosx
+++ b/frontends/qt/server/Makefile.macosx
@@ -1,5 +1,6 @@
 include ../../../hardening.mk.inc
 include ../../../env.mk.inc
+include ../../../version.mk.inc
 CGO=1
 BUILDMODE=c-shared
 GOOS=darwin
@@ -9,8 +10,8 @@ darwin:
 	CGO_CFLAGS="-g ${GODARWINSECFLAGS} ${CFLAGS}" \
 	CGO_LDFLAGS="${GODARWINLDFLAGS} ${LFLAGS}" \
 	MACOSX_DEPLOYMENT_TARGET=${MACOS_MIN_VERSION} \
-	GOARCH=arm64 CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} go build -trimpath -ldflags='-s' -x -mod=vendor -buildmode="c-shared" -o ${LIBNAME}_arm64.so
-	GOARCH=amd64 CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} go build -trimpath -ldflags='-s' -x -mod=vendor -buildmode="c-shared" -o ${LIBNAME}_amd64.so
+	GOARCH=arm64 CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} go build -trimpath -ldflags="-s $(GO_VERSION_LDFLAGS)" -x -mod=vendor -buildmode="c-shared" -o ${LIBNAME}_arm64.so
+	GOARCH=amd64 CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} go build -trimpath -ldflags="-s $(GO_VERSION_LDFLAGS)" -x -mod=vendor -buildmode="c-shared" -o ${LIBNAME}_amd64.so
 	lipo -create -output ${LIBNAME}.so ${LIBNAME}_arm64.so ${LIBNAME}_amd64.so
 	# Without this, the internal names of the two libs are libserver_arm64.so and libserver_amd64.so, and
 	# will be linked with these names in the final executable (even though the library is fat and its name is libserver.so).
diff --git a/frontends/qt/server/Makefile.windows b/frontends/qt/server/Makefile.windows
index a36ad02de5..95f45e218f 100644
--- a/frontends/qt/server/Makefile.windows
+++ b/frontends/qt/server/Makefile.windows
@@ -1,5 +1,6 @@
 include ../../../hardening.mk.inc
 include ../../../env.mk.inc
+include ../../../version.mk.inc
 CGO=1
 BUILDMODE=c-shared
 GOARCH=amd64
@@ -10,8 +11,9 @@ windows:
 	CGO_CFLAGS="${GOWINSECFLAGS} ${CFLAGS}" \
 	CGO_LDFLAGS="${GOWINLDFLAGS} ${LFLAGS}" \
 	GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \
-       	go build -trimpath -x -mod=vendor \
-        -buildmode="${BUILDMODE}" -o ${LIBNAME}.dll
+	go build -trimpath -x -mod=vendor \
+	-ldflags "$(GO_VERSION_LDFLAGS)" \
+	-buildmode="${BUILDMODE}" -o ${LIBNAME}.dll
 
 windows-cross:
 	CC=/usr/bin/x86_64-w64-mingw32-gcc \
@@ -19,11 +21,12 @@ windows-cross:
 	CGO_CFLAGS="-g ${GOWINSECFLAGS} ${CFLAGS}" \
 	CGO_LDFLAGS="${GOWINLDFLAGS} ${LFLAGS}" \
 	GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} GOTOOLCHAIN=${GOTOOLCHAIN} \
-       	go build -trimpath -x -mod=vendor \
-        -buildmode="${BUILDMODE}" -o ${LIBNAME}.dll
+	go build -trimpath -x -mod=vendor \
+	-ldflags "$(GO_VERSION_LDFLAGS)" \
+	-buildmode="${BUILDMODE}" -o ${LIBNAME}.dll
 
 windows-legacy:
-	CGO_ENABLED=1 go build -mod=vendor -ldflags="-s -w" -buildmode=c-archive \
+	CGO_ENABLED=1 go build -mod=vendor -ldflags="-s -w $(GO_VERSION_LDFLAGS)" -buildmode=c-archive \
 		-o libserver.a
 	gcc server.def libserver.a -shared -lwinmm -lhid -lsetupapi -lWs2_32 \
 		-o libserver.dll -Wl,--out-implib,libserver.lib
diff --git a/frontends/qt/server/server.go b/frontends/qt/server/server.go
index 82f5dfe364..3fc2929e25 100644
--- a/frontends/qt/server/server.go
+++ b/frontends/qt/server/server.go
@@ -68,6 +68,7 @@ import (
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/bridgecommon"
 	btctypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/bitbox02/simulator"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/usb"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/mobileserver"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
@@ -109,6 +110,14 @@ func setOnline(isReachable bool) {
 	bridgecommon.SetOnline(isReachable)
 }
 
+func deviceInfos() []usb.DeviceInfo {
+	testDeviceInfo := simulator.TestDeviceInfo()
+	if testDeviceInfo != nil {
+		return []usb.DeviceInfo{testDeviceInfo}
+	}
+	return usb.DeviceInfos()
+}
+
 //export serve
 func serve(
 	cppHeapFreeFn C.cppHeapFree,
@@ -121,6 +130,8 @@ func serve(
 	log := logging.Get().WithGroup("server")
 	log.WithField("args", os.Args).Info("Started Qt application")
 	testnet := flag.Bool("testnet", false, "activate testnets")
+	simulatorPort := flag.Int("simulatorPort", 15423, "port for the BitBox02 simulator")
+	useSimulator := flag.Bool("simulator", false, "use the BitBox02 simulator. It implies --testnet.")
 
 	if runtime.GOOS == "darwin" {
 		// eat "-psn_xxxx" on Mac, which is passed when starting an app from Finder for the first time.
@@ -146,12 +157,17 @@ func serve(
 		}
 	}
 
+	if *useSimulator {
+		simulator.Init(*simulatorPort)
+	}
+
 	// Capture C string early to avoid potential use when it's already popped
 	// from the stack.
 	nativeLocale := C.GoString(preferredLocale)
 
 	bridgecommon.Serve(
 		*testnet,
+		*useSimulator,
 		gapLimits,
 		&nativeCommunication{
 			respond: func(queryID int, response string) {
@@ -171,7 +187,7 @@ func serve(
 				defer C.free(unsafe.Pointer(cText))
 				C.notifyUser(notifyUserFn, cText)
 			},
-			DeviceInfosFunc:     usb.DeviceInfos,
+			DeviceInfosFunc:     deviceInfos,
 			SystemOpenFunc:      system.Open,
 			UsingMobileDataFunc: func() bool { return false },
 			NativeLocaleFunc:    func() string { return nativeLocale },
diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi
index 73983e84cd..5cb13bf909 100755
--- a/frontends/qt/setup.nsi
+++ b/frontends/qt/setup.nsi
@@ -22,7 +22,9 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.48.5.0
+!ifndef VERSION
+!error "VERSION define not provided (pass -DVERSION=major.minor.patch.build)"
+!endif
 !define COMPANY "Shift Crypto AG"
 !define URL https://github.com/BitBoxSwiss/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"
diff --git a/frontends/web/eslint.config.mjs b/frontends/web/eslint.config.mjs
index 9e84b5c34b..816a435dc3 100644
--- a/frontends/web/eslint.config.mjs
+++ b/frontends/web/eslint.config.mjs
@@ -26,7 +26,6 @@ export default tseslint.config(
       'brace-style': ['error', '1tbs'],
       'comma-spacing': ['error', { 'before': false, 'after': true }],
       'curly': 'error',
-      'indent': ['error', 2, { 'SwitchCase': 0 }],
       'jsx-a11y/anchor-is-valid': 0,
       'jsx-a11y/alt-text' : 0,
       'jsx-quotes': ['error', 'prefer-double'],
@@ -36,7 +35,6 @@ export default tseslint.config(
       'no-trailing-spaces': 'error',
       'object-curly-spacing': ['error', 'always'],
       'quotes': ['error', 'single'],
-      'semi': 'error',
       'space-before-blocks': ['error', 'always'],
       'space-in-parens': ['error', 'never'],
       'no-extra-semi': 'error',
@@ -63,6 +61,19 @@ export default tseslint.config(
         'logical': 'parens-new-line'
       }],
       '@stylistic/type-generic-spacing': ['error'],
+      '@stylistic/indent': ['error', 2, { "SwitchCase": 0 }],
+      '@stylistic/semi': ["error", "always"],
+      '@stylistic/member-delimiter-style': ['error', {
+        "multiline": {
+          "delimiter": "semi",
+          "requireLast": true
+        },
+        "singleline": {
+          "delimiter": "semi",
+          "requireLast": false
+        },
+        "multilineDetection": "brackets"
+      }],
     },
   },
   {
diff --git a/frontends/web/package-lock.json b/frontends/web/package-lock.json
index dc7a19b42e..3df33a8057 100644
--- a/frontends/web/package-lock.json
+++ b/frontends/web/package-lock.json
@@ -1620,6 +1620,7 @@
     },
     "node_modules/@parcel/watcher-wasm/node_modules/napi-wasm": {
       "version": "1.1.0",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
diff --git a/frontends/web/package.json b/frontends/web/package.json
index e6096e497b..cd57026f3e 100644
--- a/frontends/web/package.json
+++ b/frontends/web/package.json
@@ -51,7 +51,7 @@
     "dev": "npm run start",
     "start": "vite --cors --host",
     "build": "npm run typescript && vite build",
-    "lint": "npm run typescript && eslint ./src",
+    "lint": "npm run typescript && eslint ./src ./tests",
     "lint-debug": "eslint ./src --inspect-config",
     "typescript": "tsc -p tsconfig.json",
     "test": "vitest",
diff --git a/frontends/web/playwright.config.ts b/frontends/web/playwright.config.ts
index 021295b9e1..b9aabd4df3 100644
--- a/frontends/web/playwright.config.ts
+++ b/frontends/web/playwright.config.ts
@@ -4,6 +4,7 @@ import * as path from 'path';
 // Read defaults from environment variables if set, otherwise fallback
 const HOST = process.env.HOST || 'localhost';
 const FRONTEND_PORT = parseInt(process.env.FRONTEND_PORT || '8080', 10);
+const PLAYWRIGHT_SLOW_MO = parseInt(process.env.PLAYWRIGHT_SLOW_MO || '0', 10);
 
 export default defineConfig({
   testDir: path.join(__dirname, 'tests'),
@@ -17,12 +18,19 @@ export default defineConfig({
     },
   ],
   timeout: 120_000,
+  workers: 1, // Tests are not parallel-safe yet.
   use: {
     baseURL: `http://${HOST}:${FRONTEND_PORT}`,
     headless: true,
-    video: 'retain-on-failure',
+    video: 'on',
     screenshot: 'only-on-failure',
-    trace: 'retain-on-failure',
+    trace: 'on',
+    launchOptions: {
+      // By default, tests are not run in slow motion.
+      // Can be enabled by setting the PLAYWRIGHT_SLOW_MO environment variable to a value > 0.
+      // This is useful for running tests locally.
+      slowMo: PLAYWRIGHT_SLOW_MO,
+    },
   },
   reporter: [['html', { open: 'never' }], ['list']],
   outputDir: 'test-results/',
diff --git a/frontends/web/src/api/account.ts b/frontends/web/src/api/account.ts
index 0aaada6701..602dcd2749 100644
--- a/frontends/web/src/api/account.ts
+++ b/frontends/web/src/api/account.ts
@@ -27,7 +27,7 @@ export type AccountCode = string;
 
 export type Fiat = 'AUD' | 'BRL' | 'BTC' | 'CAD' | 'CHF' | 'CNY' | 'CZK' | 'EUR' | 'GBP' | 'HKD' | 'ILS' | 'JPY' | 'KRW' | 'NOK' | 'NZD' | 'PLN' | 'RUB' | 'sat' | 'SEK' | 'SGD' | 'USD';
 
-export type ConversionUnit = Fiat | 'sat'
+export type ConversionUnit = Fiat | 'sat';
 
 export type CoinUnit = 'BTC' | 'sat' | 'LTC' | 'ETH' | 'TBTC' | 'tsat' | 'TLTC' | 'SEPETH';
 
@@ -38,9 +38,9 @@ export type ERC20CoinCode = 'erc20Test' | 'eth-erc20-usdt' | 'eth-erc20-usdc' |
 export type CoinCode = NativeCoinCode | ERC20CoinCode;
 
 export type FiatWithDisplayName = {
-  currency: Fiat,
-  displayName: string
-}
+  currency: Fiat;
+  displayName: string;
+};
 
 export type Terc20Token = {
   code: ERC20CoinCode;
@@ -48,10 +48,10 @@ export type Terc20Token = {
   unit: ERC20TokenUnit;
 };
 
-export interface IActiveToken {
+export type TActiveToken = {
   tokenCode: ERC20CoinCode;
   accountCode: AccountCode;
-}
+};
 
 export type TKeystore = {
   watchonly: boolean;
@@ -61,7 +61,7 @@ export type TKeystore = {
   connected: boolean;
 };
 
-export interface IAccount {
+export type TAccount = {
   keystore: TKeystore;
   active: boolean;
   watch: boolean;
@@ -71,13 +71,13 @@ export interface IAccount {
   code: AccountCode;
   name: string;
   isToken: boolean;
-  activeTokens?: IActiveToken[];
+  activeTokens?: TActiveToken[];
   blockExplorerTxPrefix: string;
   bitsuranceStatus?: TDetailStatus;
   accountNumber?: number;
-}
+};
 
-export const getAccounts = (): Promise<IAccount[]> => {
+export const getAccounts = (): Promise<TAccount[]> => {
   return apiGet('accounts');
 };
 
@@ -92,9 +92,9 @@ export type TAmountsByCoin = {
 };
 
 export type TKeystoreBalance = {
-    fiatUnit: ConversionUnit;
-    total: string;
-    coinsBalance?: TAmountsByCoin;
+  fiatUnit: ConversionUnit;
+  total: string;
+  coinsBalance?: TAmountsByCoin;
 };
 
 export type TKeystoresBalance = {
@@ -111,7 +111,7 @@ export type TAccountsBalanceSummaryResponse = {
   accountsBalanceSummary: TAccountsBalanceSummary;
 } | {
   success: false;
-}
+};
 
 export const getAccountsBalanceSummary = (): Promise<TAccountsBalanceSummaryResponse> => {
   return apiGet('accounts/balance-summary');
@@ -120,20 +120,20 @@ export const getAccountsBalanceSummary = (): Promise<TAccountsBalanceSummaryResp
 type TEthAccountCodeAndNameByAddress = SuccessResponse & {
   code: AccountCode;
   name: string;
-}
+};
 
 export const getEthAccountCodeAndNameByAddress = (address: string): Promise<TEthAccountCodeAndNameByAddress> => {
   return apiPost('accounts/eth-account-code', { address });
 };
 
-export interface IStatus {
-    disabled: boolean;
-    synced: boolean;
-    fatalError: boolean;
-    offlineError: string | null;
-}
+export type TStatus = {
+  disabled: boolean;
+  synced: boolean;
+  fatalError: boolean;
+  offlineError: string | null;
+};
 
-export const getStatus = (code: AccountCode): Promise<IStatus> => {
+export const getStatus = (code: AccountCode): Promise<TStatus> => {
   return apiGet(`account/${code}/status`);
 };
 
@@ -141,32 +141,32 @@ export type ScriptType = 'p2pkh' | 'p2wpkh-p2sh' | 'p2wpkh' | 'p2tr';
 
 export const allScriptTypes: ScriptType[] = ['p2pkh', 'p2wpkh-p2sh', 'p2wpkh', 'p2tr'];
 
-export interface IKeyInfo {
-    keypath: string;
-    rootFingerprint: string;
-    xpub: string;
-}
+type TKeyInfo = {
+  keypath: string;
+  rootFingerprint: string;
+  xpub: string;
+};
 
 export type TBitcoinSimple = {
-    keyInfo: IKeyInfo;
-    scriptType: ScriptType;
-}
+  keyInfo: TKeyInfo;
+  scriptType: ScriptType;
+};
 
 export type TEthereumSimple = {
-    keyInfo: IKeyInfo;
-}
+  keyInfo: TKeyInfo;
+};
 
 export type TSigningConfiguration = {
-    bitcoinSimple: TBitcoinSimple;
-    ethereumSimple?: never;
+  bitcoinSimple: TBitcoinSimple;
+  ethereumSimple?: never;
 } | {
-    bitcoinSimple?: never;
-    ethereumSimple: TEthereumSimple;
-}
+  bitcoinSimple?: never;
+  ethereumSimple: TEthereumSimple;
+};
 
 export type TSigningConfigurationList = null | {
-    signingConfigurations: TSigningConfiguration[];
-}
+  signingConfigurations: TSigningConfiguration[];
+};
 
 export const getInfo = (code: AccountCode) => {
   return (): Promise<TSigningConfigurationList> => {
@@ -184,52 +184,52 @@ export type FormattedLineData = LineData & {
 
 export type ChartData = FormattedLineData[];
 
-export type TChartDataResponse = {
-    success: true;
-    data: TChartData;
+type TChartDataResponse = {
+  success: true;
+  data: TChartData;
 } | {
   success: false;
-}
+};
 
 export type TChartData = {
-    chartDataMissing: boolean;
-    chartDataDaily: ChartData;
-    chartDataHourly: ChartData;
-    chartFiat: ConversionUnit;
-    chartTotal: number | null;
-    formattedChartTotal: string | null;
-    chartIsUpToDate: boolean; // only valid if chartDataMissing is false
-    lastTimestamp: number;
-}
+  chartDataMissing: boolean;
+  chartDataDaily: ChartData;
+  chartDataHourly: ChartData;
+  chartFiat: ConversionUnit;
+  chartTotal: number | null;
+  formattedChartTotal: string | null;
+  chartIsUpToDate: boolean; // only valid if chartDataMissing is false
+  lastTimestamp: number;
+};
 
 export const getChartData = (): Promise<TChartDataResponse> => {
   return apiGet('chart-data');
 };
 
-export type Conversions = {
-    [key in Fiat]?: string;
+type Conversions = {
+  [key in Fiat]?: string;
 };
 
 export type TAmountWithConversions = {
-    amount: string;
-    conversions?: Conversions;
-    unit: CoinUnit;
-    estimated: boolean;
+  amount: string;
+  conversions?: Conversions;
+  unit: CoinUnit;
+  estimated: boolean;
 };
 
-export interface IBalance {
-    hasAvailable: boolean;
-    available: TAmountWithConversions;
-    hasIncoming: boolean;
-    incoming: TAmountWithConversions;
-}
+export type TBalance = {
+  hasAvailable: boolean;
+  available: TAmountWithConversions;
+  hasIncoming: boolean;
+  incoming: TAmountWithConversions;
+};
 
-export type TBalanceResponse = {
+type TBalanceResponse = {
   success: true;
-  balance: IBalance;
+  balance: TBalance;
 } | {
   success: false;
-}
+};
 
 export const getBalance = (code: AccountCode): Promise<TBalanceResponse> => {
   return apiGet(`account/${code}/balance`);
@@ -238,39 +238,39 @@ export const getBalance = (code: AccountCode): Promise<TBalanceResponse> => {
 export type TTransactionStatus = 'complete' | 'pending' | 'failed';
 export type TTransactionType = 'send' | 'receive' | 'send_to_self';
 
-export interface ITransaction {
-    addresses: string[];
-    amount: TAmountWithConversions;
-    amountAtTime: TAmountWithConversions;
-    fee: TAmountWithConversions;
-    feeRatePerKb: TAmountWithConversions;
-    deductedAmountAtTime: TAmountWithConversions;
-    gas: number;
-    nonce: number | null;
-    internalID: string;
-    note: string;
-    numConfirmations: number;
-    numConfirmationsComplete: number;
-    size: number;
-    status: TTransactionStatus;
-    time: string | null;
-    type: TTransactionType;
-    txID: string;
-    vsize: number;
-    weight: number;
-}
-
-export type TTransactions = { success: false } | { success: true; list: ITransaction[]; };
-
-export interface INoteTx {
-    internalTxID: string;
-    note: string;
-}
+export type TTransaction = {
+  addresses: string[];
+  amount: TAmountWithConversions;
+  amountAtTime: TAmountWithConversions;
+  fee: TAmountWithConversions;
+  feeRatePerKb: TAmountWithConversions;
+  deductedAmountAtTime: TAmountWithConversions;
+  gas: number;
+  nonce: number | null;
+  internalID: string;
+  note: string;
+  numConfirmations: number;
+  numConfirmationsComplete: number;
+  size: number;
+  status: TTransactionStatus;
+  time: string | null;
+  type: TTransactionType;
+  txID: string;
+  vsize: number;
+  weight: number;
+};
+
+export type TTransactions = { success: false } | { success: true; list: TTransaction[] };
+
+type TNoteTx = {
+  internalTxID: string;
+  note: string;
+};
 
 export const postNotesTx = (code: AccountCode, {
   internalTxID,
   note,
-}: INoteTx): Promise<null> => {
+}: TNoteTx): Promise<null> => {
   return apiPost(`account/${code}/notes/tx`, { internalTxID, note });
 };
 
@@ -278,39 +278,39 @@ export const getTransactionList = (code: AccountCode): Promise<TTransactions> =>
   return apiGet(`account/${code}/transactions`);
 };
 
-export const getTransaction = (code: AccountCode, id: ITransaction['internalID']): Promise<ITransaction | null> => {
+export const getTransaction = (code: AccountCode, id: TTransaction['internalID']): Promise<TTransaction | null> => {
   return apiGet(`account/${code}/transaction?id=${id}`);
 };
 
-export interface IExport {
-    success: boolean;
-    path: string;
-    errorMessage: string;
-}
+type TExport = {
+  success: boolean;
+  path: string;
+  errorMessage: string;
+};
 
-export const exportAccount = (code: AccountCode): Promise<IExport | null> => {
+export const exportAccount = (code: AccountCode): Promise<TExport | null> => {
   return apiPost(`account/${code}/export`);
 };
 
 export const verifyXPub = (
   code: AccountCode,
   signingConfigIndex: number,
-): Promise<{ success: true; } | { success: false; errorMessage: string; }> => {
+): Promise<{ success: true } | { success: false; errorMessage: string }> => {
   return apiPost(`account/${code}/verify-extended-public-key`, { signingConfigIndex });
 };
 
-export interface IReceiveAddress {
-    addressID: string;
-    address: string;
-}
+export type TReceiveAddress = {
+  addressID: string;
+  address: string;
+};
 
-export interface ReceiveAddressList {
-    scriptType: ScriptType | null;
-    addresses: NonEmptyArray<IReceiveAddress>;
-}
+export type TReceiveAddressList = {
+  scriptType: ScriptType | null;
+  addresses: NonEmptyArray<TReceiveAddress>;
+};
 
 export const getReceiveAddressList = (code: AccountCode) => {
-  return (): Promise<NonEmptyArray<ReceiveAddressList> | null> => {
+  return (): Promise<NonEmptyArray<TReceiveAddressList> | null> => {
     return apiGet(`account/${code}/receive-addresses`);
   };
 };
@@ -369,33 +369,17 @@ export const sendTx = (
 
 export type FeeTargetCode = 'custom' | 'low' | 'economy' | 'normal' | 'high' | 'mHour' | 'mHalfHour' | 'mFastest';
 
-export interface IProposeTxData {
-    address?: string;
-    amount?: number;
-    // data?: string;
-    feePerByte: string;
-    feeTarget: FeeTargetCode;
-    selectedUTXOs: string[];
-    sendAll: 'yes' | 'no';
-}
-
-export interface IProposeTx {
-    aborted?: boolean;
-    success?: boolean;
-    errorMessage?: string;
-}
-
-export interface IFeeTarget {
-    code: FeeTargetCode;
-    feeRateInfo: string;
-}
-
-export interface IFeeTargetList {
-    feeTargets: IFeeTarget[];
-    defaultFeeTarget: FeeTargetCode;
-}
-
-export const getFeeTargetList = (code: AccountCode): Promise<IFeeTargetList> => {
+export type TFeeTarget = {
+  code: FeeTargetCode;
+  feeRateInfo: string;
+};
+
+export type TFeeTargetList = {
+  feeTargets: TFeeTarget[];
+  defaultFeeTarget: FeeTargetCode;
+};
+
+export const getFeeTargetList = (code: AccountCode): Promise<TFeeTargetList> => {
   return apiGet(`account/${code}/fee-targets`);
 };
 
@@ -421,8 +405,8 @@ export const getUTXOs = (code: AccountCode): Promise<TUTXO[]> => {
 };
 
 type TSecureOutput = {
-    hasSecureOutput: boolean;
-    optional: boolean;
+  hasSecureOutput: boolean;
+  optional: boolean;
 };
 
 export const hasSecureOutput = (code: AccountCode) => {
@@ -446,7 +430,7 @@ export type TAddAccount = {
   accountCode?: string;
   errorCode?: 'accountAlreadyExists' | 'accountLimitReached';
   errorMessage?: string;
-}
+};
 
 export const addAccount = (coinCode: string, name: string): Promise<TAddAccount> => {
   return apiPost('account-add', {
@@ -455,7 +439,7 @@ export const addAccount = (coinCode: string, name: string): Promise<TAddAccount>
   });
 };
 
-export type TSignMessage = { success: false, aborted?: boolean; errorMessage?: string; } | { success: true; signature: string; }
+export type TSignMessage = { success: false; aborted?: boolean; errorMessage?: string } | { success: true; signature: string };
 
 export type TSignWalletConnectTx = {
   success: false;
@@ -465,7 +449,7 @@ export type TSignWalletConnectTx = {
   success: true;
   txHash: string;
   rawTx: string;
-}
+};
 
 export const ethSignMessage = (code: AccountCode, message: string): Promise<TSignMessage> => {
   return apiPost(`account/${code}/eth-sign-msg`, message);
@@ -479,7 +463,7 @@ export const ethSignWalletConnectTx = (code: AccountCode, send: boolean, chainId
   return apiPost(`account/${code}/eth-sign-wallet-connect-tx`, { send, chainId, tx });
 };
 
-export type AddressSignResponse = {
+type AddressSignResponse = {
   success: true;
   signature: string;
   address: string;
@@ -487,7 +471,7 @@ export type AddressSignResponse = {
   success: false;
   errorMessage?: string;
   errorCode?: 'userAbort' | 'wrongKeystore';
-}
+};
 
 export const signAddress = (format: ScriptType | '', msg: string, code: AccountCode): Promise<AddressSignResponse> => {
   return apiPost(`account/${code}/sign-address`, { format, msg, code });
diff --git a/frontends/web/src/api/accountsync.ts b/frontends/web/src/api/accountsync.ts
index 1b4ec60a24..6a6544e415 100644
--- a/frontends/web/src/api/accountsync.ts
+++ b/frontends/web/src/api/accountsync.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { TUnsubscribe } from '@/utils/transport-common';
-import * as accountAPI from './account';
+import type { TUnsubscribe } from '@/utils/transport-common';
+import type { AccountCode, TAccount, TStatus } from './account';
 import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
 
 /**
@@ -24,7 +24,7 @@ import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
  * Returns a method to unsubscribe.
  */
 export const syncAccountsList = (
-  cb: (accounts: accountAPI.IAccount[],) => void
+  cb: (accounts: TAccount[]) => void
 ): TUnsubscribe => {
   return subscribeEndpoint('accounts', cb);
 };
@@ -34,7 +34,7 @@ export const syncAccountsList = (
  * event to receive the progress of the address sync.
  * Meant to be used with `useSubscribe`.
  */
-export const syncAddressesCount = (code: accountAPI.AccountCode) => {
+export const syncAddressesCount = (code: AccountCode) => {
   return (
     cb: TSubscriptionCallback<number>
   ) => {
@@ -48,8 +48,8 @@ export const syncAddressesCount = (code: accountAPI.AccountCode) => {
  * Returns a method to unsubscribe.
  */
 export const statusChanged = (
-  code: accountAPI.AccountCode,
-  cb: TSubscriptionCallback<accountAPI.IStatus>,
+  code: AccountCode,
+  cb: TSubscriptionCallback<TStatus>,
 ): TUnsubscribe => {
   return subscribeEndpoint(`account/${code}/status`, cb);
 };
@@ -59,7 +59,7 @@ export const statusChanged = (
  * Returns a method to unsubscribe.
  */
 export const syncdone = (
-  code: accountAPI.AccountCode,
+  code: AccountCode,
   cb: () => void,
 ): TUnsubscribe => {
   return subscribeEndpoint(`account/${code}/sync-done`, cb);
diff --git a/frontends/web/src/api/aopp.ts b/frontends/web/src/api/aopp.ts
index f0ca3f794f..bc92f65648 100644
--- a/frontends/web/src/api/aopp.ts
+++ b/frontends/web/src/api/aopp.ts
@@ -14,43 +14,42 @@
  * limitations under the License.
  */
 
-import { AccountCode } from './account';
-import { apiGet, apiPost } from '@/utils/request';
+import type { AccountCode } from './account';
 import type { TUnsubscribe } from '@/utils/transport-common';
+import type { NonEmptyArray } from '@/utils/types';
+import { apiGet, apiPost } from '@/utils/request';
 import { subscribeEndpoint } from './subscribe';
 
-export interface Account {
-    name: string;
-    code: AccountCode;
-}
+type TAccount = {
+  name: string;
+  code: AccountCode;
+};
 
-interface Accounts extends Array<Account> {
-    0: Account,
-}
+type Accounts = NonEmptyArray<TAccount>;
 
 export type Aopp = {
-    state: 'error';
-    errorCode: 'aoppUnsupportedAsset' | 'aoppVersion' | 'aoppInvalidRequest' | 'aoppNoAccounts' | 'aoppUnsupportedKeystore' | 'aoppUnknown' | 'aoppSigningAborted' | 'aoppCallback';
-    callback: string;
+  state: 'error';
+  errorCode: 'aoppUnsupportedAsset' | 'aoppVersion' | 'aoppInvalidRequest' | 'aoppNoAccounts' | 'aoppUnsupportedKeystore' | 'aoppUnknown' | 'aoppSigningAborted' | 'aoppCallback';
+  callback: string;
 } | {
-    state: 'inactive';
+  state: 'inactive';
 } | {
-    state: 'user-approval' | 'awaiting-keystore' | 'syncing';
-    message: string;
-    callback: string;
-    xpubRequired: boolean;
+  state: 'user-approval' | 'awaiting-keystore' | 'syncing';
+  message: string;
+  callback: string;
+  xpubRequired: boolean;
 } | {
-    state: 'choosing-account';
-    accounts: Accounts;
-    message: string;
-    callback: string;
+  state: 'choosing-account';
+  accounts: Accounts;
+  message: string;
+  callback: string;
 } | {
-    state: 'signing' | 'success';
-    address: string;
-    addressID: string;
-    message: string;
-    callback: string;
-    accountCode: AccountCode;
+  state: 'signing' | 'success';
+  address: string;
+  addressID: string;
+  message: string;
+  callback: string;
+  accountCode: AccountCode;
 };
 
 export const cancel = (): Promise<null> => {
diff --git a/frontends/web/src/api/backend.ts b/frontends/web/src/api/backend.ts
index da069adddd..4e980a40d9 100644
--- a/frontends/web/src/api/backend.ts
+++ b/frontends/web/src/api/backend.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021-2024 Shift Crypto AG
+ * Copyright 2021-2025 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,24 +19,27 @@ import type { FailResponse, SuccessResponse } from './response';
 import { apiGet, apiPost } from '@/utils/request';
 import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
 
-export interface ICoin {
-    coinCode: CoinCode;
-    name: string;
-    canAddAccount: boolean;
-    suggestedAccountName: string;
-}
+export type TCoin = {
+  coinCode: CoinCode;
+  name: string;
+  canAddAccount: boolean;
+  suggestedAccountName: string;
+};
 
-export interface ISuccess {
-    success: boolean;
-    errorMessage?: string;
-    errorCode?: string;
-}
+// In other places we use type { FailResponse, SuccessResponse } from './response'
+// which has slightly different FailResponse structure ( message?: string; code?: number)
+// but here we use errorMessage and errorCode instead
+type TSuccess = {
+  success: boolean;
+  errorMessage?: string;
+  errorCode?: string;
+};
 
-export const getSupportedCoins = (): Promise<ICoin[]> => {
+export const getSupportedCoins = (): Promise<TCoin[]> => {
   return apiGet('supported-coins');
 };
 
-export const setAccountActive = (accountCode: AccountCode, active: boolean): Promise<ISuccess> => {
+export const setAccountActive = (accountCode: AccountCode, active: boolean): Promise<TSuccess> => {
   return apiPost('set-account-active', { accountCode, active });
 };
 
@@ -44,11 +47,11 @@ export const setTokenActive = (
   accountCode: AccountCode,
   tokenCode: ERC20CoinCode,
   active: boolean,
-): Promise<ISuccess> => {
+): Promise<TSuccess> => {
   return apiPost('set-token-active', { accountCode, tokenCode, active });
 };
 
-export const renameAccount = (accountCode: AccountCode, name: string): Promise<ISuccess> => {
+export const renameAccount = (accountCode: AccountCode, name: string): Promise<TSuccess> => {
   return apiPost('rename-account', { accountCode, name });
 };
 
@@ -64,7 +67,7 @@ export const getDevServers = (): Promise<boolean> => {
   return apiGet('dev-servers');
 };
 
-export type TQRCode = FailResponse | (SuccessResponse & { data: string; });
+type TQRCode = FailResponse | (SuccessResponse & { data: string });
 
 export const getQRCode = (data: string) => {
   return (): Promise<TQRCode> => {
@@ -76,7 +79,7 @@ export const getDefaultConfig = (): Promise<any> => {
   return apiGet('config/default');
 };
 
-export const socksProxyCheck = (proxyAddress: string): Promise<ISuccess> => {
+export const socksProxyCheck = (proxyAddress: string): Promise<TSuccess> => {
   return apiPost('socksproxy/check', proxyAddress);
 };
 
@@ -111,7 +114,7 @@ export const cancelConnectKeystore = (): Promise<void> => {
   return apiPost('cancel-connect-keystore');
 };
 
-export const setWatchonly = (rootFingerprint: string, watchonly: boolean): Promise<ISuccess> => {
+export const setWatchonly = (rootFingerprint: string, watchonly: boolean): Promise<TSuccess> => {
   return apiPost('set-watchonly', { rootFingerprint, watchonly });
 };
 
@@ -124,10 +127,10 @@ export const forceAuth = (): Promise<void> => {
 };
 
 export type TAuthEventObject = {
-  typ: 'auth-required' | 'auth-forced' ;
+  typ: 'auth-required' | 'auth-forced';
 } | {
   typ: 'auth-result';
-  result: 'authres-cancel' | 'authres-ok' | 'authres-err' | 'authres-missing'
+  result: 'authres-cancel' | 'authres-ok' | 'authres-err' | 'authres-missing';
 };
 
 export const subscribeAuth = (
@@ -140,20 +143,20 @@ export const onAuthSettingChanged = (): Promise<void> => {
   return apiPost('on-auth-setting-changed');
 };
 
-export const exportLogs = (): Promise<ISuccess> => {
+export const exportLogs = (): Promise<TSuccess> => {
   return apiPost('export-log');
 };
 
-export const exportNotes = (): Promise<(FailResponse & { aborted: boolean; }) | SuccessResponse> => {
+export const exportNotes = (): Promise<(FailResponse & { aborted: boolean }) | SuccessResponse> => {
   return apiPost('notes/export');
 };
 
-export type TImportNotes = {
+type TImportNotes = {
   accountCount: number;
   transactionCount: number;
 };
 
-export const importNotes = (fileContents: ArrayBuffer): Promise<FailResponse | (SuccessResponse & { data: TImportNotes; })> => {
+export const importNotes = (fileContents: ArrayBuffer): Promise<FailResponse | (SuccessResponse & { data: TImportNotes })> => {
   const hexString = Array.from(new Uint8Array(fileContents))
     .map(byte => byte.toString(16).padStart(2, '0'))
     .join('');
diff --git a/frontends/web/src/api/backup.ts b/frontends/web/src/api/backup.ts
index 5a4bd6b20a..b217dcd776 100644
--- a/frontends/web/src/api/backup.ts
+++ b/frontends/web/src/api/backup.ts
@@ -1,17 +1,33 @@
+/**
+ * Copyright 2023-2025 Shift Crypto AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { FailResponse } from './response';
 import { apiGet } from '@/utils/request';
-import { FailResponse } from './response';
 import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
 
 export type Backup = {
-    id: string;
-    date: string;
-    name: string;
+  id: string;
+  date: string;
+  name: string;
 };
 
 type BackupResponse = {
-    success: true;
-    backups: Backup[];
-}
+  success: true;
+  backups: Backup[];
+};
 
 export const getBackupList = (
   deviceID: string
diff --git a/frontends/web/src/api/backupBanner.ts b/frontends/web/src/api/backupBanner.ts
index 67a8ac1a87..7d744b244a 100644
--- a/frontends/web/src/api/backupBanner.ts
+++ b/frontends/web/src/api/backupBanner.ts
@@ -15,12 +15,17 @@
  * limitations under the License.
  */
 
-import { apiGet } from '@/utils/request';
 import type { Fiat } from './account';
+import { apiGet } from '@/utils/request';
 
-export type TShowBackupBannerResponse =
-  | { success: false }
-  | { success: true; show: boolean; fiat: Fiat; threshold: string };
+export type TShowBackupBannerResponse = {
+  success: false;
+} | {
+  success: true;
+  show: boolean;
+  fiat: Fiat;
+  threshold: string;
+};
 
 export const getShowBackupBanner = (rootFingerprint: string): Promise<TShowBackupBannerResponse> => {
   return apiGet(`keystore/show-backup-banner/${rootFingerprint}`);
diff --git a/frontends/web/src/api/banners.ts b/frontends/web/src/api/banners.ts
index aae838b2ac..7762488d35 100644
--- a/frontends/web/src/api/banners.ts
+++ b/frontends/web/src/api/banners.ts
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
+import type { TMessageTypes } from '@/utils/types';
 import { apiGet } from '@/utils/request';
 import { subscribeEndpoint, TUnsubscribe } from './subscribe';
-import type { TMessageTypes } from '@/utils/types';
 
 export type TBannerInfo = {
   id: string;
-  message: { [key: string]: string; };
+  message: { [key: string]: string };
   link?: {
     href: string;
     text?: string;
   };
   dismissible?: boolean;
   type?: TMessageTypes;
-}
+};
 
 export const getBanner = (msgKey: string): Promise<TBannerInfo> => {
   return apiGet(`banners/${msgKey}`);
diff --git a/frontends/web/src/api/bitbox02.ts b/frontends/web/src/api/bitbox02.ts
index d178f6e9a0..78ea8f3964 100644
--- a/frontends/web/src/api/bitbox02.ts
+++ b/frontends/web/src/api/bitbox02.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { TUnsubscribe } from '@/utils/transport-common';
+import type { TUnsubscribe } from '@/utils/transport-common';
+import type { SuccessResponse, FailResponse } from './response';
 import { apiGet, apiPost } from '@/utils/request';
-import { SuccessResponse, FailResponse } from './response';
 import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
 
 // BitBox02 error codes.
@@ -32,7 +32,7 @@ export type DeviceInfo = {
     firmwareVersion: string;
     enabled: boolean;
   };
-}
+};
 
 type DeviceInfoResponse = SuccessResponse & {
   deviceInfo: DeviceInfo;
@@ -82,11 +82,11 @@ type VersionInfoCommon = {
   canBackupWithRecoveryWords: boolean;
   canCreate12Words: boolean;
   canBIP85: boolean;
-}
+};
 
 export type VersionInfo = VersionInfoCommon & (
-  { canUpgrade: true, newVersion: string; } |
-  { canUpgrade: false; })
+  { canUpgrade: true; newVersion: string } |
+  { canUpgrade: false });
 
 export const getVersion = (
   deviceID: string
@@ -110,7 +110,7 @@ export const verifyAttestation = (
 export const checkBackup = (
   deviceID: string,
   silent: boolean,
-): Promise<FailResponse | (SuccessResponse & { backupID: string; })> => {
+): Promise<FailResponse | (SuccessResponse & { backupID: string })> => {
   return apiPost(`devices/bitbox02/${deviceID}/backups/check`, { silent });
 };
 
diff --git a/frontends/web/src/api/bitbox02bootloader.ts b/frontends/web/src/api/bitbox02bootloader.ts
index 74cbd11942..52f0f6b6a0 100644
--- a/frontends/web/src/api/bitbox02bootloader.ts
+++ b/frontends/web/src/api/bitbox02bootloader.ts
@@ -38,13 +38,13 @@ export const syncStatus = (deviceID: string) => {
   };
 };
 
-export type TProduct =
+type TProduct =
   'bitbox02-multi'
   | 'bitbox02-btconly'
   | 'bitbox02-plus-multi'
   | 'bitbox02-plus-btconly';
 
-export type TInfo = {
+type TInfo = {
   product: TProduct;
   // Indicates whether the device has any firmware already installed on it.
   // It is considered "erased" if there's no firmware, and it also happens
diff --git a/frontends/web/src/api/bitsurance.ts b/frontends/web/src/api/bitsurance.ts
index b98b5c5755..b87f562b58 100644
--- a/frontends/web/src/api/bitsurance.ts
+++ b/frontends/web/src/api/bitsurance.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import type { AccountCode } from './account';
 import { apiGet, apiPost } from '@/utils/request';
-import { AccountCode } from './account';
 
 export type TDetailStatus = 'active' | 'processing' | 'refused' | 'waitpayment' | 'inactive' | 'canceled';
 
@@ -30,11 +30,12 @@ export type TAccountDetails = {
   };
 };
 
-export type TInsuredAccounts = {
+type TInsuredAccounts = {
   success: boolean;
   errorMessage: string;
   bitsuranceAccounts: TAccountDetails[];
 };
+
 export const getBitsuranceURL = (): Promise<string> => {
   return apiGet('bitsurance/url');
 };
diff --git a/frontends/web/src/api/coins.ts b/frontends/web/src/api/coins.ts
index 2a047353ac..bdfe3b53d8 100644
--- a/frontends/web/src/api/coins.ts
+++ b/frontends/web/src/api/coins.ts
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import { subscribeEndpoint, TSubscriptionCallback } from './subscribe';
 import type { CoinCode, Fiat } from './account';
+import { subscribeEndpoint, TSubscriptionCallback } from './subscribe';
 import { apiPost, apiGet } from '@/utils/request';
 
 export type BtcUnit = 'default' | 'sat';
 
 export type TStatus = {
-    targetHeight: number;
-    tip: number;
-    tipAtInitTime: number;
-    tipHashHex: string;
-}
+  targetHeight: number;
+  tip: number;
+  tipAtInitTime: number;
+  tipHashHex: string;
+};
 
 export const subscribeCoinHeaders = (coinCode: CoinCode) => (
   (cb: TSubscriptionCallback<TStatus>) => (
@@ -44,7 +44,7 @@ export const setBtcUnit = (unit: BtcUnit): Promise<TSetBtcUnitResponse> => {
 export type TAmount = {
   success: boolean;
   amount: string;
-}
+};
 
 export const parseExternalBtcAmount = (amount: string): Promise<TAmount> => {
   return apiGet(`coins/btc/parse-external-amount?amount=${amount}`);
diff --git a/frontends/web/src/api/devices.ts b/frontends/web/src/api/devices.ts
index b05c119b9a..7e2109fe5f 100644
--- a/frontends/web/src/api/devices.ts
+++ b/frontends/web/src/api/devices.ts
@@ -19,7 +19,7 @@ import { apiGet } from '@/utils/request';
 export type TPlatformName = 'bitbox' | 'bitbox02' | 'bitbox02-bootloader';
 
 export type TDevices = {
-    readonly [key in string]: TPlatformName;
+  readonly [key in string]: TPlatformName;
 };
 
 export const getDeviceList = (): Promise<TDevices> => {
diff --git a/frontends/web/src/api/devicessync.ts b/frontends/web/src/api/devicessync.ts
index fb5b6f6beb..5c51020d2f 100644
--- a/frontends/web/src/api/devicessync.ts
+++ b/frontends/web/src/api/devicessync.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import type { TDevices } from './devices';
 import { subscribeEndpoint, TSubscriptionCallback, TUnsubscribe } from './subscribe';
-import { TDevices } from './devices';
 
 /**
  * Subscribes the given function on the "devices/registered" event
diff --git a/frontends/web/src/api/keystores.ts b/frontends/web/src/api/keystores.ts
index 5bbb587e09..e05d8bb8ce 100644
--- a/frontends/web/src/api/keystores.ts
+++ b/frontends/web/src/api/keystores.ts
@@ -50,7 +50,7 @@ export const deregisterTest = (): Promise<null> => {
   return apiPost('test/deregister');
 };
 
-export const connectKeystore = (rootFingerprint: string): Promise<{ success: boolean; }> => {
+export const connectKeystore = (rootFingerprint: string): Promise<{ success: boolean }> => {
   return apiPost('connect-keystore', { rootFingerprint });
 };
 
diff --git a/frontends/web/src/api/market.ts b/frontends/web/src/api/market.ts
index 346a0aab8c..e4aa5c1cb2 100644
--- a/frontends/web/src/api/market.ts
+++ b/frontends/web/src/api/market.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { AccountCode } from './account';
+import type { AccountCode } from './account';
 import { apiGet, apiPost } from '@/utils/request';
 
 export const getMarketRegionCodes = (): Promise<string[]> => {
@@ -29,27 +29,27 @@ export type TMarketDeal = {
   isFast: boolean;
   isBest: boolean;
   isHidden: boolean;
-}
+};
 
 export type TVendorName = 'moonpay' | 'pocket' | 'btcdirect' | 'btcdirect-otc' | 'bitrefill';
 
 export type TMarketDeals = {
   vendorName: TVendorName;
   deals: TMarketDeal[];
-}
+};
 
 export type TMarketDealsList = {
   deals: TMarketDeals[];
   success: true;
-}
+};
 
 export type TMarketError = {
   success: false;
   errorCode?: 'coinNotSupported' | 'regionNotSupported';
   errorMessage?: string;
-}
+};
 
-export type TMarketDealsResponse = TMarketDealsList | TMarketError
+export type TMarketDealsResponse = TMarketDealsList | TMarketError;
 
 export type TMarketAction = 'buy' | 'sell' | 'spend';
 
@@ -60,7 +60,7 @@ export const getMarketDeals = (action: TMarketAction, accountCode: AccountCode,
 export type MoonpayBuyInfo = {
   url: string;
   address: string;
-}
+};
 
 export const getMoonpayBuyInfo = (code: AccountCode) => {
   return (): Promise<MoonpayBuyInfo> => {
@@ -72,7 +72,7 @@ export type AddressVerificationResponse = {
   success: boolean;
   errorMessage?: string;
   errorCode?: 'addressNotFound' | 'userAbort';
-}
+};
 
 export const verifyAddress = (address: string, accountCode: AccountCode): Promise<AddressVerificationResponse> => {
   return apiPost('market/pocket/verify-address', { address, accountCode });
diff --git a/frontends/web/src/api/nativelocale.ts b/frontends/web/src/api/nativelocale.ts
index 491a43e81a..b57e39bc03 100644
--- a/frontends/web/src/api/nativelocale.ts
+++ b/frontends/web/src/api/nativelocale.ts
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022 Shift Crypto AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { apiGet } from '@/utils/request';
 
 export const getNativeLocale = (): Promise<string> => {
diff --git a/frontends/web/src/api/node.ts b/frontends/web/src/api/node.ts
index 9ad668e669..33c6377ff6 100644
--- a/frontends/web/src/api/node.ts
+++ b/frontends/web/src/api/node.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import type { SuccessResponse } from './response';
 import { apiPost } from '@/utils/request';
-import { SuccessResponse } from './response';
 
 type TCertResponse = {
   success: true;
diff --git a/frontends/web/src/api/response.ts b/frontends/web/src/api/response.ts
index f55b3c0b46..a5743bfdeb 100644
--- a/frontends/web/src/api/response.ts
+++ b/frontends/web/src/api/response.ts
@@ -15,12 +15,12 @@
  */
 
 export type SuccessResponse = {
-    success: true;
-}
+  success: true;
+};
 
 // if the backend uses maybeBB02Err
 export type FailResponse = {
-    code?: number;
-    message?: string;
-    success: false;
-}
+  code?: number;
+  message?: string;
+  success: false;
+};
diff --git a/frontends/web/src/api/transactions.ts b/frontends/web/src/api/transactions.ts
index fd8e40e285..9c91bf659a 100644
--- a/frontends/web/src/api/transactions.ts
+++ b/frontends/web/src/api/transactions.ts
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { TUnsubscribe } from '@/utils/transport-common';
+import type { TUnsubscribe } from '@/utils/transport-common';
 import { TSubscriptionCallback, subscribeEndpoint } from './subscribe';
 
 export type TNewTxs = {
-  count: number,
-  accountName: string,
+  count: number;
+  accountName: string;
 };
 
 export const syncNewTxs = (cb: TSubscriptionCallback<TNewTxs>): TUnsubscribe => {
diff --git a/frontends/web/src/api/version.ts b/frontends/web/src/api/version.ts
index 0614698a6b..6cf484041d 100644
--- a/frontends/web/src/api/version.ts
+++ b/frontends/web/src/api/version.ts
@@ -19,11 +19,11 @@ import { apiGet } from '@/utils/request';
 /**
  * Describes the file that is loaded from 'https://bitbox.swiss/updates/desktop.json'.
  */
-export type TUpdateFile = {
-    current: string;
-    version: string;
-    description: string;
-}
+type TUpdateFile = {
+  current: string;
+  version: string;
+  description: string;
+};
 
 export const getVersion = (): Promise<string> => {
   return apiGet('version');
diff --git a/frontends/web/src/assets/exchanges/logos/coinfinity.svg b/frontends/web/src/assets/exchanges/logos/coinfinity.svg
new file mode 100644
index 0000000000..c326f37f45
--- /dev/null
+++ b/frontends/web/src/assets/exchanges/logos/coinfinity.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="74" viewBox="0 0 224.88 55.5"><defs><clipPath id="a"><path d="M100 .027h29V43h-29Zm0 0"/></clipPath><clipPath id="b"><path d="M176 5h47.816v50H176Zm0 0"/></clipPath></defs><g clip-path="url(#a)"><path fill="#3e3f3f" d="M114.645.402c-4.055.676-7.54 3.008-9.032 6.051-.89 1.817-1.351 3.774-1.351 5.7v1.566l-1.903.05-1.921.055-.055 2.707-.051 2.723h3.93v22.96h7.113v-22.96h9.602v22.96l3.609-.034 3.59-.051V13.824l-8.426-.054-8.43-.036.09-1.742c.106-2.086.586-3.347 1.742-4.469 1.793-1.746 5.547-2.082 9.121-.82.711.25 1.422.5 1.602.57.246.07.516-.34 1.477-2.351.62-1.352 1.136-2.473 1.101-2.492-.586-.516-4.039-1.743-5.726-2.028-1.227-.23-4.766-.215-6.082 0m0 0"/></g><path fill="#3e3f3f" d="M59.965 2.219c-2.063.765-3.13 2.918-2.453 4.949.57 1.672 1.867 2.543 3.804 2.543 2.614 0 4.145-1.617 3.965-4.184-.14-1.937-1.597-3.328-3.664-3.468-.601-.055-1.277.015-1.652.16M168.398 2.219c-1.632.535-2.593 1.922-2.613 3.738 0 3.328 3.735 5 6.617 2.953.711-.515 1.387-1.976 1.387-3.023 0-1.23-.766-2.617-1.816-3.242-.957-.586-2.504-.782-3.575-.426m0 0"/><g clip-path="url(#b)"><path fill="#3e3f3f" d="m184.457 6.598-3.289.836-.055 3.152-.035 3.133-2.008.05-1.992.055-.055 2.707-.05 2.723h4.07l.09 8.133c.05 6.836.125 8.332.355 9.277.782 2.988 2.383 4.715 5.121 5.57.817.25 1.618.34 3.325.34 1.957 0 4.515-.34 4.8-.605.036-.055.02-1.285-.05-2.742l-.125-2.653-2.082.09c-1.938.07-2.098.05-2.684-.34-.356-.25-.82-.82-1.066-1.316l-.446-.89-.054-7.442-.055-7.422 4.75.035 4.766.055 4.23 10.59c2.527 6.32 4.234 10.824 4.234 11.18 0 1.21-1.851 3.968-3.523 5.269-1.207.926-2.649 1.726-3.856 2.172-.48.16-.91.32-.945.336-.07.054 1.531 5.804 1.656 5.93.32.32 3.43-.731 5.207-1.762 1.407-.84 4.59-4.043 5.711-5.77 1.192-1.816 3.43-6.39 4.692-9.613 1.281-3.274 8.66-23.477 8.66-23.746 0-.14-1.102-.196-3.805-.196h-3.804l-.196.57c-.41 1.317-4.66 16.216-5.105 17.942-.266 1.035-.531 1.941-.602 2.012-.074.074-.34-.711-.625-1.762-.406-1.637-5.957-18.156-6.238-18.601-.055-.09-3.434-.16-7.649-.16h-7.539V9.73c0-3.097-.054-4.003-.214-3.988-.125 0-1.707.39-3.52.856m0 0"/></g><path fill="#3e3f3f" d="M12.984 13.2c-4.214.765-7.343 2.777-9.546 6.16-1.583 2.421-2.313 5.128-2.313 8.652 0 4.449 1.121 7.441 3.824 10.218 1.989 2.028 4.25 3.329 7.149 4.094 1.672.446 5.867.446 7.59.016 2.738-.692 4.96-1.887 6.972-3.738l1.086-.997 1.047 1.07a13.6 13.6 0 0 0 5.371 3.38c1.688.59 1.797.605 4.66.605 3.11 0 4.035-.16 6.258-1.05 1.777-.727 3.023-1.567 4.535-3.079 1.242-1.246 1.598-1.746 2.348-3.293 1.066-2.226 1.422-3.578 1.562-5.965.391-6.585-2.472-12.175-7.504-14.648-2.347-1.14-3.308-1.336-6.757-1.336-2.95 0-3.059.02-4.711.59-3.54 1.226-5.887 3.059-7.254 5.676-.906 1.746-1.352 3.312-1.903 6.82-.765 4.75-1.496 6.531-3.468 8.543-3.875 3.934-9.957 3.348-12.25-1.191-.89-1.762-1.157-3.082-1.157-5.66-.02-2.602.176-3.653 1.047-5.52.766-1.672 1.637-2.637 2.989-3.293 2.437-1.192 5.191-1.121 7.914.195.816.39 1.511.696 1.547.66.105-.125 2.043-4.308 2.043-4.418 0-.265-3.325-1.652-4.942-2.062-1.902-.48-4.766-.676-6.137-.43m28.97 5.859c1.706.8 2.878 2.437 3.573 5 .246.89.32 1.816.32 4.093-.019 2.707-.054 3.063-.5 4.364-.78 2.347-2.027 3.863-3.859 4.664-.39.175-1.172.285-2.062.285-1.278.015-1.582-.055-2.614-.555-2.792-1.387-4.25-4.43-4.25-8.933 0-3.579.782-5.91 2.614-7.762 1.191-1.192 2.347-1.656 4.27-1.656 1.206-.016 1.581.054 2.507.5M83.617 13.61a10.3 10.3 0 0 0-5.336 3.738l-.48.675-.106-1.03c-.074-.571-.18-1.513-.25-2.102l-.125-1.067h-6.222v.836c.015.48.035 6.817.05 14.117l.04 13.262h7.269l.055-9.223.054-9.203.461-.996c1.067-2.242 2.953-3.543 5.211-3.543.676 0 1.528.09 1.903.215.89.25 1.992 1.211 2.558 2.188.89 1.515.98 2.476.98 11.875v8.687h7.13l-.051-10.113c-.074-9.914-.074-10.11-.48-11.426-.59-1.977-1.387-3.328-2.688-4.648-1.848-1.868-3.91-2.653-6.934-2.633-1.21 0-2.062.105-3.039.39M147.168 13.54c-.586.179-1.547.55-2.117.835-1.012.5-3.11 2.387-3.66 3.277-.27.426-.27.391-.395-.98-.07-.781-.16-1.762-.23-2.188l-.086-.75-3.149.036c-3.113.054-3.129.054-3.113.445 0 .23.02 6.57.035 14.117l.035 13.707h7.293v-8.422c0-4.93.07-8.863.176-9.539.34-2.047 1.461-3.578 3.29-4.488 1.085-.531 1.23-.55 2.702-.48 2.207.109 3.309.8 4.215 2.617.766 1.515.82 2.242.82 11.5v8.812h7.309l-.074-9.754c-.051-9.328-.07-9.793-.442-11.234-1.07-4.059-3.453-6.64-6.972-7.582-1.352-.356-4.25-.32-5.637.07M57.762 13.95c-.055.124-.075 6.515-.055 14.202l.055 13.977h7.113V13.824l-3.523-.054c-2.704-.036-3.54 0-3.59.18M166.23 13.95c-.054.124-.07 6.515-.054 14.202l.054 13.977h7.114V13.824l-3.52-.054c-2.703-.036-3.539 0-3.594.18m0 0"/></svg>
\ No newline at end of file
diff --git a/frontends/web/src/components/actionable-item/actionable-item.tsx b/frontends/web/src/components/actionable-item/actionable-item.tsx
index f629c0f5bc..7d143504be 100644
--- a/frontends/web/src/components/actionable-item/actionable-item.tsx
+++ b/frontends/web/src/components/actionable-item/actionable-item.tsx
@@ -24,7 +24,7 @@ type TProps = {
   children: ReactNode;
   icon?: ReactNode;
   onClick?: () => void;
-}
+};
 
 export const ActionableItem = ({
   className = '',
diff --git a/frontends/web/src/components/amount/amount-with-unit.tsx b/frontends/web/src/components/amount/amount-with-unit.tsx
index bb18f6c3f6..8e5ef37be9 100644
--- a/frontends/web/src/components/amount/amount-with-unit.tsx
+++ b/frontends/web/src/components/amount/amount-with-unit.tsx
@@ -29,7 +29,7 @@ type TAmountWithUnitProps = {
   sign?: string;
   alwaysShowAmounts?: boolean;
   convertToFiat?: boolean;
-}
+};
 
 export const AmountWithUnit = ({
   amount,
@@ -98,7 +98,7 @@ export const AmountWithUnit = ({
 type TAmountUnitProps = {
   rotateUnit?: () => Promise<void>;
   unit: ConversionUnit | CoinUnit;
-}
+};
 
 export const AmountUnit = ({ rotateUnit, unit }: TAmountUnitProps) => {
   const classRototable = rotateUnit ? (style.rotatable || '') : '';
diff --git a/frontends/web/src/components/anchor/anchor.tsx b/frontends/web/src/components/anchor/anchor.tsx
index cbb226eff0..42067e6ee6 100644
--- a/frontends/web/src/components/anchor/anchor.tsx
+++ b/frontends/web/src/components/anchor/anchor.tsx
@@ -26,7 +26,7 @@ type TProps = {
   href: string;
   icon?: ReactNode;
   title?: string;
-}
+};
 
 /**
  * Renders a link to an external URL or file, which will open in the native browser or application.
diff --git a/frontends/web/src/components/aopp/aopp.tsx b/frontends/web/src/components/aopp/aopp.tsx
index 14d67213ef..087a3666c6 100644
--- a/frontends/web/src/components/aopp/aopp.tsx
+++ b/frontends/web/src/components/aopp/aopp.tsx
@@ -31,7 +31,7 @@ import styles from './aopp.module.css';
 
 type TProps = {
   children: ReactNode;
-}
+};
 
 const Banner = ({ children }: TProps) => (
   <div className={styles.banner}>{children}</div>
diff --git a/frontends/web/src/components/aopp/vasp.tsx b/frontends/web/src/components/aopp/vasp.tsx
index 69a588fc94..cbcab8059f 100644
--- a/frontends/web/src/components/aopp/vasp.tsx
+++ b/frontends/web/src/components/aopp/vasp.tsx
@@ -19,6 +19,7 @@ import AOPPGroupLogo from '@/assets/exchanges/logos/aoppgroup.svg';
 import BitcoinSuisseLogo from '@/assets/exchanges/logos/bitcoin_suisse.png';
 import BittrLogo from '@/assets/exchanges/logos/bittr.png';
 import BityLogo from '@/assets/exchanges/logos/bity.png';
+import CoinfinityLogo from '@/assets/exchanges/logos/coinfinity.svg';
 import PocketBitcoinLogo from '@/assets/exchanges/logos/pocketbitcoin.svg';
 import RelaiLogo from '@/assets/exchanges/logos/relai.svg';
 
@@ -27,17 +28,18 @@ type TVASPProps = {
   hostname: string;
   prominent?: boolean;
   withLogoText?: string;
-}
+};
 
 type TVASPMap = {
   [hostname: string]: string;
-}
+};
 
 const VASPLogoMap: TVASPMap = {
   'demo.aopp.group': AOPPGroupLogo,
   'testing.aopp.group': AOPPGroupLogo,
   'bitcoinsuisse.com': BitcoinSuisseLogo,
   'bity.com': BityLogo,
+  'coinfinity.co': CoinfinityLogo,
   'getbittr.com': BittrLogo,
   'pocketbitcoin.com': PocketBitcoinLogo,
   'relai.app': RelaiLogo,
diff --git a/frontends/web/src/components/aopp/verifyaddress.tsx b/frontends/web/src/components/aopp/verifyaddress.tsx
index 1151ac4dfe..297afe75df 100644
--- a/frontends/web/src/components/aopp/verifyaddress.tsx
+++ b/frontends/web/src/components/aopp/verifyaddress.tsx
@@ -21,10 +21,10 @@ import { Button } from '@/components/forms';
 import { WaitDialog } from '@/components/wait-dialog/wait-dialog';
 
 type TProps = {
-    accountCode: accountAPI.AccountCode;
-    address: string;
-    addressID: string;
-}
+  accountCode: accountAPI.AccountCode;
+  address: string;
+  addressID: string;
+};
 
 export const VerifyAddress = ({ accountCode, address, addressID }: TProps) => {
   const [verifying, setVerifying] = useState(false);
diff --git a/frontends/web/src/components/balance/balance.module.css b/frontends/web/src/components/balance/balance.module.css
index f86c98f19f..2094f70785 100644
--- a/frontends/web/src/components/balance/balance.module.css
+++ b/frontends/web/src/components/balance/balance.module.css
@@ -41,7 +41,7 @@
   }
 
   .balanceTable td {
-    font-size: var(--size-large-mobile);
+    font-size: var(--size-header);
     line-height: 1.5;
   }
 
diff --git a/frontends/web/src/components/balance/balance.test.tsx b/frontends/web/src/components/balance/balance.test.tsx
index 85f714b58e..7ce33749c0 100644
--- a/frontends/web/src/components/balance/balance.test.tsx
+++ b/frontends/web/src/components/balance/balance.test.tsx
@@ -18,7 +18,7 @@ import '../../../__mocks__/i18n';
 import { useContext } from 'react';
 import { Mock, afterEach, describe, expect, it, vi } from 'vitest';
 import { render } from '@testing-library/react';
-import { IBalance } from '@/api/account';
+import { TBalance } from '@/api/account';
 import { Balance } from './balance';
 
 vi.mock('@/utils/request', () => ({
@@ -43,7 +43,7 @@ describe('components/balance/balance', () => {
       decimal: '.',
       group: ','
     });
-    const MOCK_BALANCE: IBalance = {
+    const MOCK_BALANCE: TBalance = {
       hasAvailable: true,
       hasIncoming: true,
       available: {
@@ -117,7 +117,7 @@ describe('components/balance/balance', () => {
       group: ','
     });
 
-    const MOCK_BALANCE: IBalance = {
+    const MOCK_BALANCE: TBalance = {
       hasAvailable: true,
       hasIncoming: true,
       available: {
diff --git a/frontends/web/src/components/balance/balance.tsx b/frontends/web/src/components/balance/balance.tsx
index bdae8d0f0a..0e0d566586 100644
--- a/frontends/web/src/components/balance/balance.tsx
+++ b/frontends/web/src/components/balance/balance.tsx
@@ -16,16 +16,16 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import { IBalance } from '@/api/account';
+import { TBalance } from '@/api/account';
 import { Amount } from '@/components/amount/amount';
 import { BalanceSkeleton } from '@/components/balance/balance-skeleton';
 import { AmountWithUnit } from '@/components/amount/amount-with-unit';
 import style from './balance.module.css';
 
 type TProps = {
-  balance?: IBalance;
+  balance?: TBalance;
   noRotateFiat?: boolean;
-}
+};
 
 export const Balance = ({
   balance,
diff --git a/frontends/web/src/components/banners/backup.tsx b/frontends/web/src/components/banners/backup.tsx
index 9211e81a09..4e73b16d1f 100644
--- a/frontends/web/src/components/banners/backup.tsx
+++ b/frontends/web/src/components/banners/backup.tsx
@@ -31,7 +31,7 @@ import { LocalizationContext } from '@/contexts/localization-context';
 type BackupReminderProps = {
   keystore: TKeystore;
   accountsBalanceSummary?: TAccountsBalanceSummary;
-}
+};
 
 export const BackupReminder = ({ keystore, accountsBalanceSummary }: BackupReminderProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/banners/banner.tsx b/frontends/web/src/components/banners/banner.tsx
index 570f0e638c..417bdc54c4 100644
--- a/frontends/web/src/components/banners/banner.tsx
+++ b/frontends/web/src/components/banners/banner.tsx
@@ -24,7 +24,7 @@ import style from './banner.module.css';
 
 type TBannerProps = {
   msgKey: 'bitbox01' | 'bitbox02' | 'bitbox02nova';
-}
+};
 
 export const Banner = ({ msgKey }: TBannerProps) => {
   const { i18n, t } = useTranslation();
diff --git a/frontends/web/src/components/banners/index.tsx b/frontends/web/src/components/banners/index.tsx
index 935a066b8e..1cebe882e4 100644
--- a/frontends/web/src/components/banners/index.tsx
+++ b/frontends/web/src/components/banners/index.tsx
@@ -26,7 +26,7 @@ import { SDCardWarning } from './sdcard';
 type Props = {
   code?: AccountCode;
   devices: TDevices;
-}
+};
 
 export const GlobalBanners = ({
   code,
diff --git a/frontends/web/src/components/banners/offline-error.tsx b/frontends/web/src/components/banners/offline-error.tsx
index 2fd6aa639c..e67a6a6e01 100644
--- a/frontends/web/src/components/banners/offline-error.tsx
+++ b/frontends/web/src/components/banners/offline-error.tsx
@@ -22,7 +22,7 @@ import style from './offline-errors.module.css';
 
 type Props = {
   error?: string | null;
-}
+};
 
 export const OfflineError = ({
   error,
diff --git a/frontends/web/src/components/banners/sdcard.tsx b/frontends/web/src/components/banners/sdcard.tsx
index 5abf4fd067..8af1f15bd6 100644
--- a/frontends/web/src/components/banners/sdcard.tsx
+++ b/frontends/web/src/components/banners/sdcard.tsx
@@ -25,7 +25,7 @@ import { Message } from '@/components/message/message';
 type Props = {
   code?: AccountCode;
   devices: TDevices;
-}
+};
 
 export const SDCardWarning = ({
   code,
diff --git a/frontends/web/src/components/bluetooth/bluetooth.tsx b/frontends/web/src/components/bluetooth/bluetooth.tsx
index 32cc014615..62ee8e1a35 100644
--- a/frontends/web/src/components/bluetooth/bluetooth.tsx
+++ b/frontends/web/src/components/bluetooth/bluetooth.tsx
@@ -33,7 +33,7 @@ const isConnectedOrConnecting = (peripheral: TPeripheral) => {
 
 type Props = {
   peripheralContainerClassName?: string;
-}
+};
 
 const BluetoothInner = ({ peripheralContainerClassName }: Props) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/bluetooth/connection-issues-dialog.tsx b/frontends/web/src/components/bluetooth/connection-issues-dialog.tsx
index 958e2b1dee..0033e7c6bc 100644
--- a/frontends/web/src/components/bluetooth/connection-issues-dialog.tsx
+++ b/frontends/web/src/components/bluetooth/connection-issues-dialog.tsx
@@ -20,9 +20,9 @@ import { A } from '@/components/anchor/anchor';
 import styles from './connection-issues-dialog.module.css';
 
 type Props = {
-    dialogOpen: boolean
-    onClose: () => void
-}
+  dialogOpen: boolean;
+  onClose: () => void;
+};
 export const ConnectionIssuesDialog = ({ dialogOpen, onClose }: Props) => {
   const { t } = useTranslation();
   return (
diff --git a/frontends/web/src/components/bottom-navigation/bottom-navigation.module.css b/frontends/web/src/components/bottom-navigation/bottom-navigation.module.css
index f087a3cdb4..f4a89df801 100644
--- a/frontends/web/src/components/bottom-navigation/bottom-navigation.module.css
+++ b/frontends/web/src/components/bottom-navigation/bottom-navigation.module.css
@@ -1,4 +1,5 @@
 .container {
+  align-items: center;
   background-color: var(--background-secondary);
   bottom: 0;
   border-top: 2px solid var(--bottom-navigation-border-color);
diff --git a/frontends/web/src/components/bottom-navigation/bottom-navigation.tsx b/frontends/web/src/components/bottom-navigation/bottom-navigation.tsx
index e52ce9ab7f..ab561933dc 100644
--- a/frontends/web/src/components/bottom-navigation/bottom-navigation.tsx
+++ b/frontends/web/src/components/bottom-navigation/bottom-navigation.tsx
@@ -16,25 +16,25 @@
 
 import { useTranslation } from 'react-i18next';
 import { Link, useLocation } from 'react-router-dom';
+import type { TAccount } from '@/api/account';
+import type { TDevices } from '@/api/devices';
 import { AccountIconSVG, MarketIconSVG, MoreIconSVG, PortfolioIconSVG } from '@/components/bottom-navigation/menu-icons';
-import type { Account } from '@/api/aopp';
 import { useLoad } from '@/hooks/api';
 import { getVersion } from '@/api/bitbox02';
 import { RedDot } from '@/components/icon';
-import { TDevices } from '@/api/devices';
 import styles from './bottom-navigation.module.css';
 
 type Props = {
-  activeAccounts: Account[];
-  devices: TDevices
-}
+  activeAccounts: TAccount[];
+  devices: TDevices;
+};
 
 export const BottomNavigation = ({ activeAccounts, devices }: Props) => {
   const { t } = useTranslation();
   const { pathname } = useLocation();
   const deviceID = Object.keys(devices)[0];
   const isBitBox02 = deviceID && devices[deviceID] === 'bitbox02';
-  const versionInfo = useLoad(isBitBox02 ? () => getVersion(deviceID) : null, [deviceID]);
+  const versionInfo = useLoad(isBitBox02 ? () => getVersion(deviceID) : null, [deviceID, isBitBox02]);
   const canUpgrade = versionInfo ? versionInfo.canUpgrade : false;
 
   const onlyHasOneAccount = activeAccounts.length === 1;
diff --git a/frontends/web/src/components/confirm/Confirm.tsx b/frontends/web/src/components/confirm/Confirm.tsx
index 30d606d310..8e84c57b59 100644
--- a/frontends/web/src/components/confirm/Confirm.tsx
+++ b/frontends/web/src/components/confirm/Confirm.tsx
@@ -28,11 +28,11 @@ type TCallback = (response: boolean) => void;
  */
 export let confirmation: (message: string, callback: TCallback, customButtonText?: string) => void;
 
-interface State {
-    active: boolean;
-    message?: string;
-    customButtonText?: string;
-}
+type State = {
+  active: boolean;
+  message?: string;
+  customButtonText?: string;
+};
 
 /**
  * Confirm alert that activates on confirmation module export call,
diff --git a/frontends/web/src/components/contentwrapper/contentwrapper.tsx b/frontends/web/src/components/contentwrapper/contentwrapper.tsx
index 7ebea1cc11..7f4c2bfaa1 100644
--- a/frontends/web/src/components/contentwrapper/contentwrapper.tsx
+++ b/frontends/web/src/components/contentwrapper/contentwrapper.tsx
@@ -18,9 +18,9 @@ import { ReactNode } from 'react';
 import style from './contentwrapper.module.css';
 
 type TProps = {
-    className?: string
-    children: ReactNode
-  }
+  className?: string;
+  children: ReactNode;
+};
 
 export const ContentWrapper = (({ className = '', children }: TProps) => {
   return (
diff --git a/frontends/web/src/components/copy/Copy.tsx b/frontends/web/src/components/copy/Copy.tsx
index 949c87b53f..1a629a7c47 100644
--- a/frontends/web/src/components/copy/Copy.tsx
+++ b/frontends/web/src/components/copy/Copy.tsx
@@ -21,14 +21,14 @@ import { Check, Copy } from '@/components/icon/icon';
 import style from './Copy.module.css';
 
 type TProps = {
-    alignLeft?: boolean;
-    alignRight?: boolean;
-    borderLess?: boolean;
-    className?: string;
-    disabled?: boolean;
-    flexibleHeight?: boolean;
-    value: string;
-}
+  alignLeft?: boolean;
+  alignRight?: boolean;
+  borderLess?: boolean;
+  className?: string;
+  disabled?: boolean;
+  flexibleHeight?: boolean;
+  value: string;
+};
 
 export const CopyableInput = ({ alignLeft, alignRight, borderLess, value, className, disabled, flexibleHeight }: TProps) => {
   const [success, setSuccess] = useState(false);
diff --git a/frontends/web/src/components/devices/bitbox02bootloader/bitbox02bootloader.tsx b/frontends/web/src/components/devices/bitbox02bootloader/bitbox02bootloader.tsx
index d89a04e23d..2c99b15341 100644
--- a/frontends/web/src/components/devices/bitbox02bootloader/bitbox02bootloader.tsx
+++ b/frontends/web/src/components/devices/bitbox02bootloader/bitbox02bootloader.tsx
@@ -29,7 +29,7 @@ import style from './bitbox02bootloader.module.css';
 
 type TProps = {
   deviceID: string;
-}
+};
 
 export const BitBox02Bootloader = ({ deviceID }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/dialog/dialog-legacy.tsx b/frontends/web/src/components/dialog/dialog-legacy.tsx
index a9f6d9ca27..a9e29a2b93 100644
--- a/frontends/web/src/components/dialog/dialog-legacy.tsx
+++ b/frontends/web/src/components/dialog/dialog-legacy.tsx
@@ -18,23 +18,24 @@
 import React, { Component, createRef } from 'react';
 import { CloseXDark, CloseXWhite } from '@/components/icon';
 import style from './dialog-legacy.module.css';
-interface Props {
-    title?: string;
-    small?: boolean;
-    medium?: boolean;
-    large?: boolean;
-    slim?: boolean;
-    centered?: boolean;
-    disableEscape?: boolean;
-    onClose?: (e?: Event) => void;
-    disabledClose?: boolean;
-    children: React.ReactNode;
-}
 
-interface State {
-    active: boolean;
-    currentTab: number;
-}
+type Props = {
+  title?: string;
+  small?: boolean;
+  medium?: boolean;
+  large?: boolean;
+  slim?: boolean;
+  centered?: boolean;
+  disableEscape?: boolean;
+  onClose?: (e?: Event) => void;
+  disabledClose?: boolean;
+  children: React.ReactNode;
+};
+
+type State = {
+  active: boolean;
+  currentTab: number;
+};
 
 class DialogLegacy extends Component<Props, State> {
   private overlay = createRef<HTMLDivElement>();
@@ -216,9 +217,9 @@ class DialogLegacy extends Component<Props, State> {
  * ```
  */
 
-interface DialogButtonsProps {
-    children: React.ReactNode;
-}
+type DialogButtonsProps = {
+  children: React.ReactNode;
+};
 
 const DialogButtons = ({ children }: DialogButtonsProps) => {
   return (
diff --git a/frontends/web/src/components/dialog/dialog.module.css b/frontends/web/src/components/dialog/dialog.module.css
index 89a7efc18b..db39c49d4b 100644
--- a/frontends/web/src/components/dialog/dialog.module.css
+++ b/frontends/web/src/components/dialog/dialog.module.css
@@ -203,7 +203,7 @@
 @media (max-width: 768px) {
 
     .header .title{
-        font-size: var(--header-default-font-size);
+        font-size: var(--size-header);
     }
 
     .modal {
diff --git a/frontends/web/src/components/dialog/dialog.tsx b/frontends/web/src/components/dialog/dialog.tsx
index 36d238639b..d46f6284b2 100644
--- a/frontends/web/src/components/dialog/dialog.tsx
+++ b/frontends/web/src/components/dialog/dialog.tsx
@@ -93,7 +93,7 @@ export const Dialog = ({
 
   // ESC closes dialog (fires onClose)
   useEsc(() => {
-    if (open) {
+    if (open && onClose) {
       deactivate(true);
     }
   });
@@ -109,6 +109,8 @@ export const Dialog = ({
     if (
       mouseDownTarget.current === e.currentTarget
       && e.target === e.currentTarget
+      && open
+      && onClose
     ) {
       deactivate(true);
     }
@@ -117,8 +119,10 @@ export const Dialog = ({
 
   // Close button handler
   const handleCloseClick = useCallback(() => {
-    deactivate(true);
-  }, [deactivate]);
+    if (open && onClose) {
+      deactivate(true);
+    }
+  }, [deactivate, onClose, open]);
 
   // Back button handler (mobile)
   const closeHandler = useCallback(() => {
@@ -183,7 +187,7 @@ export const Dialog = ({
 
 type DialogButtonsProps = {
   children: React.ReactNode;
-}
+};
 
 /**
  * ### Container to place buttons in a dialog
diff --git a/frontends/web/src/components/dropdown/mobile-fullscreen-selector.tsx b/frontends/web/src/components/dropdown/mobile-fullscreen-selector.tsx
index b340587226..86f5506eb5 100644
--- a/frontends/web/src/components/dropdown/mobile-fullscreen-selector.tsx
+++ b/frontends/web/src/components/dropdown/mobile-fullscreen-selector.tsx
@@ -32,7 +32,7 @@ type Props<T, IsMulti extends boolean = false> = {
   isOpen?: boolean;
   onOpenChange?: (isOpen: boolean) => void;
   triggerComponent?: ReactNode | ((props: { onClick: () => void }) => ReactNode);
-}
+};
 
 export const MobileFullscreenSelector = <T, IsMulti extends boolean = false>({
   title,
diff --git a/frontends/web/src/components/forms/button.tsx b/frontends/web/src/components/forms/button.tsx
index 0b3a18c1e5..cedd072fd2 100644
--- a/frontends/web/src/components/forms/button.tsx
+++ b/frontends/web/src/components/forms/button.tsx
@@ -23,19 +23,19 @@ type TButtonStyleProp =
   ({ danger: true } & Omit<TButtonStyleBase, 'danger'>)
   | ({ primary: true } & Omit<TButtonStyleBase, 'primary'>)
   | ({ secondary: true } & Omit<TButtonStyleBase, 'secondary'>)
-  | ({ transparent: true } & Omit<TButtonStyleBase, 'transparent'>)
+  | ({ transparent: true } & Omit<TButtonStyleBase, 'transparent'>);
 
 type TButtonStyleBase = {
   danger?: false;
   primary?: false;
   secondary?: false;
   transparent?: false;
-}
+};
 
 type TProps = TButtonStyleProp & {
   disabled?: boolean;
   children: ReactNode;
-}
+};
 
 type TButtonLink = LinkProps & TProps;
 
diff --git a/frontends/web/src/components/forms/checkbox.tsx b/frontends/web/src/components/forms/checkbox.tsx
index 4293c21e2a..37ea3e5d23 100644
--- a/frontends/web/src/components/forms/checkbox.tsx
+++ b/frontends/web/src/components/forms/checkbox.tsx
@@ -19,10 +19,10 @@ import { FunctionComponent } from 'react';
 import styles from './checkbox.module.css';
 
 type CheckboxProps = JSX.IntrinsicElements['input'] & {
-    label?: string;
-    id: string;
-    checkboxStyle?: 'default' | 'info' | 'warning' | 'success';
-}
+  label?: string;
+  id: string;
+  checkboxStyle?: 'default' | 'info' | 'warning' | 'success';
+};
 
 export const Checkbox: FunctionComponent<CheckboxProps> = ({
   disabled = false,
diff --git a/frontends/web/src/components/forms/input-with-dropdown.tsx b/frontends/web/src/components/forms/input-with-dropdown.tsx
index 02a2105fe3..f2efaff11a 100644
--- a/frontends/web/src/components/forms/input-with-dropdown.tsx
+++ b/frontends/web/src/components/forms/input-with-dropdown.tsx
@@ -29,7 +29,7 @@ export type TInputWithDropdownProps<T> = TBaseInputProps & {
   dropdownTitle?: string;
   isOptionDisabled?: (option: TOption<T>) => boolean;
   renderOptions?: (option: TOption<T>, isSelectedValue: boolean) => React.ReactNode;
-}
+};
 
 export const InputWithDropdown = forwardRef<HTMLInputElement, TInputWithDropdownProps<any>>(({
   id,
diff --git a/frontends/web/src/components/forms/radio.tsx b/frontends/web/src/components/forms/radio.tsx
index 87ca89142d..5df32ca0ac 100644
--- a/frontends/web/src/components/forms/radio.tsx
+++ b/frontends/web/src/components/forms/radio.tsx
@@ -17,11 +17,11 @@
 
 import style from './radio.module.css';
 
-interface IRadioProps {
-    label?: string;
-}
+type IRadioProps = {
+  label?: string;
+};
 
-type TRadioProps = IRadioProps & JSX.IntrinsicElements['input']
+type TRadioProps = IRadioProps & JSX.IntrinsicElements['input'];
 
 export const Radio = ({
   disabled = false,
diff --git a/frontends/web/src/components/forms/types.ts b/frontends/web/src/components/forms/types.ts
index b50b010e51..08229d23b2 100644
--- a/frontends/web/src/components/forms/types.ts
+++ b/frontends/web/src/components/forms/types.ts
@@ -25,5 +25,5 @@ export type TBaseInputProps = {
   transparent?: boolean;
   labelSection?: JSX.Element | undefined;
   label?: string;
-} & Omit<HTMLProps<HTMLInputElement>, 'onInput'>
+} & Omit<HTMLProps<HTMLInputElement>, 'onInput'>;
 
diff --git a/frontends/web/src/components/groupedaccountselector/groupedaccountselector.tsx b/frontends/web/src/components/groupedaccountselector/groupedaccountselector.tsx
index 57bfad452f..10c6ad3a9f 100644
--- a/frontends/web/src/components/groupedaccountselector/groupedaccountselector.tsx
+++ b/frontends/web/src/components/groupedaccountselector/groupedaccountselector.tsx
@@ -17,7 +17,7 @@
 import { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Select, { components, SingleValueProps, OptionProps, SingleValue, DropdownIndicatorProps, GroupProps, GroupHeadingProps as ReactSelectGroupHeadingProps } from 'react-select';
-import { AccountCode, IAccount } from '@/api/account';
+import { AccountCode, TAccount } from '@/api/account';
 import { Button } from '@/components/forms';
 import { Logo } from '@/components/icon/logo';
 import { AppContext } from '@/contexts/AppContext';
@@ -32,16 +32,16 @@ export type TGroupedOption = {
   label: string;
   connected: boolean;
   options: TOption[];
-}
+};
 
 export type TOption = {
   label: string;
   value: AccountCode;
   disabled: boolean;
-  coinCode?: IAccount['coinCode'];
+  coinCode?: TAccount['coinCode'];
   balance?: string;
   insured?: boolean;
-}
+};
 
 type TAccountSelector = {
   title: string;
@@ -49,8 +49,8 @@ type TAccountSelector = {
   selected?: string;
   onChange: (value: string) => void;
   onProceed: () => void;
-  accounts: IAccount[]
-}
+  accounts: TAccount[];
+};
 
 const SelectSingleValue = (props: SingleValueProps<TOption>) => {
   const { hideAmounts } = useContext(AppContext);
@@ -100,8 +100,8 @@ const Group = (props: GroupProps<TOption>) => (
 );
 
 type GroupHeadingProps = {
-  customData: TGroupedOption
-} & ReactSelectGroupHeadingProps<TOption>
+  customData: TGroupedOption;
+} & ReactSelectGroupHeadingProps<TOption>;
 
 const GroupHeading = (
   { customData, ...props }: GroupHeadingProps
diff --git a/frontends/web/src/components/guide/entry.tsx b/frontends/web/src/components/guide/entry.tsx
index c9859a85b7..b356cf563e 100644
--- a/frontends/web/src/components/guide/entry.tsx
+++ b/frontends/web/src/components/guide/entry.tsx
@@ -20,19 +20,19 @@ import { A } from '@/components/anchor/anchor';
 import style from './guide.module.css';
 
 export type TEntryProp = {
-    title: string;
+  title: string;
+  text: string;
+  link?: {
+    url?: string;
     text: string;
-    link?: {
-        url?: string;
-        text: string;
-    };
-}
+  };
+};
 
 type TEntryProps = {
-    entry: TEntryProp;
-    shown?: boolean;
-    children?: ReactNode;
-}
+  entry: TEntryProp;
+  shown?: boolean;
+  children?: ReactNode;
+};
 
 type TProps = TEntryProps;
 
diff --git a/frontends/web/src/components/guide/guide.module.css b/frontends/web/src/components/guide/guide.module.css
index 5010aa97b1..67cdacd66f 100644
--- a/frontends/web/src/components/guide/guide.module.css
+++ b/frontends/web/src/components/guide/guide.module.css
@@ -56,7 +56,7 @@
 }
 
 .header h2 {
-    font-size: var(--header-default-font-size);
+    font-size: var(--size-header);
     font-weight: 400;
     margin: 0;
 }
diff --git a/frontends/web/src/components/guide/guide.tsx b/frontends/web/src/components/guide/guide.tsx
index 8b0874c836..daf5c7dcdb 100644
--- a/frontends/web/src/components/guide/guide.tsx
+++ b/frontends/web/src/components/guide/guide.tsx
@@ -25,9 +25,9 @@ import style from './guide.module.css';
 
 
 export type TProps = {
-    children?: ReactNode;
-    title?: string
-}
+  children?: ReactNode;
+  title?: string;
+};
 
 const Guide = ({ children, title = t('guide.title') }: TProps) => {
   const { guideShown, toggleGuide, setGuideExists } = useContext(AppContext);
diff --git a/frontends/web/src/components/headerssync/headerssync.tsx b/frontends/web/src/components/headerssync/headerssync.tsx
index 4191ad45a1..51d395521f 100644
--- a/frontends/web/src/components/headerssync/headerssync.tsx
+++ b/frontends/web/src/components/headerssync/headerssync.tsx
@@ -25,8 +25,8 @@ import { AsciiSpinner } from '@/components/spinner/ascii';
 import style from './headerssync.module.css';
 
 export type TProps = {
-    coinCode: CoinCode;
-}
+  coinCode: CoinCode;
+};
 
 export const HeadersSync = ({ coinCode }: TProps) => {
   const { i18n, t } = useTranslation();
diff --git a/frontends/web/src/components/icon/icon.tsx b/frontends/web/src/components/icon/icon.tsx
index d200a14f89..a6406ded9c 100644
--- a/frontends/web/src/components/icon/icon.tsx
+++ b/frontends/web/src/components/icon/icon.tsx
@@ -156,9 +156,9 @@ export const CaretDown = ({ className, ...props }: SVGProps) => (
   </svg>
 );
 
-interface ExpandIconProps {
-    expand: boolean;
-}
+type ExpandIconProps = {
+  expand: boolean;
+};
 
 export const ExpandIcon = ({
   expand = true,
diff --git a/frontends/web/src/components/icon/logo.tsx b/frontends/web/src/components/icon/logo.tsx
index 27aaa7e8ef..aeb73eb6d2 100644
--- a/frontends/web/src/components/icon/logo.tsx
+++ b/frontends/web/src/components/icon/logo.tsx
@@ -76,7 +76,7 @@ export const SwissMadeOpenSourceDark = ({ className, ...props }: ImgProps) => <i
 
 type LogoMap = {
   [key in CoinCode]: string[];
-}
+};
 
 const logoMap: LogoMap = {
   'btc': [BTC, BTC_GREY],
@@ -105,7 +105,7 @@ type LogoProps = {
   className?: string;
   coinCode: CoinCode;
   stacked?: boolean;
-}
+};
 
 export const Logo = ({
   coinCode,
diff --git a/frontends/web/src/components/infobutton/infobutton.tsx b/frontends/web/src/components/infobutton/infobutton.tsx
index 449678104b..ee203edb39 100644
--- a/frontends/web/src/components/infobutton/infobutton.tsx
+++ b/frontends/web/src/components/infobutton/infobutton.tsx
@@ -17,7 +17,7 @@
 import { BuyInfo } from '@/components/icon/icon';
 import style from './infobutton.module.css';
 
-type TProps = { onClick: () => void }
+type TProps = { onClick: () => void };
 export const InfoButton = ({ onClick, ...props }: TProps) => {
   return (
     <button onClick={onClick} {...props} className={style.button}>
diff --git a/frontends/web/src/components/language/language.tsx b/frontends/web/src/components/language/language.tsx
index 51951ff121..86ad431c5c 100644
--- a/frontends/web/src/components/language/language.tsx
+++ b/frontends/web/src/components/language/language.tsx
@@ -23,8 +23,8 @@ import style from './language.module.css';
 import { getSelectedIndex } from '@/utils/language';
 
 type TLanguageSwitchProps = {
-    languages?: TLanguagesList;
-}
+  languages?: TLanguagesList;
+};
 
 const LanguageSwitch = ({ languages }: TLanguageSwitchProps) => {
 
diff --git a/frontends/web/src/components/layout/footer.tsx b/frontends/web/src/components/layout/footer.tsx
index 456de7335c..31318394f4 100644
--- a/frontends/web/src/components/layout/footer.tsx
+++ b/frontends/web/src/components/layout/footer.tsx
@@ -21,7 +21,7 @@ import { Version } from './version';
 
 type TProps = {
   children: ReactNode;
-}
+};
 
 export const Footer = ({ children }: TProps) => {
   return (
diff --git a/frontends/web/src/components/layout/grid.tsx b/frontends/web/src/components/layout/grid.tsx
index 9658f13408..de68addb07 100644
--- a/frontends/web/src/components/layout/grid.tsx
+++ b/frontends/web/src/components/layout/grid.tsx
@@ -21,7 +21,7 @@ type TGridProps = {
   children: ReactNode;
   col?: '1' | '2';
   textAlign?: 'center' | 'left';
-}
+};
 
 export const Grid = ({
   children,
@@ -45,7 +45,7 @@ type TColumnProps = {
   className?: string;
   children: ReactNode;
   textCenter?: boolean;
-}
+};
 
 export const Column = ({
   asCard,
@@ -70,7 +70,7 @@ type TColumnButtonsProps = {
   children: ReactNode;
   className?: string;
   inline?: boolean;
-}
+};
 
 export const ColumnButtons = ({
   children,
diff --git a/frontends/web/src/components/layout/guide-wrapper.tsx b/frontends/web/src/components/layout/guide-wrapper.tsx
index 2b0420661c..ca29fd96bb 100644
--- a/frontends/web/src/components/layout/guide-wrapper.tsx
+++ b/frontends/web/src/components/layout/guide-wrapper.tsx
@@ -19,7 +19,7 @@ import styles from './guide-wrapper.module.css';
 
 type TProps = {
   children: ReactNode;
-}
+};
 
 export const GuideWrapper = ({ children }: TProps) => {
   return (
diff --git a/frontends/web/src/components/layout/header.module.css b/frontends/web/src/components/layout/header.module.css
index f0f5609386..02468bb69e 100644
--- a/frontends/web/src/components/layout/header.module.css
+++ b/frontends/web/src/components/layout/header.module.css
@@ -78,7 +78,7 @@
 
 .title > * {
     margin: 0;
-    font-size: var(--header-default-font-size);
+    font-size: var(--size-header);
     font-weight: 400;
     line-height: 1;
     display: inline-flex;
diff --git a/frontends/web/src/components/layout/main.tsx b/frontends/web/src/components/layout/main.tsx
index 472389b569..dcd6543dea 100644
--- a/frontends/web/src/components/layout/main.tsx
+++ b/frontends/web/src/components/layout/main.tsx
@@ -19,7 +19,7 @@ import style from './main.module.css';
 
 type TMainProps = {
   children: ReactNode;
-}
+};
 
 export const Main = ({ children }: TMainProps) => {
   return (
diff --git a/frontends/web/src/components/message/message.module.css b/frontends/web/src/components/message/message.module.css
index f16241de60..490c4943d8 100644
--- a/frontends/web/src/components/message/message.module.css
+++ b/frontends/web/src/components/message/message.module.css
@@ -18,24 +18,6 @@
     width: 100%;
 }
 
-.message .title {
-    margin: 0 0 var(--spacing-half) 0;
-}
-
-@media (max-width: 768px) {
-    .message {
-      --size-default: 14px
-    }
-    .message .title {
-        --size-subheader: 18px;
-    }
-}
-
-.message.small {
-    flex-shrink: 1;
-    font-size: var(--size-default);
-}
-
 .message img {
     margin-right: 4px;
     max-width: 30px;
diff --git a/frontends/web/src/components/message/message.tsx b/frontends/web/src/components/message/message.tsx
index 37ba943809..7d7183185f 100644
--- a/frontends/web/src/components/message/message.tsx
+++ b/frontends/web/src/components/message/message.tsx
@@ -20,7 +20,7 @@ import { StatusInfo, StatusSuccess, StatusWarning, StatusError } from '@/compone
 import { TMessageTypes } from '@/utils/types';
 import styles from './message.module.css';
 
-type TMessageIconProps = { type: TMessageTypes, icon?: ReactNode };
+type TMessageIconProps = { type: TMessageTypes; icon?: ReactNode };
 
 const MessageIcon = ({ type, icon }: TMessageIconProps) => {
   // optional custom icon
@@ -52,19 +52,15 @@ const MessageIcon = ({ type, icon }: TMessageIconProps) => {
 type MessageProps = {
   className?: string;
   hidden?: boolean;
-  small?: boolean;
-  title?: string;
   type?: TMessageTypes;
   icon?: ReactNode;
   noIcon?: boolean;
   children: ReactNode;
-}
+};
 
 export const Message = ({
   className = '',
   hidden,
-  small,
-  title,
   type = 'info',
   icon,
   noIcon = false,
@@ -76,16 +72,10 @@ export const Message = ({
   return (
     <div className={`
       ${styles[type] || ''}
-      ${small && styles.small || ''}
       ${className || ''}
     `.trim()}>
       {!noIcon && <MessageIcon type={type} icon={icon} />}
       <div className={styles.content}>
-        {title && (
-          <h2 className={`subTitle ${styles.title || ''}`}>
-            {title}
-          </h2>
-        )}
         {children}
       </div>
     </div>
diff --git a/frontends/web/src/components/password.tsx b/frontends/web/src/components/password.tsx
index c29204d875..62d3d4ba84 100644
--- a/frontends/web/src/components/password.tsx
+++ b/frontends/web/src/components/password.tsx
@@ -41,7 +41,7 @@ type TPropsPasswordInput = {
   placeholder?: string;
   onInput?: (event: React.ChangeEvent<HTMLInputElement>) => void;
   value: string;
-}
+};
 export const PasswordInput = ({ seePlaintext, ...rest }: TPropsPasswordInput) => {
   return (
     <Input
@@ -61,7 +61,7 @@ type TProps = {
   title?: string;
   showLabel?: string;
   onValidPassword: (password: string | null) => void;
-}
+};
 
 type TPasswordSingleInputProps = TProps & TranslateProps;
 
@@ -69,7 +69,7 @@ type TState = {
   password: string;
   seePlaintext: boolean;
   capsLock: boolean;
-}
+};
 
 class PasswordSingleInputClass extends Component<TPasswordSingleInputProps, TState> {
   private regex?: RegExp;
@@ -359,7 +359,7 @@ type MatchesPatternProps = {
   regex: RegExp | undefined;
   value: string;
   text: string | undefined;
-}
+};
 const MatchesPattern = ({ regex, value = '', text }: MatchesPatternProps) => {
   if (!regex || !value.length || regex.test(value)) {
     return null;
diff --git a/frontends/web/src/components/pillbuttongroup/pillbuttongroup.tsx b/frontends/web/src/components/pillbuttongroup/pillbuttongroup.tsx
index a2488223a8..e24cf17546 100644
--- a/frontends/web/src/components/pillbuttongroup/pillbuttongroup.tsx
+++ b/frontends/web/src/components/pillbuttongroup/pillbuttongroup.tsx
@@ -22,14 +22,14 @@ type TPillTabProps = {
   children: ReactNode;
   className?: string;
   size?: 'medium' | 'large';
-}
+};
 
 type TPillTabButtonProps = {
-    active: boolean;
-    children: ReactNode;
-    disabled?: boolean;
-    onClick: () => void;
-}
+  active: boolean;
+  children: ReactNode;
+  disabled?: boolean;
+  onClick: () => void;
+};
 
 export const PillButtonGroup = ({
   className = '',
diff --git a/frontends/web/src/components/progressRing/progressRing.tsx b/frontends/web/src/components/progressRing/progressRing.tsx
index a2b375e44d..90059f42d3 100644
--- a/frontends/web/src/components/progressRing/progressRing.tsx
+++ b/frontends/web/src/components/progressRing/progressRing.tsx
@@ -17,13 +17,13 @@
 import style from './progressRing.module.css';
 
 type TProgressRingProps = {
-    width: number;
-    value: number;
-    className?: string[] | string;
-    generic?: boolean;
-    isComplete?: boolean | undefined;
-    isError?: boolean;
-}
+  width: number;
+  value: number;
+  className?: string[] | string;
+  generic?: boolean;
+  isComplete?: boolean | undefined;
+  isError?: boolean;
+};
 
 const ProgressRing = ({
   className,
diff --git a/frontends/web/src/components/qrcode/qrcode.tsx b/frontends/web/src/components/qrcode/qrcode.tsx
index 08f3084a51..8d0357eb0e 100644
--- a/frontends/web/src/components/qrcode/qrcode.tsx
+++ b/frontends/web/src/components/qrcode/qrcode.tsx
@@ -23,9 +23,9 @@ import { useTranslation } from 'react-i18next';
 import style from './qrcode.module.css';
 
 type TProps = {
-    data?: string;
-    size?: number;
-    tapToCopy?: boolean;
+  data?: string;
+  size?: number;
+  tapToCopy?: boolean;
 };
 
 export const QRCode = ({
@@ -59,9 +59,9 @@ export const QRCode = ({
 
 type TTapToCopyQRCodeProps = {
   data?: string;
-  qrCodeData: string
-  size: number
-}
+  qrCodeData: string;
+  size: number;
+};
 
 const TapToCopyQRCode = ({ data, qrCodeData, size }: TTapToCopyQRCodeProps) => {
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/frontends/web/src/components/settingsButton/settingsButton.tsx b/frontends/web/src/components/settingsButton/settingsButton.tsx
index c496702e0d..ea65e24ac2 100644
--- a/frontends/web/src/components/settingsButton/settingsButton.tsx
+++ b/frontends/web/src/components/settingsButton/settingsButton.tsx
@@ -1,15 +1,31 @@
+/**
+ * Copyright 2022-2025 Shift Crypto AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { ReactNode } from 'react';
 import style from './settingsButton.module.css';
 
-interface SettingsButtonProps {
-    onClick?: () => void;
-    danger?: boolean;
-    optionalText?: string;
-    secondaryText?: string | JSX.Element;
-    disabled?: boolean;
-    optionalIcon?: JSX.Element;
-    children: ReactNode;
-}
+type SettingsButtonProps = {
+  onClick?: () => void;
+  danger?: boolean;
+  optionalText?: string;
+  secondaryText?: string | JSX.Element;
+  disabled?: boolean;
+  optionalIcon?: JSX.Element;
+  children: ReactNode;
+};
 
 const SettingsButton = ({
   onClick,
diff --git a/frontends/web/src/components/settingsButton/settingsItem.tsx b/frontends/web/src/components/settingsButton/settingsItem.tsx
index fb8c24a221..8ee022ee01 100644
--- a/frontends/web/src/components/settingsButton/settingsItem.tsx
+++ b/frontends/web/src/components/settingsButton/settingsItem.tsx
@@ -21,7 +21,7 @@ type TProps = {
   optionalText?: string;
   optionalIcon?: JSX.Element;
   children: ReactNode;
-}
+};
 export const SettingsItem = ({ optionalText, optionalIcon, children }: TProps) => {
   return (
     <div className={[style.container, style.item].join(' ')}>
diff --git a/frontends/web/src/components/sidebar/sidebar.tsx b/frontends/web/src/components/sidebar/sidebar.tsx
index 2c3b0a165c..537610dcdc 100644
--- a/frontends/web/src/components/sidebar/sidebar.tsx
+++ b/frontends/web/src/components/sidebar/sidebar.tsx
@@ -20,7 +20,7 @@ import { Link, NavLink, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useKeystores } from '@/hooks/backend';
 import type { TDevices } from '@/api/devices';
-import type { IAccount } from '@/api/account';
+import type { TAccount } from '@/api/account';
 import { deregisterTest } from '@/api/keystores';
 import { getVersion } from '@/api/bitbox02';
 import { debug } from '@/utils/env';
@@ -35,10 +35,10 @@ import style from './sidebar.module.css';
 
 type SidebarProps = {
   devices: TDevices;
-  accounts: IAccount[];
+  accounts: TAccount[];
 };
 
-type TGetAccountLinkProps = IAccount & { handleSidebarItemClick: ((e: React.SyntheticEvent) => void) };
+type TGetAccountLinkProps = TAccount & { handleSidebarItemClick: ((e: React.SyntheticEvent) => void) };
 
 const GetAccountLink = ({
   coinCode,
diff --git a/frontends/web/src/components/spinner/Spinner.tsx b/frontends/web/src/components/spinner/Spinner.tsx
index 1e4ced177a..2aa511045c 100644
--- a/frontends/web/src/components/spinner/Spinner.tsx
+++ b/frontends/web/src/components/spinner/Spinner.tsx
@@ -23,7 +23,7 @@ import style from './Spinner.module.css';
 
 type TProps = {
   text?: string;
-}
+};
 
 export const Spinner = ({ text }: TProps) => {
   const { toggleSidebar } = useContext(AppContext);
diff --git a/frontends/web/src/components/status/status.tsx b/frontends/web/src/components/status/status.tsx
index 437bdd10cd..5c5ba29ea3 100644
--- a/frontends/web/src/components/status/status.tsx
+++ b/frontends/web/src/components/status/status.tsx
@@ -33,7 +33,7 @@ type TProps = {
   dismissible: string;
   className?: string;
   children: ReactNode;
-}
+};
 
 export const Status = ({
   hidden,
diff --git a/frontends/web/src/components/terms/bitrefill-terms.tsx b/frontends/web/src/components/terms/bitrefill-terms.tsx
index fdddea5ef0..297aaab91b 100644
--- a/frontends/web/src/components/terms/bitrefill-terms.tsx
+++ b/frontends/web/src/components/terms/bitrefill-terms.tsx
@@ -22,12 +22,12 @@ import { i18n } from '@/i18n/i18n';
 import { A } from '../anchor/anchor';
 import style from './terms.module.css';
 import { isBitcoinOnly } from '@/routes/account/utils';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 
 type TProps = {
-  account: IAccount;
+  account: TAccount;
   onAgreedTerms: () => void;
-}
+};
 
 // Map languages supported by Bitrefill
 export const localeMapping: Readonly<Record<string, string>> = {
diff --git a/frontends/web/src/components/terms/bitsurance-terms.tsx b/frontends/web/src/components/terms/bitsurance-terms.tsx
index bf35b993a5..af6cd4549d 100644
--- a/frontends/web/src/components/terms/bitsurance-terms.tsx
+++ b/frontends/web/src/components/terms/bitsurance-terms.tsx
@@ -24,7 +24,7 @@ import { i18n } from '@/i18n/i18n';
 
 type TProps = {
   onAgreedTerms: () => void;
-}
+};
 
 export const BitsuranceTerms = ({ onAgreedTerms }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/terms/btcdirect-otc-terms.tsx b/frontends/web/src/components/terms/btcdirect-otc-terms.tsx
index abcfde0bc5..9d553df4da 100644
--- a/frontends/web/src/components/terms/btcdirect-otc-terms.tsx
+++ b/frontends/web/src/components/terms/btcdirect-otc-terms.tsx
@@ -24,7 +24,7 @@ import style from './terms.module.css';
 
 type TProps = {
   onContinue: () => void;
-}
+};
 
 export const getBTCDirectPrivacyLink = () => {
   switch (i18n.resolvedLanguage) {
diff --git a/frontends/web/src/components/terms/btcdirect-terms.tsx b/frontends/web/src/components/terms/btcdirect-terms.tsx
index 2fddbc2ceb..53998ce6a1 100644
--- a/frontends/web/src/components/terms/btcdirect-terms.tsx
+++ b/frontends/web/src/components/terms/btcdirect-terms.tsx
@@ -19,16 +19,16 @@ import { useTranslation } from 'react-i18next';
 import { isBitcoinOnly } from '@/routes/account/utils';
 import { Button, Checkbox } from '@/components/forms';
 import { setConfig } from '@/utils/config';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { A } from '@/components/anchor/anchor';
 import { getBTCDirectAboutUsLink } from '@/routes/market/components/infocontent';
 import { getBTCDirectPrivacyLink } from './btcdirect-otc-terms';
 import style from './terms.module.css';
 
 type TProps = {
-  account: IAccount;
+  account: TAccount;
   onAgreedTerms: () => void;
-}
+};
 
 const handleSkipDisclaimer = (e: ChangeEvent<HTMLInputElement>) => {
   setConfig({ frontend: { skipBTCDirectWidgetDisclaimer: e.target.checked } });
diff --git a/frontends/web/src/components/terms/moonpay-terms.tsx b/frontends/web/src/components/terms/moonpay-terms.tsx
index 1f8741c56a..de7f8e48db 100644
--- a/frontends/web/src/components/terms/moonpay-terms.tsx
+++ b/frontends/web/src/components/terms/moonpay-terms.tsx
@@ -20,14 +20,14 @@ import { useTranslation } from 'react-i18next';
 import { isBitcoinOnly } from '@/routes/account/utils';
 import { Button, Checkbox } from '@/components/forms';
 import { setConfig } from '@/utils/config';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { A } from '@/components/anchor/anchor';
 import style from './terms.module.css';
 
 type TProps = {
-  account: IAccount;
+  account: TAccount;
   onAgreedTerms: () => void;
-}
+};
 
 export const MoonpayTerms = ({ account, onAgreedTerms }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/terms/pocket-terms.tsx b/frontends/web/src/components/terms/pocket-terms.tsx
index 85d2576f13..0923bdbeab 100644
--- a/frontends/web/src/components/terms/pocket-terms.tsx
+++ b/frontends/web/src/components/terms/pocket-terms.tsx
@@ -24,7 +24,7 @@ import { SimpleMarkup } from '@/utils/markup';
 
 type TProps = {
   onAgreedTerms: () => void;
-}
+};
 
 export const PocketTerms = ({ onAgreedTerms }: TProps) => {
   const { t } = useTranslation();
@@ -59,8 +59,7 @@ export const PocketTerms = ({ onAgreedTerms }: TProps) => {
 
         <h2 className={style.title}>{t('exchange.pocket.terms.kyc.title')}</h2>
         <ul>
-          <li><p>{t('exchange.pocket.terms.kyc.p1')}</p></li>
-          <li><p>{t('exchange.pocket.terms.kyc.p2')}</p></li>
+          <li><p>{t('exchange.pocket.terms.kyc.info')}</p></li>
         </ul>
         <p>
           <A href="https://pocketbitcoin.com/faq">
diff --git a/frontends/web/src/components/toast/toast.tsx b/frontends/web/src/components/toast/toast.tsx
index 54aad10a82..6eec458c69 100644
--- a/frontends/web/src/components/toast/toast.tsx
+++ b/frontends/web/src/components/toast/toast.tsx
@@ -19,10 +19,10 @@ import { ReactNode, useEffect, useState } from 'react';
 import style from './Toast.module.css';
 
 type TProps = {
-    theme: string;
-    withGuide?: boolean;
-    children: ReactNode;
-}
+  theme: string;
+  withGuide?: boolean;
+  children: ReactNode;
+};
 
 export const Toast = ({ theme, withGuide = false, children }: TProps) => {
   const [active, setActive] = useState(false);
diff --git a/frontends/web/src/components/toggle/toggle.tsx b/frontends/web/src/components/toggle/toggle.tsx
index 33820542c7..c4da502e38 100644
--- a/frontends/web/src/components/toggle/toggle.tsx
+++ b/frontends/web/src/components/toggle/toggle.tsx
@@ -16,7 +16,7 @@
 
 import style from './toggle.module.css';
 
-export type TToggleProps = JSX.IntrinsicElements['input']
+export type TToggleProps = JSX.IntrinsicElements['input'];
 
 export const Toggle = ({
   className = '',
diff --git a/frontends/web/src/components/transactions/components/address-or-txid.tsx b/frontends/web/src/components/transactions/components/address-or-txid.tsx
index 74f8b51432..aed6678328 100644
--- a/frontends/web/src/components/transactions/components/address-or-txid.tsx
+++ b/frontends/web/src/components/transactions/components/address-or-txid.tsx
@@ -20,7 +20,7 @@ import styles from './details.module.css';
 type TPropsTxDetailCopyableValues = {
   label: string;
   values: string[];
-}
+};
 
 export const TxDetailCopyableValues = ({
   label,
diff --git a/frontends/web/src/components/transactions/components/date.tsx b/frontends/web/src/components/transactions/components/date.tsx
index 7edf97a1a8..e9b195ac95 100644
--- a/frontends/web/src/components/transactions/components/date.tsx
+++ b/frontends/web/src/components/transactions/components/date.tsx
@@ -20,7 +20,7 @@ import { TxDetail } from './detail';
 
 type TProps = {
   time: string | null;
-}
+};
 
 export const TxDateDetail = ({ time }: TProps) => {
   const { i18n, t } = useTranslation();
diff --git a/frontends/web/src/components/transactions/components/details-dialog.tsx b/frontends/web/src/components/transactions/components/details-dialog.tsx
index ee32532c89..f8ada519b7 100644
--- a/frontends/web/src/components/transactions/components/details-dialog.tsx
+++ b/frontends/web/src/components/transactions/components/details-dialog.tsx
@@ -16,7 +16,7 @@
 
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ITransaction, TAmountWithConversions, getTransaction, TTransactionStatus, TTransactionType } from '@/api/account';
+import { TTransaction, TAmountWithConversions, getTransaction, TTransactionStatus, TTransactionType } from '@/api/account';
 import { A } from '@/components/anchor/anchor';
 import { Dialog } from '@/components/dialog/dialog';
 import { Note } from './note';
@@ -42,7 +42,7 @@ type TProps = {
   time: string | null;
   amount: TAmountWithConversions;
   explorerURL: string;
-}
+};
 
 export const TxDetailsDialog = ({
   open,
@@ -60,7 +60,7 @@ export const TxDetailsDialog = ({
 }: TProps) => {
   const { t } = useTranslation();
 
-  const [transactionInfo, setTransactionInfo] = useState<ITransaction | null>(null);
+  const [transactionInfo, setTransactionInfo] = useState<TTransaction | null>(null);
 
   useEffect(() => {
     if (!transactionInfo && open) {
diff --git a/frontends/web/src/components/transactions/components/note.tsx b/frontends/web/src/components/transactions/components/note.tsx
index f42be131e4..2e4f9c6121 100644
--- a/frontends/web/src/components/transactions/components/note.tsx
+++ b/frontends/web/src/components/transactions/components/note.tsx
@@ -27,7 +27,7 @@ type Props = {
   internalID: string;
   // Contains the existing note.
   note: string;
-}
+};
 
 export const Note = ({ accountCode, note, internalID }: Props) => {
   const { isDarkMode } = useDarkmode();
diff --git a/frontends/web/src/components/transactions/components/status.tsx b/frontends/web/src/components/transactions/components/status.tsx
index 8f87e8893e..b3722dabb0 100644
--- a/frontends/web/src/components/transactions/components/status.tsx
+++ b/frontends/web/src/components/transactions/components/status.tsx
@@ -23,7 +23,7 @@ type TProps = {
   status: TTransactionStatus;
   numConfirmations: number;
   numConfirmationsComplete: number;
-}
+};
 
 export const TxStatusDetail = ({
   status,
diff --git a/frontends/web/src/components/transactions/details.tsx b/frontends/web/src/components/transactions/details.tsx
index 30cfdf9436..134ce2c96a 100644
--- a/frontends/web/src/components/transactions/details.tsx
+++ b/frontends/web/src/components/transactions/details.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useEffect, useState, useCallback } from 'react';
-import type { AccountCode, ITransaction } from '@/api/account';
+import type { AccountCode, TTransaction } from '@/api/account';
 import { getTransaction } from '@/api/account';
 import { syncdone } from '@/api/accountsync';
 import { usePrevious } from '@/hooks/previous';
@@ -24,9 +24,9 @@ import { TxDetailsDialog } from './components/details-dialog';
 type TProps = {
   accountCode: AccountCode;
   explorerURL: string;
-  internalID: ITransaction['internalID'] | null;
+  internalID: TTransaction['internalID'] | null;
   onClose: () => void;
-}
+};
 
 export const TransactionDetails = ({
   accountCode,
@@ -35,7 +35,7 @@ export const TransactionDetails = ({
   onClose,
 }: TProps) => {
   const [open, setOpen] = useState(false);
-  const [transactionInfo, setTransactionInfo] = useState<ITransaction | null>(null);
+  const [transactionInfo, setTransactionInfo] = useState<TTransaction | null>(null);
   const prevInternalID = usePrevious(internalID);
 
   useEffect(() => setOpen(false), [accountCode]);
diff --git a/frontends/web/src/components/transactions/transaction.tsx b/frontends/web/src/components/transactions/transaction.tsx
index 2efd92ee53..95fbe92d2e 100644
--- a/frontends/web/src/components/transactions/transaction.tsx
+++ b/frontends/web/src/components/transactions/transaction.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import type { TAmountWithConversions, TTransactionStatus, TTransactionType, ITransaction } from '@/api/account';
+import type { TAmountWithConversions, TTransactionStatus, TTransactionType, TTransaction } from '@/api/account';
 import { useMediaQuery } from '@/hooks/mediaquery';
 import { Loupe } from '@/components/icon/icon';
 import { parseTimeLong, parseTimeShort } from '@/utils/date';
@@ -26,9 +26,9 @@ import { Arrow } from './components/arrows';
 import { getTxSign } from '@/utils/transaction';
 import styles from './transaction.module.css';
 
-type TTransactionProps = ITransaction & {
-  onShowDetail: (internalID: ITransaction['internalID']) => void;
-}
+type TTransactionProps = TTransaction & {
+  onShowDetail: (internalID: TTransaction['internalID']) => void;
+};
 
 export const Transaction = ({
   addresses,
@@ -83,13 +83,13 @@ export const Transaction = ({
 
 type TStatus = {
   addresses: string[];
-  note?: ITransaction['note'];
+  note?: TTransaction['note'];
   numConfirmations: number;
   numConfirmationsComplete: number;
   status: TTransactionStatus;
   time?: string | null;
   type: TTransactionType;
-}
+};
 
 const Status = ({
   addresses,
@@ -150,9 +150,9 @@ const Status = ({
 
 type TAmountsProps = {
   amount: TAmountWithConversions;
-  deductedAmount: TAmountWithConversions,
+  deductedAmount: TAmountWithConversions;
   type: TTransactionType;
-}
+};
 
 const Amounts = ({
   amount,
@@ -188,7 +188,7 @@ const Amounts = ({
 
 type TDateProps = {
   time: string | null;
-}
+};
 
 const Date = ({
   time,
@@ -210,10 +210,10 @@ const Date = ({
 };
 
 type TAddresses = {
-  addresses: ITransaction['addresses'];
+  addresses: TTransaction['addresses'];
   status: TTransactionStatus;
   type: TTransactionType;
-}
+};
 
 const Addresses = ({
   addresses,
diff --git a/frontends/web/src/components/view/view.tsx b/frontends/web/src/components/view/view.tsx
index 044f6eeea7..bc03d6264d 100644
--- a/frontends/web/src/components/view/view.tsx
+++ b/frontends/web/src/components/view/view.tsx
@@ -23,16 +23,16 @@ import { AnimatedChecked, Abort, Close } from '@/components/icon/icon';
 import style from './view.module.css';
 
 type TViewProps = {
-    dialog?: boolean;
-    fitContent?: boolean;
-    fullscreen?: boolean;
-    children: ReactNode;
-    minHeight?: string;
-    onClose?: () => void;
-    textCenter?: boolean;
-    verticallyCentered?: boolean;
-    width?: string;
-    withBottomBar?: boolean;
+  dialog?: boolean;
+  fitContent?: boolean;
+  fullscreen?: boolean;
+  children: ReactNode;
+  minHeight?: string;
+  onClose?: () => void;
+  textCenter?: boolean;
+  verticallyCentered?: boolean;
+  width?: string;
+  withBottomBar?: boolean;
 };
 
 /**
@@ -109,7 +109,7 @@ type TViewContentProps = {
   minHeight?: string;
   textAlign?: 'center' | 'left';
   withIcon?: 'success' | 'error';
-}
+};
 
 const ViewIcon = ({
   withIcon,
@@ -157,11 +157,11 @@ export const ViewContent = ({
 };
 
 type THeaderProps = {
-    small?: boolean;
-    title?: ReactNode;
-    withAppLogo?: boolean;
-    children?: ReactNode;
-}
+  small?: boolean;
+  title?: ReactNode;
+  withAppLogo?: boolean;
+  children?: ReactNode;
+};
 
 /**
  * ViewHeader component to render the view's title and a byline
@@ -196,7 +196,7 @@ export const ViewHeader = ({
 type TViewButtonsProps = {
   reverseRow?: boolean;
   children?: ReactNode;
-}
+};
 
 /**
  * ViewButtons component use as container for buttons
diff --git a/frontends/web/src/components/wait-dialog/wait-dialog.tsx b/frontends/web/src/components/wait-dialog/wait-dialog.tsx
index ee654535e7..27c52f0fe4 100644
--- a/frontends/web/src/components/wait-dialog/wait-dialog.tsx
+++ b/frontends/web/src/components/wait-dialog/wait-dialog.tsx
@@ -21,10 +21,10 @@ import { UseDisableBackButton } from '@/hooks/backbutton';
 import style from '@/components/dialog/dialog.module.css';
 
 type Props = {
-    includeDefault?: boolean;
-    title?: string;
-    children?: React.ReactNode;
-}
+  includeDefault?: boolean;
+  title?: string;
+  children?: React.ReactNode;
+};
 
 export const WaitDialog = ({
   includeDefault,
diff --git a/frontends/web/src/components/wallet-connect/incoming-signing-request-dialog.tsx b/frontends/web/src/components/wallet-connect/incoming-signing-request-dialog.tsx
index 5c8e41c6e1..9fabe49bc7 100644
--- a/frontends/web/src/components/wallet-connect/incoming-signing-request-dialog.tsx
+++ b/frontends/web/src/components/wallet-connect/incoming-signing-request-dialog.tsx
@@ -31,7 +31,7 @@ type TRequestDialogProps = {
   onReject: () => void;
   content: TRequestDialogContent;
   stage: TStage;
-}
+};
 
 const ConfirmOnBB02 = () => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/components/wallet-connect/incoming-signing-request.module.css b/frontends/web/src/components/wallet-connect/incoming-signing-request.module.css
index 6b07b1a32d..2e81e69c03 100644
--- a/frontends/web/src/components/wallet-connect/incoming-signing-request.module.css
+++ b/frontends/web/src/components/wallet-connect/incoming-signing-request.module.css
@@ -21,7 +21,7 @@
 }
 
 .animationAndTextContainer p {
-    font-size: var(--header-default-font-size);
+    font-size: var(--size-header);
     margin-top: var(--space-quarter);
 }
 
@@ -101,7 +101,7 @@
 }
 
 .titleContainer h3 {
-    font-size: var(--header-default-font-size);
+    font-size: var(--size-header);
     font-weight: 400;
     margin: 0 0 0 var(--space-eight);
     padding: 0 var(--space-quarter);
diff --git a/frontends/web/src/components/wallet-connect/incoming-signing-request.tsx b/frontends/web/src/components/wallet-connect/incoming-signing-request.tsx
index 07dff81703..a38d291e92 100644
--- a/frontends/web/src/components/wallet-connect/incoming-signing-request.tsx
+++ b/frontends/web/src/components/wallet-connect/incoming-signing-request.tsx
@@ -26,7 +26,7 @@ import { TStage, WCIncomingSignRequestDialog } from './incoming-signing-request-
 type TSigningRequestData = {
   topic: string;
   id: number;
-}
+};
 
 export const WCSigningRequest = () => {
   const { web3wallet, isWalletInitialized } = useContext(WCWeb3WalletContext);
diff --git a/frontends/web/src/connected.tsx b/frontends/web/src/connected.tsx
index b9d09dbf2c..d11b6369ed 100644
--- a/frontends/web/src/connected.tsx
+++ b/frontends/web/src/connected.tsx
@@ -19,8 +19,8 @@ import { ReactNode, useEffect, useState } from 'react';
 import { backendConnected } from './api/subscribe';
 
 type TProps = {
-    children: ReactNode;
-}
+  children: ReactNode;
+};
 
 export const ConnectedApp = ({ children }: TProps) => {
   const [connected, setConnected] = useState(true);
diff --git a/frontends/web/src/contexts/AppContext.tsx b/frontends/web/src/contexts/AppContext.tsx
index 523fe55d39..52af5d89dc 100644
--- a/frontends/web/src/contexts/AppContext.tsx
+++ b/frontends/web/src/contexts/AppContext.tsx
@@ -19,25 +19,25 @@ import { Dispatch, SetStateAction, createContext } from 'react';
 export type TChartDisplay = 'week' | 'month' | 'year' | 'all';
 
 type AppContextProps = {
-    activeSidebar: boolean;
-    guideShown: boolean;
-    guideExists: boolean;
-    hideAmounts: boolean;
-    isTesting: boolean;
-    isDevServers: boolean;
-    isOnline?: boolean;
-    nativeLocale: string;
-    firmwareUpdateDialogOpen: boolean;
-    chartDisplay: TChartDisplay;
-    setActiveSidebar: Dispatch<SetStateAction<boolean>>;
-    setGuideExists: Dispatch<SetStateAction<boolean>>;
-    setHideAmounts: Dispatch<SetStateAction<boolean>>;
-    setChartDisplay: Dispatch<SetStateAction<TChartDisplay>>;
-    setFirmwareUpdateDialogOpen: Dispatch<SetStateAction<boolean>>;
-    toggleGuide: () => void;
-    toggleHideAmounts: () => void;
-    toggleSidebar: () => void;
-}
+  activeSidebar: boolean;
+  guideShown: boolean;
+  guideExists: boolean;
+  hideAmounts: boolean;
+  isTesting: boolean;
+  isDevServers: boolean;
+  isOnline?: boolean;
+  nativeLocale: string;
+  firmwareUpdateDialogOpen: boolean;
+  chartDisplay: TChartDisplay;
+  setActiveSidebar: Dispatch<SetStateAction<boolean>>;
+  setGuideExists: Dispatch<SetStateAction<boolean>>;
+  setHideAmounts: Dispatch<SetStateAction<boolean>>;
+  setChartDisplay: Dispatch<SetStateAction<TChartDisplay>>;
+  setFirmwareUpdateDialogOpen: Dispatch<SetStateAction<boolean>>;
+  toggleGuide: () => void;
+  toggleHideAmounts: () => void;
+  toggleSidebar: () => void;
+};
 
 const AppContext = createContext<AppContextProps>({} as AppContextProps);
 
diff --git a/frontends/web/src/contexts/AppProvider.tsx b/frontends/web/src/contexts/AppProvider.tsx
index b99caada25..9ea418a411 100644
--- a/frontends/web/src/contexts/AppProvider.tsx
+++ b/frontends/web/src/contexts/AppProvider.tsx
@@ -29,8 +29,8 @@ import { useMediaQuery } from '@/hooks/mediaquery';
 import { useSync } from '@/hooks/api';
 
 type TProps = {
-    children: ReactNode;
-}
+  children: ReactNode;
+};
 
 export const AppProvider = ({ children }: TProps) => {
   const nativeLocale = i18nextFormat(useDefault(useLoad(getNativeLocale), 'de-CH'));
diff --git a/frontends/web/src/contexts/BackButtonContext.tsx b/frontends/web/src/contexts/BackButtonContext.tsx
index dd06bb4479..7c6d9897cb 100644
--- a/frontends/web/src/contexts/BackButtonContext.tsx
+++ b/frontends/web/src/contexts/BackButtonContext.tsx
@@ -23,7 +23,7 @@ export type THandler = () => boolean;
 type TProps = {
   pushHandler: (handler: THandler) => void;
   popHandler: (handler: THandler) => void;
-}
+};
 
 export const BackButtonContext = createContext<TProps>({
   pushHandler: () => {
@@ -38,7 +38,7 @@ export const BackButtonContext = createContext<TProps>({
 
 type TProviderProps = {
   children: ReactNode;
-}
+};
 
 export const BackButtonProvider = ({ children }: TProviderProps) => {
   const [handlers, setHandlers] = useState<THandler[]>([]);
diff --git a/frontends/web/src/contexts/DarkmodeContext.ts b/frontends/web/src/contexts/DarkmodeContext.ts
index 62b2fb951b..cd68274cb0 100644
--- a/frontends/web/src/contexts/DarkmodeContext.ts
+++ b/frontends/web/src/contexts/DarkmodeContext.ts
@@ -19,6 +19,6 @@ import { createContext } from 'react';
 type DarkModeContextProps = {
   isDarkMode: boolean;
   toggleDarkmode: (darkmode: boolean) => void;
-}
+};
 
 export const DarkModeContext = createContext<DarkModeContextProps>({} as DarkModeContextProps);
diff --git a/frontends/web/src/contexts/DarkmodeProvider.tsx b/frontends/web/src/contexts/DarkmodeProvider.tsx
index 1136108ef7..0984468bcf 100644
--- a/frontends/web/src/contexts/DarkmodeProvider.tsx
+++ b/frontends/web/src/contexts/DarkmodeProvider.tsx
@@ -23,7 +23,7 @@ import { DarkModeContext } from './DarkmodeContext';
 
 type TProps = {
   children: ReactNode;
-}
+};
 
 export const DarkModeProvider = ({ children }: TProps) => {
   const [isDarkMode, setIsDarkMode] = useState(false);
diff --git a/frontends/web/src/contexts/RatesContext.tsx b/frontends/web/src/contexts/RatesContext.tsx
index a7d2c67c1a..db3d1a398b 100644
--- a/frontends/web/src/contexts/RatesContext.tsx
+++ b/frontends/web/src/contexts/RatesContext.tsx
@@ -19,16 +19,16 @@ import { Fiat } from '@/api/account';
 import { BtcUnit } from '@/api/coins';
 
 type RatesContextProps = {
-    defaultCurrency: Fiat;
-    activeCurrencies: Fiat[];
-    btcUnit?: BtcUnit;
-    rotateDefaultCurrency: () => Promise<void>;
-    rotateBtcUnit: () => Promise<void>;
-    addToActiveCurrencies: (fiat: Fiat) => Promise<void>;
-    updateDefaultCurrency: (fiat: Fiat) => void;
-    updateRatesConfig: () => Promise<void>;
-    removeFromActiveCurrencies: (fiat: Fiat) => Promise<void>;
-}
+  defaultCurrency: Fiat;
+  activeCurrencies: Fiat[];
+  btcUnit?: BtcUnit;
+  rotateDefaultCurrency: () => Promise<void>;
+  rotateBtcUnit: () => Promise<void>;
+  addToActiveCurrencies: (fiat: Fiat) => Promise<void>;
+  updateDefaultCurrency: (fiat: Fiat) => void;
+  updateRatesConfig: () => Promise<void>;
+  removeFromActiveCurrencies: (fiat: Fiat) => Promise<void>;
+};
 
 const RatesContext = createContext<RatesContextProps>({} as RatesContextProps);
 
diff --git a/frontends/web/src/contexts/RatesProvider.tsx b/frontends/web/src/contexts/RatesProvider.tsx
index 8922b89883..a30b5de30d 100644
--- a/frontends/web/src/contexts/RatesProvider.tsx
+++ b/frontends/web/src/contexts/RatesProvider.tsx
@@ -23,8 +23,8 @@ import { reinitializeAccounts } from '@/api/backend';
 import { equal } from '@/utils/equal';
 
 type TProps = {
-    children: ReactNode;
-}
+  children: ReactNode;
+};
 
 export const RatesProvider = ({ children }: TProps) => {
   const [defaultCurrency, setDefaultCurrency] = useState<Fiat>('USD');
diff --git a/frontends/web/src/contexts/WCWeb3WalletContext.tsx b/frontends/web/src/contexts/WCWeb3WalletContext.tsx
index 02ea4c9797..e34bae62f7 100644
--- a/frontends/web/src/contexts/WCWeb3WalletContext.tsx
+++ b/frontends/web/src/contexts/WCWeb3WalletContext.tsx
@@ -18,12 +18,12 @@ import { IWalletKit } from '@reown/walletkit';
 import { createContext } from 'react';
 
 type Props = {
-    isWalletInitialized: boolean;
-    web3wallet?: IWalletKit;
-    pair: (params: {
-        uri: string;
-    }) => Promise<void>;
-    initializeWeb3Wallet: () => void;
-}
+  isWalletInitialized: boolean;
+  web3wallet?: IWalletKit;
+  pair: (params: {
+    uri: string;
+  }) => Promise<void>;
+  initializeWeb3Wallet: () => void;
+};
 
 export const WCWeb3WalletContext = createContext<Props>({} as Props);
diff --git a/frontends/web/src/contexts/WCWeb3WalletProvider.tsx b/frontends/web/src/contexts/WCWeb3WalletProvider.tsx
index d0953ef36f..c4b64672d5 100644
--- a/frontends/web/src/contexts/WCWeb3WalletProvider.tsx
+++ b/frontends/web/src/contexts/WCWeb3WalletProvider.tsx
@@ -24,7 +24,7 @@ import { getConfig, setConfig } from '@/utils/config';
 
 type TProps = {
   children: ReactNode;
-}
+};
 
 export const WCWeb3WalletProvider = ({ children }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/contexts/localization-context.ts b/frontends/web/src/contexts/localization-context.ts
index cea4ba8e38..bec9b006f7 100644
--- a/frontends/web/src/contexts/localization-context.ts
+++ b/frontends/web/src/contexts/localization-context.ts
@@ -1,9 +1,9 @@
 import { createContext } from 'react';
 
 type LocalizationContextProps = {
-    decimal: string;
-    group: string;
-}
+  decimal: string;
+  group: string;
+};
 
 
 export const LocalizationContext = createContext<LocalizationContextProps>({}as LocalizationContextProps);
diff --git a/frontends/web/src/contexts/localization-provider.tsx b/frontends/web/src/contexts/localization-provider.tsx
index 9a5ef0cc65..4d28e1332b 100644
--- a/frontends/web/src/contexts/localization-provider.tsx
+++ b/frontends/web/src/contexts/localization-provider.tsx
@@ -4,8 +4,8 @@ import { LocalizationContext } from './localization-context';
 import { AppContext } from './AppContext';
 
 type TProps = {
-    children: ReactNode;
-  }
+  children: ReactNode;
+};
 
 export const LocalizationProvider = ({ children }: TProps) => {
   const { nativeLocale } = useContext(AppContext);
diff --git a/frontends/web/src/decorators/translate.ts b/frontends/web/src/decorators/translate.ts
index bd109132ec..0e62a8feaa 100644
--- a/frontends/web/src/decorators/translate.ts
+++ b/frontends/web/src/decorators/translate.ts
@@ -1,4 +1,4 @@
 import { WithTranslation, withTranslation } from 'react-i18next';
 
 export const translate = withTranslation;
-export type TranslateProps = WithTranslation
+export type TranslateProps = WithTranslation;
diff --git a/frontends/web/src/globals.d.ts b/frontends/web/src/globals.d.ts
index c9f80c08c1..c30901add9 100644
--- a/frontends/web/src/globals.d.ts
+++ b/frontends/web/src/globals.d.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Shift Crypto AG
+ * Copyright 2022-2025 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-import { TPayload } from './utils/transport-common';
+import type { TPayload } from './utils/transport-common';
 
 export declare global {
-    interface Window {
-        qt?: { webChannelTransport: unknown; };
-        android?: {
-            call: (queryID: number, query: string) => void;
-        }
-        onMobileCallResponse?: (queryID: number, response: unknown) => void;
-        onMobilePushNotification?: (msg: TPayload) => void;
-        runningOnIOS?: boolean;
-        // Called by Android when the back button is pressed.
-        onBackButtonPressed?: () => boolean;
-        webkit?: {
-          messageHandlers: {
-            goCall: {
-              postMessage: (msg: { queryID: number; query: string; }) => void;
-            }
-            appReady: {
-              postMessage: (msg: any) => void;
-            }
-          }
-        }
-    }
+  interface Window {
+    qt?: { webChannelTransport: unknown };
+    android?: {
+      call: (queryID: number, query: string) => void;
+    };
+    onMobileCallResponse?: (queryID: number, response: unknown) => void;
+    onMobilePushNotification?: (msg: TPayload) => void;
+    runningOnIOS?: boolean;
+    // Called by Android when the back button is pressed.
+    onBackButtonPressed?: () => boolean;
+    webkit?: {
+      messageHandlers: {
+        goCall: {
+          postMessage: (msg: { queryID: number; query: string }) => void;
+        };
+        appReady: {
+          postMessage: (msg: any) => void;
+        };
+      };
+    };
+  }
 }
diff --git a/frontends/web/src/hooks/bitsurance.ts b/frontends/web/src/hooks/bitsurance.ts
index e6b9476264..02a0e9a691 100644
--- a/frontends/web/src/hooks/bitsurance.ts
+++ b/frontends/web/src/hooks/bitsurance.ts
@@ -56,7 +56,7 @@ import { getScriptName } from '@/routes/account/utils';
  */
 export const useBitsurance = (
   code: accountApi.AccountCode,
-  account?: accountApi.IAccount,
+  account?: accountApi.TAccount,
 ) => {
   const { t } = useTranslation();
 
diff --git a/frontends/web/src/hooks/keyboard.ts b/frontends/web/src/hooks/keyboard.ts
index 6fa388908c..da6c8d9336 100644
--- a/frontends/web/src/hooks/keyboard.ts
+++ b/frontends/web/src/hooks/keyboard.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
 /**
  * gets fired on each keydown and executes the provided callback.
@@ -71,59 +71,132 @@ export const useFocusTrap = (
   ref: React.RefObject<HTMLElement>,
   active: boolean,
 ) => {
+  const autofocusDelay = 50;
+
   const previouslyFocused = useRef<HTMLElement | null>(null);
+  const trapEnabled = useRef(false);
+  const autofocusTimer = useRef<number | null>(null);
+  const cancelledAutofocus = useRef(false);
 
-  // Focus trap handler
-  const handleKeyDown = (e: KeyboardEvent) => {
-    if (!active || !ref.current || e.key !== 'Tab') {
-      return;
-    }
-    const node = ref.current;
-    const focusables = node.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR);
-    if (!focusables.length) {
-      return;
-    }
+  const handleKeyDown = useCallback(
+    (e: KeyboardEvent) => {
+      if (!trapEnabled.current || !ref.current || e.key !== 'Tab') {
+        return;
+      }
 
-    const first = focusables[0];
-    const last = focusables[focusables.length - 1];
+      const focusables = Array.from(
+        ref.current.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR)
+      ).filter((el) => el.offsetParent !== null); // skip hidden
 
-    if (e.shiftKey && document.activeElement === first) {
-      e.preventDefault();
-      last?.focus();
-    } else if (!e.shiftKey && document.activeElement === last) {
-      e.preventDefault();
-      first?.focus();
-    }
-  };
+      if (focusables.length === 0) {
+        return;
+      }
 
-  useKeydown(handleKeyDown);
+      const first = focusables[0];
+      const last = focusables[focusables.length - 1];
+      const current = document.activeElement as HTMLElement;
+
+      if (e.shiftKey && current && current === first) {
+        e.preventDefault();
+        last?.focus();
+      } else if (!e.shiftKey && current && current === last) {
+        e.preventDefault();
+        first?.focus();
+      }
+    },
+    [ref]
+  );
 
-  // Manage mount/unmount lifecycle
   useEffect(() => {
+    // cleanup from previous runs
+    if (autofocusTimer.current) {
+      window.clearTimeout(autofocusTimer.current);
+      autofocusTimer.current = null;
+    }
+    cancelledAutofocus.current = false;
+
     if (!active || !ref.current) {
+      trapEnabled.current = false;
       return;
     }
 
-    // Save previously focused element
+    const node = ref.current;
+    trapEnabled.current = true;
     previouslyFocused.current = document.activeElement as HTMLElement;
 
-    // Autofocus first element, but only if nothing inside already has focus
-    if (!ref.current.contains(document.activeElement)) {
-      const firstFocusable = (
-        ref.current.querySelector<HTMLElement>('[autofocus]:not(:disabled)')
-        ?? ref.current.querySelector<HTMLElement>(FOCUSABLE_SELECTOR)
-      );
-      firstFocusable?.focus({ preventScroll: true });
+    // If focus is already inside, don't schedule autofocus.
+    if (node.contains(document.activeElement)) {
+      // no autofocus needed
+    } else {
+      // If any focus enters the dialog while we're waiting, cancel the autofocus.
+      const onFocusIn = (e: FocusEvent) => {
+        if (node.contains(e.target as Node)) {
+          cancelledAutofocus.current = true;
+          if (autofocusTimer.current) {
+            window.clearTimeout(autofocusTimer.current);
+            autofocusTimer.current = null;
+          }
+        }
+      };
+
+      document.addEventListener('focusin', onFocusIn, true);
+
+      // Delay longer than the 20ms your Dialog uses, default 50ms.
+      autofocusTimer.current = window.setTimeout(() => {
+        autofocusTimer.current = null;
+        if (cancelledAutofocus.current) {
+          return;
+        }
+
+        // final guard: if still nothing inside has focus, focus first focusable
+        if (!node.contains(document.activeElement)) {
+          const firstFocusable =
+            node.querySelector<HTMLElement>('[autofocus]:not(:disabled)') ??
+            node.querySelector<HTMLElement>(FOCUSABLE_SELECTOR);
+          firstFocusable?.focus({ preventScroll: true });
+        }
+      }, autofocusDelay);
+
+      // remove focusin listener when effect cleanup runs
+      // (we'll remove it in the effect return)
+      return () => {
+        document.removeEventListener('focusin', onFocusIn, true);
+      };
     }
 
+    // If we didn't return above (i.e. no focusin listener set), continue to set up keydown below.
+    // Set up keydown listener on document
+    const onKeyDown = (e: KeyboardEvent) => handleKeyDown(e);
+    document.addEventListener('keydown', onKeyDown);
+
+    return () => {
+      // cleanup in-case we returned earlier (also safe)
+      document.removeEventListener('keydown', onKeyDown);
+    };
+  }, [active, ref, autofocusDelay, handleKeyDown]);
+
+  // global keydown listener must be attached separately too so it's always active while trapEnabled
+  useEffect(() => {
+    const onKeyDown = (e: KeyboardEvent) => handleKeyDown(e);
+    document.addEventListener('keydown', onKeyDown);
+    return () => document.removeEventListener('keydown', onKeyDown);
+  }, [handleKeyDown]);
+
+  // cleanup on deactivate: restore previous focus, clear timers/listeners
+  useEffect(() => {
     return () => {
-      // Restore focus if element is still in DOM
-      if (
-        previouslyFocused.current &&
-        document.body.contains(previouslyFocused.current)
-      ) {
-        previouslyFocused.current.focus();
+      trapEnabled.current = false;
+
+      if (autofocusTimer.current) {
+        window.clearTimeout(autofocusTimer.current);
+        autofocusTimer.current = null;
+      }
+
+      const prev = previouslyFocused.current;
+      if (prev && document.body.contains(prev)) {
+        // restore focus
+        prev.focus();
       }
     };
-  }, [ref, active]);
+  }, []);
 };
diff --git a/frontends/web/src/hooks/qrcodescanner.ts b/frontends/web/src/hooks/qrcodescanner.ts
index 5fb6a65a47..8aad37bd0a 100644
--- a/frontends/web/src/hooks/qrcodescanner.ts
+++ b/frontends/web/src/hooks/qrcodescanner.ts
@@ -22,7 +22,7 @@ type TUseQRScannerOptions = {
   onStart?: () => void;
   onResult: (result: QrScanner.ScanResult) => void;
   onError: (error: any) => void;
-}
+};
 
 export const useQRScanner = (
   videoRef: RefObject<HTMLVideoElement>, {
diff --git a/frontends/web/src/locales/ar/app.json b/frontends/web/src/locales/ar/app.json
index c3a9de43d7..9f61dab657 100644
--- a/frontends/web/src/locales/ar/app.json
+++ b/frontends/web/src/locales/ar/app.json
@@ -262,8 +262,8 @@
   "bootloader": {
     "button": "قم بتحديث البرنامج الثابت الآن",
     "button_install": "قم بتثبيت البرنامج الثابت الآن",
-    "progress": "التحديث: {{progress}}٪",
-    "progress_install": "التثبيت: {{progress}}٪",
+    "progress": "التحديث",
+    "progress_install": "التثبيت",
     "success": "تم التحديث بنجاح! يرجى إعادة توصيل الجهاز. و هذه المرة، لا تلمس الزر"
   },
   "button": {
@@ -884,10 +884,6 @@
       "paste": "للصق النص، قم بتمكين \"إظهار {{label}}\""
     }
   },
-  "random": {
-    "button": "صناعة رقم عشوائي",
-    "description": "أنشأ BitBox الخاص بك الرقم العشوائي {{bits}}-بت التالي:"
-  },
   "receive": {
     "changeScriptType": "تغيير نوع العنوان",
     "label": "عنوانك",
@@ -1184,4 +1180,4 @@
     "getStarted": "لنبدأ بتثبيت نظام تشغيل جهاز محفظة BitBox02",
     "title": "مرحباً"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/bg/app.json b/frontends/web/src/locales/bg/app.json
index ff70e40524..edd797265e 100644
--- a/frontends/web/src/locales/bg/app.json
+++ b/frontends/web/src/locales/bg/app.json
@@ -187,7 +187,7 @@
   },
   "bootloader": {
     "button": "Актуализиране на firmware",
-    "progress": "Актуализиране: {{progress}}%",
+    "progress": "Актуализиране",
     "success": "Актуализацията е успешна! Моля извадете устройството и го свържете отново, без да докосвате бутона."
   },
   "button": {
@@ -527,10 +527,6 @@
       "paste": "за да копирате текста, активирайте \"ПОКАЗВАНЕ НА {{label}}\""
     }
   },
-  "random": {
-    "button": "Генериране на случайно число",
-    "description": "Вашият BitBox генерира следното {{bits}}-битово случайно число:"
-  },
   "receive": {
     "label": "Вашият адрес",
     "onlyThisCoin": {
@@ -769,4 +765,4 @@
   "welcome": {
     "title": "Добре дошли!"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/cs/app.json b/frontends/web/src/locales/cs/app.json
index e500e9e14b..06d2d50fd0 100644
--- a/frontends/web/src/locales/cs/app.json
+++ b/frontends/web/src/locales/cs/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "Účet",
+    "accounts": "Účty",
+    "backupReminder": "Tvoje peněženka <strong>{{name}}</strong> překročila {{fiat}} {{threshold}}!\n\nDoporučujeme vytvořit papírovou zálohu pro větší ochranu. Je to rychlé a jednoduché.",
+    "backupReminderLink": "Vytvořit papírovou zálohu",
     "disconnect": "Ztráta spojení. Pokus o opětovné připojení...",
-    "export": "Export",
+    "export": "Export transakcí",
     "exportTransactions": "Export transakcí do složky ke stažení jako soubor CSV",
     "fatalError": "Došlo k neočekávané chybě.",
     "incoming": "Přicházející",
@@ -95,6 +99,8 @@
   },
   "auth": {
     "authButton": "Ověřit",
+    "dismissButton": "Zrušit",
+    "missing": "Nastavte prosím zámek obrazovky v nastavení svého zařízení",
     "title": "Chcete-li pokračovat, proveďte ověření"
   },
   "backup": {
@@ -129,6 +135,7 @@
     "description": "Vyberte <strong>soubor zálohy peněženky</strong>",
     "insert": "Pro správu záloh prosím vložte microSD kartu.",
     "insertButton": "Vložil jsem microSD kartu.",
+    "link": "Přejít na správu záloh",
     "list": "Vaše zálohy na microSD kartě",
     "noBackups": "Na této microSD kartě nejsou žádné zálohy.",
     "restore": {
@@ -191,6 +198,13 @@
     "followInstructionsMnemonicTitle": "Obnovit ze slov pro obnovení"
   },
   "bitbox02Settings": {
+    "bluetoothToggleEnabled": {
+      "alertDisabled": "Bluetooth je nyní na tvém BitBoxu vypnutý. Pokud se v budoucnu budeš chtít připojit k iPhonu, budeš jej muset znovu zapnout.",
+      "alertEnabled": "Bluetooth je nyní zapnutý.",
+      "description": "Bluetooth se používá pro připojení k iPhonu.",
+      "titleDisabled": "Povolit Bluetooth",
+      "titleEnabled": "Vypnout Bluetooth"
+    },
     "deviceName": {
       "current": "Aktuální název zařízení",
       "error": "Název zařízení se nepodařilo nastavit",
@@ -265,7 +279,7 @@
       "title": "Záloha obnovena!"
     },
     "stepConnected": {
-      "unlock": "Pro odemknutí zadejte heslo."
+      "unlock": "Pro odemknutí BitBoxu zadejte heslo."
     },
     "stepCreate": {
       "description": "Tento název se používá jako název zařízení a pro zálohu.",
@@ -370,8 +384,8 @@
   "bootloader": {
     "button": "Nyní aktualizujte firmware",
     "button_install": "Nyní nainstalujte firmware",
-    "progress": "Aktualizace: {{progress}}%",
-    "progress_install": "Instalace: {{progress}}%",
+    "progress": "Aktualizace",
+    "progress_install": "Instalace",
     "success": "Aktualizace proběhla úspěšně! Zařízení znovu zapojte. Tentokrát se tlačítka nedotýkejte."
   },
   "button": {
@@ -398,14 +412,57 @@
     "upgrade": "Aktualizovat"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "Nedostatek prostředků pro nákup dárkové karty."
+      },
+      "transactionNote": "Odesláno do Bitrefillu"
+    },
     "exchange": {
       "bankTransfer": "Bankovní převod",
       "bestDeal": "Nejvýhodnější nabídka",
       "buy": "Koupit",
       "creditCard": "Kreditní karta",
+      "description_bitrefill": "Nakupujte dárkové karty, dobíjení telefonů a další",
       "fast": "Rychle",
       "fee": "poplatek",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Limity pro nákupy přes Bitrefill",
+              "text": "Bitrefill můžete používat bez vytvoření účtu, avšak s určitými limity. Chcete-li zvýšit své výdajové limity, můžete si vytvořit základní účet nebo se stát ověřeným zákazníkem. Podrobné informace najdete v části Limity pro nákupy přes Bitrefill.",
+              "title": "Účet a limity"
+            },
+            "claims": {
+              "link": "Podpora Bitrefill",
+              "text": "Pokud máte nějaké problémy s nákupem, kontaktujte prosím přímo společnost Bitrefill do 30 dnů od objednávky.",
+              "title": "Reklamace"
+            },
+            "dataProtection": {
+              "link": "Zásady ochrany osobních údajů Bitrefill",
+              "text": "BitBoxApp neshromažďuje osobní údaje. Bitrefill shromažďuje informace v souladu se svými zásadami ochrany osobních údajů.",
+              "title": "Ochrana osobních údajů"
+            },
+            "fees": {
+              "text": "Bitrefill neúčtuje žádné explicitní poplatky, ale ceny produktů mohou zahrnovat přirážku, která se může lišit v závislosti na prodejci, regionu a směnném kurzu, který Bitrefill používá.",
+              "title": "Poplatky"
+            },
+            "intro": {
+              "text": "Bitrefill je online platforma, která vám umožňuje nakupovat dárkové karty, dobíjet mobilní telefony a platit účty pomocí bitcoinu nebo jiných kryptoměn. Je to snadný způsob, jak utratit kryptoměny za každodenní zboží a služby, aniž byste ji museli převádět na tradiční peníze. Bitrefill nabízí širokou škálu produktů od globálních značek a je oblíbený mezi lidmi, kteří chtějí žít z kryptoměn nebo nakupovat soukromě.",
+              "title_bitcoin": "Utrácejte bitcoin přes Bitrefill",
+              "title_crypto": "Utrácejte kryptoměny přes Bitrefill"
+            },
+            "security": {
+              "link": "Model bezpečnostních hrozeb BitBoxu",
+              "text": "Bitrefill je externí služba, na kterou se nevztahuje model bezpečnostních hrozeb BitBoxu. Když provedete nákup, vaše platba je odeslána na adresu Bitrefill. BitBox nemůže ověřit, zda je tato adresa správná.",
+              "title": "Bezpečnostní upozornění"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefill je online platforma, kde můžete utrácet bitcoiny a jiné kryptoměny za každodenní potřeby nákupem dárkových karet, dobíjení mobilních telefonů a různých služeb. Integrace s BitBoxApp vám umožňuje utrácet vaše coiny přímo z BitBoxu, aniž byste je museli přesouvat na burzu nebo do jiné peněženky."
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -434,8 +491,8 @@
               "title": "Osobní služby s pevnou cenou"
             },
             "security": {
-              "link": "Model bezpečnostních hrozeb BitBox02",
-              "text": "Private Trading Desk BTC Direct je externí služba, na kterou se nevztahuje model bezpečnostních hrozeb BitBoxu. Společnost BTC Direct je však dobře obeznámena s produkty BitBox a nabízí bezpečné a kvalifikované poradenství. BitBox ověřuje adresy během transakcí, aby bylo zajištěno bezpečné doručení.",
+              "link": "Model bezpečnostních hrozeb BitBoxu",
+              "text": "Private Trading Desk BTC Direct je externí služba, na kterou se nevztahuje model bezpečnostních hrozeb BitBoxu. Společnost BTC Direct je však dobře obeznámena s BitBox produkty a nabízí bezpečné a kvalifikované poradenství. BitBox ověřuje adresy během transakcí, aby bylo zajištěno bezpečné doručení.",
               "title": "Zabezpečení"
             },
             "title": "Prohlášení o vyloučení odpovědnosti"
@@ -457,7 +514,7 @@
         },
         "btcdirectWidget": {
           "disclaimer": {
-            "description": "Spolupracujeme s BTC Direct, důvěryhodným evropským brokerem, abychom vám usnadnili nákup kryptoměn v BitBoxApp. Tato služba je dostupná v celé Evropě a je možné ji využívat pomocí bankovních převodů, kreditních karet a mnoha místních platebních metod.",
+            "description": "Spolupracujeme s BTC Direct, důvěryhodným evropským brokerem, abychom vám usnadnili nákup a prodej kryptoměn v BitBoxApp. Tato služba je dostupná v celé Evropě a je možné ji využívat pomocí bankovních převodů, kreditních karet a mnoha místních platebních metod.",
             "kyc": {
               "description": "U všech obchodů je vyžadováno ověření totožnosti zákazníka. Budete si muset vyfotit selfie a pořídit snímek oficiálního dokladu.",
               "title": "Ověření totožnosti"
@@ -465,15 +522,16 @@
             "paymentMethods": {
               "buy": "Nákup: Zaplaťte v eurech a mince vám budou doručeny přímo do vašeho BitBoxu. Můžete si vybrat mezi jednorázovým nebo opakovaným nákupem. U bankovních převodů je směnný kurz pevně stanoven v okamžiku přijetí peněz společností BTC Direct. Okamžité metody používají pevný směnný kurz po omezenou dobu.",
               "note": "Poznámka: Směnné kurzy BTC Direct se mohou mírně lišit od kurzů v BitBoxApp.",
+              "sell": "Prodej: Pošlete svou kryptoměnu do BTC Direct a obdržíte EUR na svůj bankovní účet. Směnný kurz je stanoven okamžitě po obdržení vašich mincí společností BTC Direct.",
               "title": "Platební metody a poplatky"
             },
             "security": {
               "description": "BTC Direct je externí služba, na kterou se nevztahuje model bezpečnostních hrozeb BitBox. S BTC Direct úzce spolupracujeme na zvýšení celkové bezpečnosti.",
-              "link": "Model bezpečnostních hrozeb BitBox02",
+              "link": "Model bezpečnostních hrozeb BitBoxu",
               "title": "Zabezpečení"
             },
-            "title_bitcoin": "Koupit Bitcoin s BTC Direct",
-            "title_crypto": "Koupit krypto s BTC Direct"
+            "title_bitcoin": "Nákup a prodej bitcoinů s BTC Direct",
+            "title_crypto": "Nákup a prodej kryptoměn s BTC Direct"
           },
           "infobox": {
             "feesBuying": {
@@ -483,7 +541,11 @@
               "sofort": "Sofort: {{fee}}%",
               "title": "Poplatky za nákup"
             },
-            "intro": "Evropský nákup kryptoměn za EUR.",
+            "feesSelling": {
+              "bankTransfer": "Bankovní převod: {{fee}} %",
+              "title": "Poplatky za prodej"
+            },
+            "intro": "Evropský nákup a prodej kryptoměn za EUR.",
             "payment": {
               "bancontact": "Bancontact",
               "bankTransfer": "Bankovní převod, SEPA Instant, iDEAL",
@@ -552,7 +614,8 @@
       "noExchanges": "Je nám líto, ale v této oblasti nejsou k dispozici žádné burzy.",
       "region": "Oblast",
       "selectRegion": "Není uvedeno",
-      "sell": "Prodat"
+      "sell": "Prodat",
+      "spend": "Utratit"
     },
     "info": {
       "continue": "Souhlasím, pokračovat",
@@ -583,8 +646,8 @@
           "title": "Ochrana dat"
         },
         "security": {
-          "descriptionGeneric_bitcoin": "Při nákupu bitcoinů prostřednictvím partnerské burzy využíváte externí službu. Tato služba je mimo oblast působnosti modelu bezpečnostních hrozeb BitBox02 a spoléhá se na bezpečnost a zabezpečení prostředí, ve kterém je spuštěn software BitBoxApp.",
-          "descriptionGeneric_crypto": "Při nákupu kryptoměn prostřednictvím partnerské burzy využíváte externí službu. Tato služba je mimo oblast působnosti modelu bezpečnostních hrozeb BitBox02 a spoléhá se na bezpečnost a zabezpečení prostředí, ve kterém je spuštěn software BitBoxApp.",
+          "descriptionGeneric_bitcoin": "Při nákupu bitcoinů prostřednictvím partnerské burzy využíváte externí službu. Tato služba je mimo oblast působnosti modelu bezpečnostních hrozeb BitBoxu a spoléhá se na bezpečnost a zabezpečení prostředí, ve kterém běží software BitBoxApp.",
+          "descriptionGeneric_crypto": "Při nákupu kryptoměn prostřednictvím partnerské burzy využíváte externí službu. Tato služba je mimo oblast působnosti modelu bezpečnostních hrozeb BitBoxu a spoléhá se na bezpečnost a zabezpečení prostředí, ve kterém běží software BitBoxApp.",
           "link": "Model bezpečnostních hrozeb",
           "title": "Bezpečnostní model"
         },
@@ -646,7 +709,7 @@
         "description": "Vytvořte nebo ověřte zálohu na microSD kartě."
       },
       "showRecoveryWords": {
-        "description": "Zobrazit a ověřit slova pro obnovení."
+        "description": "Zobrazit a ověřit slova pro obnovení na displeji BitBoxu."
       },
       "title": "Zálohy"
     },
@@ -756,10 +819,13 @@
     "wrongKeystore2": " Pokud používáte přístupovou frázi, zkontrolujte, zda jste zadali správnou přístupovou frázi pro tento účet."
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "Neočekávaná měna v žádosti o platbu",
+      "insufficientFunds": "Nedostatek prostředků na vybraném účtu."
+    },
     "buySell": {
       "coinNotSupported": "Pro tento typ mince nejsou k dispozici žádné možnosti.",
-      "regionNotSupported": "Pro tento region nejsou k dispozici žádné možnosti.",
-      "updateNow": "Aktualizujte nyní"
+      "regionNotSupported": "Pro tento region nejsou k dispozici žádné možnosti."
     },
     "pocket": {
       "terms": {
@@ -782,8 +848,8 @@
           "title": "KYC/AML (Know your customer / Anit-Money Laundering)"
         },
         "security": {
-          "link": "Model bezpečnostních hrozeb BitBox02",
-          "p1": "Pocket je externí služba a nevztahuje se na ni model bezpečnostních hrozeb BitBox02. S Pocket však úzce spolupracujeme na zvýšení celkové bezpečnosti.",
+          "link": "Model bezpečnostních hrozeb BitBoxu",
+          "p1": "Pocket je externí služba a nevztahuje se na ni model bezpečnostních hrozeb BitBoxu. S Pocket však úzce spolupracujeme na zvýšení celkové bezpečnosti.",
           "p2": "<strong>Nakupování bitcoinů:</strong> Prostřednictvím druhého komunikačního kanálu vám přijde e-mail s potvrzením adresy pro příjem bitcoinů.",
           "p3": "<strong>Prodej bitcoinů:</strong> BitBox kryptograficky ověří adresu pro vklad bitcoinů a na hardwarové peněžence zobrazí „Pocket“.",
           "title": "Zabezpečení"
@@ -803,18 +869,36 @@
   "footer": {
     "appVersion": "Verze aplikace:"
   },
+  "gapLimit": {
+    "change": "Gap limit pro change adresy",
+    "description": "Nakonfigurujte vlastní gap llimit pro  bitcoin adresy a change adresy.",
+    "maxValue": "Gap limit nesmí překročit {{max}}.",
+    "minValue": "Gap limit musí být alespoň {{min}}.",
+    "receive": "Gap limit pro přijímací adresy",
+    "title": "Vlastní nastavení gap limit"
+  },
   "generic": {
     "buy": "Koupit {{coinCode}}",
-    "buySell": "Nákup a prodej",
+    "buySell": "Tržiště",
     "buy_bitcoin": "Koupit Bitcoin",
     "buy_crypto": "Koupit krypto",
+    "close": "Zavřít",
     "enabled_false": "Vypnuto",
     "enabled_true": "Zapnuto",
+    "noOptionOnIos": "Není k dispozici pro iOS",
     "noOptions": "Nenalezeny žádné možnosti",
+    "paymentRequestNote": "{{name}} platba {{orderId}}",
     "receive": "Přijmout {{coinCode}}",
     "receive_bitcoin": "Přijmout Bitcoin",
     "receive_crypto": "Přijmout crypto",
-    "search": "Vyhledávání…"
+    "resetToDefault": "Obnovit výchozí nastavení",
+    "search": "Vyhledávání…",
+    "searchButton": "Hledat",
+    "sell": "Prodat {{coinCode}}",
+    "sell_bitcoin": "Prodat bitcoiny",
+    "sell_crypto": "Prodat kryptoměny",
+    "spend_bitcoin": "Utratit bitcoiny",
+    "spend_crypto": "Utratit kryptoměny"
   },
   "genericError": "Došlo k chybě. Pokud zaznamenáte nějaké problémy, restartujte prosím aplikaci.",
   "goal": {
@@ -1069,7 +1153,7 @@
       "accountSummary": "Průvodce přehledem účtu",
       "advancedSettings": "Průvodce pokročilým nastavením",
       "appearance": "Průvodce vzhledu",
-      "buySell": "Průvodce nákupem a prodejem",
+      "buySell": "Průvodce tržištěm",
       "insurance": "Průvodce pojištěním",
       "manageAccount": "Průvodce správou účtů",
       "manageDevice": "Průvodce pro správu zařízení",
@@ -1091,7 +1175,7 @@
         "title": "Kdy mám použít \"Změnit typ adresy\"?"
       },
       "howVerify": {
-        "text": "V případě BitBox01 klikněte na ikonu BitBox v postranním panelu vlevo a podívejte se do části Párování. Průvodce se aktualizuje a vy můžete pokračovat podle pokynů odtud.\nU BitBox02 můžete adresy ověřit přímo v zařízení během procesu odesílání/přijímání.",
+        "text": "Adresy můžete ověřit přímo na BitBoxu během procesu odesílání/ přijímání.",
         "title": "Jak mohu bezpečně ověřit adresu?"
       },
       "plugout": {
@@ -1107,7 +1191,7 @@
         "title": "Proč tolik adres?"
       },
       "whyVerify": {
-        "text": "Neměli byste věřit, že váš počítač generuje a zobrazuje autentické adresy. Jeho útočná plocha (attack surface) jej činí podstatně zranitelnějším než hardwarovou peněženku. U BitBox01 Tlačítko pro ověření adresy bezpečně odešle adresu do spárovaného mobilního telefonu, ze kterého můžete také naskenovat a ověřit kód QR. U BitBox02 lze adresu ověřit přímo na displeji BitBoxu.",
+        "text": "Neměli byste se spoléhat na to, že váš počítač vygeneruje a zobrazí autentické adresy. Jeho velký povrch útoku ho činí výrazně zranitelnějším než hardwarovou peněženku. Adresu lze ověřit přímo na displeji BitBoxu.",
         "title": "Proč bych měl adresu bezpečně ověřit?"
       }
     },
@@ -1215,7 +1299,7 @@
         "title": "Ztratil jsem zařízení. Co teď?"
       },
       "useWithoutDevice": {
-        "text": "V současné době to bohužel není možné.",
+        "text": "Ano, peněženky si můžete zapamatovat v nastavení účtu. Tímto způsobem můžete vidět své portfolio bez použití BitBoxu.",
         "title": "Mohu aplikaci používat i bez zařízení?"
       },
       "welcome": {
@@ -1454,10 +1538,6 @@
       "paste": "pro vložení textu povolte \"ZOBRAZIT {{label}}\""
     }
   },
-  "random": {
-    "button": "Vygenerujovat náhodné číslo",
-    "description": "Váš BitBox vygeneroval následující {{bits}}-bit náhodné číslo:"
-  },
   "receive": {
     "bitsuranceWarning": "Toto je pojištěný účet, což znamená, že může přijímat pouze na Native Segwit. Je to proto, abyste náhodou neobdrželi Wrapped Segwit nebo Taproot, které nejsou pojištěny.",
     "changeScriptType": "Změňit typ adresy",
@@ -1572,7 +1652,7 @@
     },
     "edit": "Upravit transakci",
     "error": {
-      "erc20InsufficientGasFunds": "Zdá se, že nemáte dostatek etherů na zaplacení této ERC20 transakce. Ujistěte se prosím, že máte v peněžence dostatek etherů.",
+      "erc20InsufficientGasFunds": "Zdá se, že nemáte dostatek etherů na zaplacení této ERC20 transakce. Přidejte prosím ether do své peněženky a zkuste to znovu.",
       "feeTooLow": "poplatek příliš nízký",
       "feesNotAvailable": "Nelze odhadnout poplatky",
       "insufficientFunds": "nedostatek finančních prostředků",
@@ -1629,7 +1709,7 @@
     "scanQRNoCameraMessage": "Kamera nenalezena. Ujistěte se, že vaše zařízení podporuje kameru a že jsou správně nastavena oprávnění.",
     "success": "Transakce byla podepsána a odeslána.",
     "title": "Poslat {{accountName}}",
-    "toggleCoinControl": "Přepnout na coin control",
+    "toggleCoinControl": "Coin control",
     "transactionDetails": "Detaily transakce"
   },
   "settings": {
@@ -1784,6 +1864,7 @@
     "fee": "Poplatek",
     "fiatHistorical": "Historický",
     "gas": "Gas",
+    "no-results": "Nebyly nalezeny žádné transakce odpovídající výrazu „{{searchTerm}}“",
     "note": {
       "edit": "Upravit poznámku",
       "save": "Uložit poznámku"
@@ -1887,8 +1968,9 @@
   },
   "warning": {
     "coincontrol": "Jedno nebo více UTXO má opakovaně použitou adresu. Mějte na paměti, že příjemce uvidí všechny UTXO spojené s těmito adresami.",
+    "offline": "V této chvíli nejste připojeni k internetu. Nebudete moci odesílat transakce ani zobrazit aktuální směnné kurzy.",
     "sdcard": "MicroSD kartu mějte uloženou odděleně od BitBoxu, pokud ovšem nechcete spravovat zálohy.",
-    "testnet": "Varování: V této chvíli používáte peněženku v režimu Testnet. Transakce a zůstatky zde nejsou skutečné a nezobrazí se v mainnetu. Testnet je určen pouze pro testovací a vývojové účely."
+    "testnet": "Používáte režim Testnet. Transakce a prostředky zde nejsou skutečné a nemají žádnou hodnotu. Používejte pouze pro testovací účely."
   },
   "welcome": {
     "connect": "Připojte BitBox",
@@ -1897,4 +1979,4 @@
     "message": "Připojte svůj BitBox a pokračujte poklepáním na stranu.",
     "title": "Vítejte"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/de/app.json b/frontends/web/src/locales/de/app.json
index 55da86fef4..c7338801dd 100644
--- a/frontends/web/src/locales/de/app.json
+++ b/frontends/web/src/locales/de/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "Konto",
+    "accounts": "Konten",
+    "backupReminder": "Deine Wallet <strong>{{name}}</strong> hat {{threshold}} {{fiat}} überschritten!\n\nWir empfehlen ein Backup auf Papier zu erstellen, für zusätzlichen Schutz. Es ist einfach und geht schnell.",
+    "backupReminderLink": "Backup erstellen",
     "disconnect": "Verbindung unterbrochen. Erneut verbinden... ",
-    "export": "Export",
+    "export": "Exportieren",
     "exportTransactions": "Exportiere Transaktionen im Download Ordner als CSV Datei",
     "fatalError": "Ein unerwarteter Fehler ist aufgetreten.",
     "incoming": "Eingehend",
@@ -95,6 +99,8 @@
   },
   "auth": {
     "authButton": "Authentifizieren",
+    "dismissButton": "Abbrechen",
+    "missing": "Bitte konfiguriere eine Displaysperre in den Systemeinstellungen deines Geräts.",
     "title": "Bitte authentifiziere dich, um fortzufahren"
   },
   "backup": {
@@ -129,6 +135,7 @@
     "description": "Wähle eine  <strong>Wallet Backup</strong> Datei aus.",
     "insert": "Bitte stecke die Micro-SD-Karte ein um deine Backups zu verwalten.",
     "insertButton": "Ich habe die Mikro-SD-Karte eingesteckt.",
+    "link": "Gehe zu Backups verwalten",
     "list": "Deine Backups auf der microSD Karte",
     "noBackups": "Es befinden sich keine Backups auf der microSD Karte.",
     "restore": {
@@ -151,9 +158,9 @@
     },
     "showMnemonic": {
       "checkboxLabel": "Ich habe die Informationen oben gelesen",
-      "description": "Dir werden Recovery-Words angezeigt, die ein Backup deiner Wallet sind. Schreibe diese auf ein Stück Papier. \n\n<strong>Bewahre diese Wörter nicht digital auf und mache kein Foto von ihnen.</strong>\n\n<strong>Sprich die Wörter nicht laut aus.</strong>\n\n<strong>Dieses Backup ist nicht Passwort geschützt.</strong>\n\nNachdem du die Wörter aufgeschrieben hast wirst du gefragt werden sie nochmals zu bestätigen.\n",
-      "title": "Recovery-Wörter anzeigen",
-      "warning": "<strong>Teile deine Wiederherstellungswörter niemals mit irgendjemandem.</strong> Deine Wiederherstellungswörter ermöglichen vollen Zugriff zu deinem Wallet . Wenn dich jemand nach deinen Wiederherstellungswörtern fragt, handelt es sich um einen Betrüger. Gebe diese nicht weiter!"
+      "description": "Die BitBox wird Wiederherstellungswörter (\"recovery words\") anzeigen, die ein Backup deiner Wallet darstellen. Schreibe diese auf ein Stück Papier. \n\n<strong>Bewahre die Wörter nicht digital auf und mache kein Foto von ihnen.</strong>\n\n<strong>Sprich die Wörter nicht laut aus.</strong>\n\n<strong>Dieses Backup ist nicht passwortgeschützt.</strong>\n\nNachdem du die Wörter aufgeschrieben hast, wirst du aufgefordert, sie nochmals zu bestätigen.\n",
+      "title": "Wiederherstellungswörter anzeigen",
+      "warning": "<strong>Teile deine Wiederherstellungswörter niemals mit irgendjemandem.</strong> Die Wiederherstellungswörter ermöglichen vollen Zugriff zu deiner Wallet. Wenn dich jemand nach deinen Wiederherstellungswörtern fragt, handelt es sich um einen Betrüger. Gib die Wörter nicht weiter!"
     },
     "title": "Backups verwalten"
   },
@@ -188,7 +195,7 @@
     "confirmWordsText": "Anschließend bestätigst du jedes Wort auf deiner BitBox, um das Backup zu prüfen.",
     "followInstructions": "Befolge die Anweisungen auf deiner BitBox.",
     "followInstructionsMnemonic": "Folge den Anweisungen auf deiner BitBox, gib deine Wiederherstellungswörter ein und stelle dein Wallet wieder her.",
-    "followInstructionsMnemonicTitle": "Mit Wiederherstellungs-Wörtern wiederherstellen"
+    "followInstructionsMnemonicTitle": "Von Wiederherstellungswörtern wiederherstellen"
   },
   "bitbox02Settings": {
     "bluetoothToggleEnabled": {
@@ -288,7 +295,7 @@
     },
     "stepCreateSuccess": {
       "removeMicroSD": "Entferne die microSD-Karte aus deiner BitBox und bewahre sie sicher auf.",
-      "storeMnemonic": "Bitte bewahre deine Wiederherstellungs-Wörter an einem sicheren Ort auf.",
+      "storeMnemonic": "Bitte bewahre deine Wiederherstellungswörter an einem sicheren Ort auf.",
       "success": "Dein Backup wurde erfolgreich erstellt."
     },
     "stepInsertSD": {
@@ -377,8 +384,8 @@
   "bootloader": {
     "button": "Firmware jetzt aktualisieren",
     "button_install": "Firmware jetzt installieren",
-    "progress": "Aktualisiere: {{progress}}%",
-    "progress_install": "Installation: {{progress}}%",
+    "progress": "Aktualisiere",
+    "progress_install": "Installation",
     "success": "Aktualisierung erfolgreich! Bitte ziehe das Gerät ab und stecke es dann wieder ein. Dieses mal brauchst du den Knopf nicht zu berühren. "
   },
   "button": {
@@ -405,14 +412,57 @@
     "upgrade": "Aktualisieren"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "Unzureichendes Guthaben um Gutschein zu kaufen."
+      },
+      "transactionNote": "Gesendet an Bitrefill"
+    },
     "exchange": {
       "bankTransfer": "Überweisung",
       "bestDeal": "Bestes Angebot",
       "buy": "Kaufen",
       "creditCard": "Kreditkarte",
+      "description_bitrefill": "Gutscheine, Prepaid-Karten & mehr kaufen",
       "fast": "Schnell",
       "fee": "Gebühr",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Bitrefill Kauflimits",
+              "text": "Du kannst Bitrefill in einem beschränkten Rahmen verwenden, ohne ein Konto zu erstellen. Um deine Ausgabelimits zu erhöhen, kannst du ein einfaches Konto erstellen oder ein verifizierter Kunde werden. Für weitere Details, siehe die Kauflimits von Bitrefill.",
+              "title": "Konto und Limits"
+            },
+            "claims": {
+              "link": "Bitrefill Support",
+              "text": "Solltest du Probleme mit einem Kauf haben, kontaktiere bitte Bitrefill innerhalb von 30 Tagen nach deiner Bestellung.",
+              "title": "Reklamationen"
+            },
+            "dataProtection": {
+              "link": "Bitrefill Datenschutzerklärung",
+              "text": "Die BitBoxApp sammelt keine persönlichen Daten. Bitrefill sammelt Informationen entsprechend ihrer Datenschutzerklärung.",
+              "title": "Datenschutz"
+            },
+            "fees": {
+              "text": "Bitrefill fordert keine expliziten Gebühren, aber Produktpreise können einen Aufpreis enthalten, der vom Händler, der Region und dem von Bitrefill angewendeten Wechselkurs abhängig sein kann.",
+              "title": "Gebühren"
+            },
+            "intro": {
+              "text": "",
+              "title_bitcoin": "Bitcoin ausgeben mit Bitrefill",
+              "title_crypto": "Krypto ausgeben mit Bitrefill"
+            },
+            "security": {
+              "link": "BitBox Sicherheitsbedrohungsmodell",
+              "text": "Bitrefill ist ein externer Dienstleister der nicht vom Sicherheitsbedrohungsmodell der BitBox abgedeckt wird.  Wenn du einen Kauf tätigst, wird der Betrag an eine Adresse von Bitrefill gesendet. Die BitBox kann nicht unabhängig verifizieren, dass diese Adresse korrekt ist.",
+              "title": "Sicherheitshinweis"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefill ist eine Online-Plattform, auf der Bitcoin und andere Kryptowährungen über Gutscheine und weitere Dienstleistungen für alltägliche Ausgaben verwendet werden können. Über die Integration in der BitBoxApp kannst du deine Coins direkt von deiner BitBox ausgeben, ohne sie auf eine Börse oder andere Wallet schicken zu müssen."
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -472,6 +522,7 @@
             "paymentMethods": {
               "buy": "Kaufen: Zahle mit EUR und erhalte deine Coins direkt auf deine BitBox. Du kannst zwischen einmaligen und wiederkehrenden Käufen auswählen. Bei Banküberweisungen greift der Wechselkurs zu dem Zeitpunkt, wenn BTC Direct das Geld erhält. Direkte Zahlungsmethoden nutzen einen für eine kurze Zeit festgelegten Wechselkurs.",
               "note": "Hinweis: Wechselkurse von BTC Direct können leicht von denen der BitBoxApp abweichen.",
+              "sell": "Verkaufen: Sende deine Kryptowährungen an BTC Direct und erhalte EUR auf dein Bankkonto. Der Wechselkurs wird in dem Moment festgelegt, wenn BTC Direct deine Coins erhält.",
               "title": "Zahlungsmethoden und Gebühren"
             },
             "security": {
@@ -490,6 +541,10 @@
               "sofort": "Sofort: {{fee}}%",
               "title": "Gebühren beim Kauf"
             },
+            "feesSelling": {
+              "bankTransfer": "Banküberweisung: {{fee}}%",
+              "title": "Verkaufsgebühren"
+            },
             "intro": "Europäisches Kaufen von Kryptowährungen mit EUR.",
             "payment": {
               "bancontact": "Bancontact",
@@ -559,7 +614,8 @@
       "noExchanges": "Leider sind in dieser Region keine Börsen verfügbar.",
       "region": "Region",
       "selectRegion": "Nicht angegeben",
-      "sell": "Verkaufen"
+      "sell": "Verkaufen",
+      "spend": "Ausgeben"
     },
     "info": {
       "continue": "Zustimmen und fortfahren",
@@ -653,7 +709,7 @@
         "description": "Erstelle oder überprüfe das MicroSD-Karten-Backup."
       },
       "showRecoveryWords": {
-        "description": "Zeige und überprüfe die Wiederherstellungswörter."
+        "description": "Zeige und überprüfe die Wiederherstellungswörter auf der BitBox."
       },
       "title": "Backups"
     },
@@ -677,7 +733,7 @@
         "description": "Erstelle \"Child Keys\" nach dem BIP85-Standard mit deiner BitBox-Wallet.",
         "disclaimer": "Ich verstehe die Funktionsweise der \"Child Keys\" und die damit verbundenen Sicherheitsaspekte.",
         "how": {
-          "description": "Die \"Child Keys\" werden als Mnemonic auf deiner BitBox angezeigt. Du kannst beliebig viele \"Child Keys\" erstellen. Beim Erstellen eines \"Child Keys\" wirst du nach dem Key-Index (z.B. 1, 2, 3, etc.) und der gewünschten Länge der Mnemonic (12, 18 oder 24 Recovery-Wörter) gefragt. Es ist wichtig, dass du dir den Key-Index und die Anzahl der Wörter merkst, um später denselben \"Child Key\" erneut anzeigen zu können.",
+          "description": "Die \"Child Keys\" werden als Mnemonic auf deiner BitBox angezeigt. Du kannst beliebig viele \"Child Keys\" erstellen. Beim Erstellen eines \"Child Keys\" wirst du nach dem Key-Index (z.B. 1, 2, 3, etc.) und der gewünschten Länge der Mnemonic (12, 18 oder 24 Wiederherstellungswörter) gefragt. Es ist wichtig, dass du dir den Key-Index und die Anzahl der Wörter merkst, um später denselben \"Child Key\" erneut anzeigen zu können.",
           "title": "Wie funktioniert es?"
         },
         "recover": {
@@ -713,7 +769,7 @@
         "label": "Verfügbare Version"
       },
       "title": "Firmware",
-      "upToDate": "Dein Gerät ist auf dem aktuellen Stand  ",
+      "upToDate": "Dein Gerät ist auf dem aktuellen Stand.",
       "upgradeAvailable": "Neues Upgrade verfügbar",
       "version": {
         "label": "Version"
@@ -763,10 +819,13 @@
     "wrongKeystore2": "Falls du ein optionale Passphrase nutzt, stelle sicher, dass du die richtige Passphrase für dieses Konto eingegeben hast."
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "Unerwartete Währung in Zahlungsaufforderung",
+      "insufficientFunds": "Unzureichendes Guthaben auf dem ausgewählten Konto."
+    },
     "buySell": {
       "coinNotSupported": "Keine Optionen für diesen Coin-Typ verfügbar.",
-      "regionNotSupported": "Keine Optionen für diese Region verfügbar.",
-      "updateNow": "Jetzt aktualisieren"
+      "regionNotSupported": "Keine Optionen für diese Region verfügbar."
     },
     "pocket": {
       "terms": {
@@ -810,19 +869,36 @@
   "footer": {
     "appVersion": "App Version:"
   },
+  "gapLimit": {
+    "change": "Gap-Limit für Wechseladressen",
+    "description": "Lege benutzerdefinierte Gap-Limits für Bitcoin Empfangs- und Wechseladressen fest.",
+    "maxValue": "Das Gap-Limit darf nicht größer als {{max}} sein.",
+    "minValue": "Das Gap-Limit muss größer als {{min}} sein.",
+    "receive": "Gap-Limit für Empfangsadressen.",
+    "title": "Benutzerdefiniertes Gap-Limit"
+  },
   "generic": {
     "buy": "Kaufe {{coinCode}}",
     "buySell": "Kaufen & Verkaufen",
     "buy_bitcoin": "Kaufe Bitcoin",
     "buy_crypto": "Krypto kaufen",
+    "close": "Schließen",
     "enabled_false": "Deaktiviert",
     "enabled_true": "Aktiviert",
     "noOptionOnIos": "Nicht verfügbar auf iOS",
     "noOptions": "Keine Optionen gefunden",
+    "paymentRequestNote": "{{name}} Zahlung {{orderId}}",
     "receive": "Erhalte {{coinCode}}",
     "receive_bitcoin": "Erhalte Bitcoin",
     "receive_crypto": "Erhalte Crypto",
-    "search": "Suchen…"
+    "resetToDefault": "Auf Standardwerte zurücksetzen",
+    "search": "Suchen…",
+    "searchButton": "Suche",
+    "sell": "{{coinCode}} verkaufen",
+    "sell_bitcoin": "Bitcoin verkaufen",
+    "sell_crypto": "Krypto verkaufen",
+    "spend_bitcoin": "Bitcoin ausgeben",
+    "spend_crypto": "Krypto ausgeben"
   },
   "genericError": "Ein Fehler ist aufgetreten. Falls du Probleme bemerkst, starte die Applikation bitte neu.",
   "goal": {
@@ -1389,7 +1465,7 @@
   "passphrase": {
     "considerations": {
       "button": "Backup-Hinweise",
-      "message": "Die Passphrase schützt dein Wallet-Backup (microSD oder Wiederherstellungswörter). Wer dein Backup findet, kommt ohne Passphrase nicht an dein Wallet.\n\nZum Wiederherstellen eines passphrase-geschützten Wallets benötigst du daher <strong>Backup und Passphrase<strong>. \n\nGeht die Passphrase verloren, ist auch der Zugriff auf deine Coins verloren. Bewahre sie deshalb getrennt vom Backup auf.",
+      "message": "Die Passphrase schützt dein Wallet-Backup (microSD oder Wiederherstellungswörter). Wer dein Backup findet, kommt ohne Passphrase nicht an dein Wallet.\n\nZum Wiederherstellen eines passphrase-geschützten Wallets benötigst du daher <strong>Backup und Passphrase</strong>. \n\nGeht die Passphrase verloren, ist auch der Zugriff auf deine Coins verloren. Bewahre sie deshalb getrennt vom Backup auf.",
       "title": "Backup-Hinweise"
     },
     "disable": "Passphrase deaktivieren",
@@ -1451,7 +1527,7 @@
     },
     "why": {
       "button": "Warum sollte man eine Passphrase benutzen?",
-      "message": "Die BitBox schützt den Seed im Gerät, aber das Backup (microSD oder Wiederherstellungswörter) gewährt vollen Zugriff – daher bewahre es sicher auf.\n\nDa eine Passphrase aus demselben Seed ein neues Wallet erzeugt, benötigt ein passphrase-geschütztes Wallet zum Wiederherstellen <strong>Backup UND Passphrase<strong>. Findet jemand dein Backup, braucht er trotzdem die Passphrase.\n\nMit der Passphrase-Funktion kannst du zudem mehrere Wallets („versteckte Wallets“) auf demselben Gerät anlegen, zusätzlich zum Standard-Wallet.",
+      "message": "Die BitBox schützt den Seed im Gerät, aber das Backup (microSD oder Wiederherstellungswörter) gewährt vollen Zugriff – daher bewahre es sicher auf.\n\nDa eine Passphrase aus demselben Seed ein neues Wallet erzeugt, benötigt ein passphrase-geschütztes Wallet zum Wiederherstellen <strong>Backup UND Passphrase</strong>. Findet jemand dein Backup, braucht er trotzdem die Passphrase.\n\nMit der Passphrase-Funktion kannst du zudem mehrere Wallets („versteckte Wallets“) auf demselben Gerät anlegen, zusätzlich zum Standard-Wallet.",
       "title": "Warum sollte man eine Passphrase benutzen?"
     }
   },
@@ -1462,10 +1538,6 @@
       "paste": "Um Text einzufügen, aktiviere \"Anzeigen\" {{label}}\"."
     }
   },
-  "random": {
-    "button": "Zufallszahl generieren",
-    "description": "Deine BitBox hat die folgende {{bits}}-Bit-Zufallszahl generiert:"
-  },
   "receive": {
     "bitsuranceWarning": "Dies ist ein versichertes Konto, das heißt, es kann nur an Native Segwit empfangen. Dadurch wird verhinderst, dass du versehentlich an Wrapped Segwit oder Taproot empfängst, welche nicht versichert sind.",
     "changeScriptType": "Adresstyp ändern",
@@ -1792,6 +1864,7 @@
     "fee": "Gebühr",
     "fiatHistorical": "Historisch",
     "gas": "Gas",
+    "no-results": "Keine Transaktionen für \"{{searchTerm}}\" gefunden",
     "note": {
       "edit": "Notiz bearbeiten",
       "save": "Notiz speichern"
@@ -1903,7 +1976,7 @@
     "connect": "Verbinde deine BitBox",
     "getStarted": "Starte die Installation der Firmware auf deiner BitBox.",
     "loadingAccounts": "Lade Konten",
-    "message": "Bitte verbinde deine BitBox und tippen sie auf der Seite an, um fortzufahren.",
+    "message": "Verbinde deine BitBox und tippe sie an der Seite an, um fortzufahren.",
     "title": "Willkommen"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/en/app.json b/frontends/web/src/locales/en/app.json
index e9a49d2473..85b856fe36 100644
--- a/frontends/web/src/locales/en/app.json
+++ b/frontends/web/src/locales/en/app.json
@@ -100,7 +100,7 @@
   "auth": {
     "authButton": "Authenticate",
     "dismissButton": "Cancel",
-    "missing": "Please setup a screen lock in your device settings",
+    "missing": "Please setup a screen lock in the system settings of your device.",
     "title": "Please authenticate to continue"
   },
   "backup": {
@@ -199,7 +199,7 @@
   },
   "bitbox02Settings": {
     "bluetoothToggleEnabled": {
-      "alertDisabled": "Bluetooth is now disabled on your BitBox. If you want to connect with iPhones on the future, you will need to re-enable it.",
+      "alertDisabled": "Bluetooth is now disabled on your BitBox. If you want to connect with iPhones in the future, you will need to re-enable it.",
       "alertEnabled": "Bluetooth is now enabled.",
       "description": "Bluetooth is used for connecting with iPhone.",
       "titleDisabled": "Enable Bluetooth",
@@ -384,8 +384,8 @@
   "bootloader": {
     "button": "Upgrade firmware now",
     "button_install": "Install firmware now",
-    "progress": "Upgrading: {{progress}}%",
-    "progress_install": "Installing: {{progress}}%",
+    "progress": "Upgrading",
+    "progress_install": "Installing",
     "success": "Upgrade successful! Please replug the device. This time, do not touch the button."
   },
   "button": {
@@ -484,7 +484,7 @@
               "fee": "Minimum trade amounts of €50,000 apply, with a transparent fee between 0.5% and 1%.",
               "sell": "Sell bitcoin:",
               "sell2": "Lock in a fixed OTC price when placing a sell order. EUR payment is made once you send crypto to BTC Direct. Personal assistance is available if needed.",
-              "title": "Payment Methods and Fees"
+              "title": "Payment methods and fees"
             },
             "personal": {
               "text": "Each Private Trading client is assigned a dedicated account manager for personalized assistance via phone, video call, email, or chat. Buy and sell prices are immediately fixed when the order is placed, even if settlement occurs later. Orders are executed through BTC Direct's OTC desk, minimizing slippage.",
@@ -839,12 +839,11 @@
           "note": "Note: Pocket's exchange rates may differ from the BitBoxApp rates.",
           "p1": "<strong>Buying bitcoin:</strong> Use SEPA bank transfer to send EUR or CHF and get bitcoin delivered directly to your BitBox after Pocket receives the transfer, usually the same day.",
           "p2": "<strong>Selling bitcoin:</strong> Send Bitcoin to Pocket and receive EUR or CHF in your registered bank account. The exchange rate is fixed when Pocket receives your Bitcoin.",
-          "title": "Payment Methods and Fees"
+          "title": "Payment methods and fees"
         },
         "kyc": {
+          "info": "Pocket may require identification documents. Please refer to their FAQs for more information.",
           "link": "Read Pocket FAQs",
-          "p1": "No additional documents are needed for exchanges up to 1000 EUR/CHF within a 30-day period.",
-          "p2": "For larger amounts, a call with Pocket is required to complete the KYC/AML process.",
           "title": "KYC/AML (Know Your Customer / Anti-Money Laundering)"
         },
         "security": {
@@ -1154,7 +1153,7 @@
       "accountSummary": "Account summary guide",
       "advancedSettings": "Advanced settings guide",
       "appearance": "Appearance guide",
-      "buySell": "Buy & sell guide",
+      "buySell": "Marketplace guide",
       "insurance": "Insurance guide",
       "manageAccount": "Manage accounts guide",
       "manageDevice": "Manage device guide",
@@ -1714,7 +1713,7 @@
     },
     "success": "The transaction has been signed and sent.",
     "title": "Send {{accountName}}",
-    "toggleCoinControl": "Toggle coin control",
+    "toggleCoinControl": "Coin control",
     "transactionDetails": "Transaction details"
   },
   "settings": {
@@ -1984,4 +1983,4 @@
     "message": "Please connect your BitBox and tap the side to continue.",
     "title": "Welcome"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/es/app.json b/frontends/web/src/locales/es/app.json
index 821206d612..7175cbf253 100644
--- a/frontends/web/src/locales/es/app.json
+++ b/frontends/web/src/locales/es/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "Cuenta",
+    "accounts": "Cuenta",
+    "backupReminder": "Tu billetera <strong>{{name}}</strong> ha pasado de {{fiat}} {{threshold}}!\n\nRecomendamos que hagas una copia de seguridad en papel para una protección adicional. Es rápido y sencillo. ",
+    "backupReminderLink": "Crear una copia de seguridad en papel",
     "disconnect": "Conexión perdida. Reintentando... ",
-    "export": "Exportar ",
+    "export": "Exportar transacciones",
     "exportTransactions": "Exportar transacciones a la carpeta de descargas como archivo CSV",
     "fatalError": "Ha ocurrido un error inesperado.",
     "incoming": "Entrante",
@@ -19,8 +23,8 @@
     "address": "Dirección",
     "buyCTA": {
       "information": {
-        "looksEmpty": "Parece que esta cartera está vacía.",
-        "start": "Comience depositando algunas monedas en la cartera o comprando directamente a través de la BitBoxApp."
+        "looksEmpty": "Parece que esta billetera está vacía.",
+        "start": "Comienza depositando algunas monedas en la billetera o comprando directamente a través de la BitBoxApp."
       }
     },
     "extendedPublicKey": "Clave pública extendida",
@@ -95,6 +99,8 @@
   },
   "auth": {
     "authButton": "Autentificar",
+    "dismissButton": "Cancelar",
+    "missing": "Activa el bloqueo de pantalla en la configuración de tu dispositivo.",
     "title": "Por favor, autentifícate para continuar"
   },
   "backup": {
@@ -129,6 +135,7 @@
     "description": "Seleccionar <strong>archivo de copia de seguridad de la billetera</strong>",
     "insert": "Por favor, inserta la tarjeta micro SD para administrar las copias de seguridad.",
     "insertButton": "He insertado la tarjeta micro SD",
+    "link": "Ir a administrar copias de seguridad",
     "list": "Tus copias de seguridad en la microSD",
     "noBackups": "No hay copias de seguridad en esta tarjeta microSD.",
     "restore": {
@@ -151,7 +158,7 @@
     },
     "showMnemonic": {
       "checkboxLabel": "He leído la información anterior.",
-      "description": "A continuación se te presentarán tu palabras de recuperación, que constituyen una copia de seguridad de su cartera. Escríbelas en un papel.\n\n<strong>No las almacenes digitalmente ni les tomes fotos.</strong>\n\n<strong>No las diga en voz alta.</strong>\n\n<strong>Esta copia de seguridad no está protegida por una contraseña.</strong>\n\nA continuación, se te pedirá que confirme cada palabra. ",
+      "description": "A continuación se te presentarán tus palabras de recuperación, que constituyen una copia de seguridad de tu billetera. Escríbelas en un papel.\n\n<strong>No las almacenes digitalmente ni les tomes fotos.</strong>\n\n<strong>No las diga en voz alta.</strong>\n\n<strong>Esta copia de seguridad no está protegida por una contraseña.</strong>\n\nA continuación, se te pedirá que confirmes cada palabra. ",
       "title": "Mostrar palabras de recuperación",
       "warning": "<strong>Nunca compartas tus palabras de recuperación con nadie.</strong> Tus palabras de recuperación dan acceso completo a tu billetera. Si alguien te pide tus palabras de recuperación, es un estafador, ¡no las compartas! "
     },
@@ -191,6 +198,13 @@
     "followInstructionsMnemonicTitle": "Restaurar desde las palabras de recuperación"
   },
   "bitbox02Settings": {
+    "bluetoothToggleEnabled": {
+      "alertDisabled": "El Bluetooth está desactivado en tu BitBox. Si quieres conectarte con iPhones en el futuro, tendrás que volver a activarlo.",
+      "alertEnabled": "Bluetooth activado.",
+      "description": "Bluetooth se utiliza para conectarse con el iPhone.",
+      "titleDisabled": "Habilitar Bluetooth",
+      "titleEnabled": "Desactivar Bluetooth"
+    },
     "deviceName": {
       "current": "Nombre del dispositivo actual",
       "error": "No se ha podido establecer el nombre del dispositivo",
@@ -370,8 +384,8 @@
   "bootloader": {
     "button": "Actualizar firmware ahora",
     "button_install": "Instalar el nuevo firmware ahora",
-    "progress": "Actualizando: {{progress}}%",
-    "progress_install": "Instalando: {{progress}}%",
+    "progress": "Actualizando",
+    "progress_install": "Instalando",
     "success": "Actualización completada! Por favor, vuelva a conectar el dispositivo. Esta vez, no toque el botón."
   },
   "button": {
@@ -398,14 +412,57 @@
     "upgrade": "Actualizar"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "Fondos insuficientes para comprar la tarjeta de regalo."
+      },
+      "transactionNote": "Enviado a Bitrefill"
+    },
     "exchange": {
       "bankTransfer": "Transferencia bancaria",
       "bestDeal": "La mejor oferta",
       "buy": "Comprar",
       "creditCard": "Tarjeta de crédito",
+      "description_bitrefill": "Compra tarjetas de regalo, recargas de teléfonos y mucho más",
       "fast": "Rápido",
       "fee": "tarifa",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Límites de compra de Bitrefill",
+              "text": "Puedes utilizar Bitrefill sin crear una cuenta, con ciertos límites. Para aumentar tus límites de gasto, puedes crear una cuenta básica o convertirte en cliente verificado. Para más información, consulta los límites de compra de Bitrefill.",
+              "title": "Cuenta y límites"
+            },
+            "claims": {
+              "link": "Soporte de Bitrefill",
+              "text": "Si tienes algún problema con una compra, ponte en contacto con Bitrefill directamente dentro de los 30 días posteriores a tu pedido.",
+              "title": "Reclamos"
+            },
+            "dataProtection": {
+              "link": "Política de privacidad de Bitrefill",
+              "text": "La BitBoxApp no recopila datos personales. Bitrefill recopila información de acuerdo con su Política de Privacidad.",
+              "title": "Protección de datos"
+            },
+            "fees": {
+              "text": "Bitrefill no cobra tarifas explícitas, pero los precios de los productos pueden incluir un margen de beneficio, que puede variar según el minorista, la región y el tipo de cambio que aplique Bitrefill.",
+              "title": "Tarifas"
+            },
+            "intro": {
+              "text": "Bitrefill es una plataforma en línea que te permite comprar tarjetas de regalo, recargar teléfonos móviles y pagar facturas con bitcoins u otras criptomonedas. Es una forma fácil de gastar criptomonedas en bienes y servicios cotidianos sin convertirlas en dinero tradicional. Bitrefill ofrece una amplia gama de productos de marcas globales y es popular entre las personas que quieren vivir con criptomonedas o comprar en privado.",
+              "title_bitcoin": "Gasta bitcoin con Bitrefill",
+              "title_crypto": "Gasta criptomonedas con Bitrefill"
+            },
+            "security": {
+              "link": "Modelo de amenazas de seguridad de BitBox",
+              "text": "Bitrefill es un servicio externo que no está cubierto por el modelo de amenazas de seguridad de BitBox. Al realizar una compra, el pago se envía a una dirección de Bitrefill. La BitBox no puede verificar que esta dirección sea correcta.",
+              "title": "Aviso de seguridad"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefill es una plataforma en línea donde puedes gastar bitcoin y otras criptomonedas en artículos esenciales de uso diario mediante la compra de tarjetas de regalo, recargas móviles y diversos servicios. La integración con la BitBoxApp te permite gastar tus monedas directamente desde tu BitBox sin tener que transferirlas a una plataforma de intercambio ni a otra billetera."
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -434,7 +491,7 @@
               "title": "Servicio personalizado con precio fijo"
             },
             "security": {
-              "link": "Modelo de amenazas de seguridad de la BitBox02",
+              "link": "Modelo de amenazas de seguridad de BitBox",
               "text": "El Private Trading Desk de BTC Direct es un servicio externo que no está cubierto por el modelo de amenazas de seguridad de la BitBox. Sin embargo, BTC Direct está familiarizado con los productos de BitBox y ofrece orientación segura y experta. Los productos de BitBox verifican las direcciones de criptomonedas durante las transacciones para garantizar una entrega segura.",
               "title": "Seguridad"
             },
@@ -465,15 +522,16 @@
             "paymentMethods": {
               "buy": "Comprar: Paga en EUR para recibir las monedas directamente en tu BitBox. Puedes elegir entre compras únicas o recurrentes. En el caso de las transferencias bancarias, el tipo de cambio se fija cuando BTC Direct recibe el dinero. Los métodos instantáneos utilizan un tipo de cambio fijo durante un tiempo limitado.",
               "note": "Nota: los tipos de cambio de BTC Direct pueden diferir ligeramente de los tipos de la BitBoxApp.",
+              "sell": "Venta: Envía tus criptomonedas a BTC Direct y recibe EUR en tu cuenta bancaria. El tipo de cambio se fija en cuanto BTC Direct recibe tus monedas.",
               "title": "Métodos de pago y comisiones"
             },
             "security": {
               "description": "BTC Direct es un servicio externo que no está cubierto por el modelo de amenazas de seguridad de la BitBox. Trabajamos en estrecha colaboración con BTC Direct para mejorar la seguridad general.",
-              "link": "Modelo de amenazas de seguridad de la BitBox02",
+              "link": "Modelo de amenazas de seguridad de la BitBox",
               "title": "Seguridad"
             },
-            "title_bitcoin": "Compra bitcoin con BTC Direct",
-            "title_crypto": "Compra criptomonedas con BTC Direct"
+            "title_bitcoin": "Compra y vende bitcoin con BTC Direct",
+            "title_crypto": "Compra y vende criptomonedas con BTC Direct"
           },
           "infobox": {
             "feesBuying": {
@@ -483,7 +541,11 @@
               "sofort": "Sofort: {{fee}}%",
               "title": "Tarifas por compra"
             },
-            "intro": "Compra europea de criptomonedas con EUR.",
+            "feesSelling": {
+              "bankTransfer": "Transferencia bancaria: {{fee}}% ",
+              "title": "Tarifas por venta"
+            },
+            "intro": "Compra y venta europea de criptomonedas con EUR.",
             "payment": {
               "bancontact": "Bancontact",
               "bankTransfer": "Transferencia bancaria, SEPA Instant, iDEAL",
@@ -552,7 +614,8 @@
       "noExchanges": "Lo sentimos, no hay intercambios disponibles en esta región.",
       "region": "Región",
       "selectRegion": "No especificado",
-      "sell": "Vender"
+      "sell": "Vender",
+      "spend": "Gastar"
     },
     "info": {
       "continue": "Aceptar y continuar",
@@ -583,8 +646,8 @@
           "title": "Protección de Datos"
         },
         "security": {
-          "descriptionGeneric_bitcoin": "Cuando compras Bitcoin a través de una casa de cambio asociada, estás utilizando un servicio externo. Este servicio está fuera del alcance del modelo de amenazas de seguridad de BitBox02 y depende de la seguridad del entorno en el que se ejecuta el software de BitBoxApp.",
-          "descriptionGeneric_crypto": "Cuando compras crypto a través de una casa de cambio asociada, estás utilizando un servicio externo. Este servicio está fuera del alcance del modelo de amenazas de seguridad de BitBox02 y depende de la seguridad del entorno en el que se ejecuta el software de BitBoxApp.",
+          "descriptionGeneric_bitcoin": "Cuando compras Bitcoin a través de una casa de cambio asociada, estás utilizando un servicio externo. Este servicio está fuera del alcance del modelo de amenazas de seguridad de la BitBox y depende de la seguridad del entorno en el que se ejecuta la BitBoxApp.",
+          "descriptionGeneric_crypto": "Cuando compras criptomonedas a través de una casa de cambio asociada, estás utilizando un servicio externo. Este servicio está fuera del alcance del modelo de amenazas de seguridad de la BitBox y depende de la seguridad del entorno en el que se ejecuta la BitBoxApp.",
           "link": "Modelación de riesgos",
           "title": "Modelo de seguridad"
         },
@@ -646,7 +709,7 @@
         "description": "Crear o verificar una copia de seguridad de tu tarjeta microSD."
       },
       "showRecoveryWords": {
-        "description": "Mostrar y verificar palabras de recuperación."
+        "description": "Mostrar y verificar palabras de recuperación en la pantalla de la BitBox."
       },
       "title": "Copias de seguridad"
     },
@@ -756,10 +819,13 @@
     "wrongKeystore2": " Si utilizas la passphrase opcional, asegúrate de haber introducido la fpassphrase correcta para la cuenta."
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "Moneda inesperada en la solicitud de pago",
+      "insufficientFunds": "Fondos insuficientes en la cuenta seleccionada."
+    },
     "buySell": {
       "coinNotSupported": "No hay opciones disponibles para este tipo de moneda.",
-      "regionNotSupported": "No hay opciones disponibles para esta región.",
-      "updateNow": "Actualizar ahora"
+      "regionNotSupported": "No hay opciones disponibles para esta región."
     },
     "pocket": {
       "terms": {
@@ -782,7 +848,7 @@
           "title": "KYC/AML (Know Your Customer / Anti-Money Laundering)"
         },
         "security": {
-          "link": "Modelo de amenazas de seguridad de BitBox02",
+          "link": "Modelo de amenazas de seguridad de BitBox",
           "p1": "El uso de Pocket es un servicio externo y no está cubierto por el modelo de amenazas de seguridad de BitBox. Sin embargo, trabajamos en estrecha colaboración con Pocket para mejorar la seguridad general.",
           "p2": "<strong>Comprar bitcoin:</strong> Recibirás un correo electrónico para confirmar tu dirección de recepción de bitcoin a través de un segundo canal de comunicación.",
           "p3": "<strong>Vender bitcoin:</strong> Tu BitBox verifica criptográficamente la dirección de Bitcoin y muestra \"Pocket\" en la billetera de hardware.",
@@ -803,18 +869,36 @@
   "footer": {
     "appVersion": "Versión de app:"
   },
+  "gapLimit": {
+    "change": "Gap limit para las direcciones de cambio",
+    "description": "Configura un gap limit personalizado para tus direcciones de recepción y de cambio de bitcoin.",
+    "maxValue": "El gap limit no debe exceder {{max}}.",
+    "minValue": "El gap limit debe ser al menos {{min}}.",
+    "receive": "Gap limit para direcciones de recepción",
+    "title": "Configuración de gap limit personalizado"
+  },
   "generic": {
     "buy": "Comprar {{coinCode}} ",
     "buySell": "Comprar y vender",
     "buy_bitcoin": "Comprar Bitcoin ",
     "buy_crypto": "Comprar criptomonedas",
+    "close": "Cerrar",
     "enabled_false": "Desactivado",
     "enabled_true": "Activado",
+    "noOptionOnIos": "No disponible en iOS",
     "noOptions": "No se encontraron opciones",
+    "paymentRequestNote": "{{name}} pago {{orderId}}",
     "receive": "Recibir {{coinCode}}",
     "receive_bitcoin": "Recibir Bitcoin",
     "receive_crypto": "Recibir criptomonedas",
-    "search": "Buscar..."
+    "resetToDefault": "Restablecer a valores predeterminados",
+    "search": "Buscar...",
+    "searchButton": "Buscar",
+    "sell": "Vender {{coinCode}}",
+    "sell_bitcoin": "Vender Bitcoin",
+    "sell_crypto": "Vender criptomonedas",
+    "spend_bitcoin": "Gastar bitcoin",
+    "spend_crypto": "Gastar criptomonedas"
   },
   "genericError": "Ocurrió un error. Si observa algún problema, por favor reinicie la aplicación.",
   "goal": {
@@ -932,8 +1016,8 @@
         "title": "¿Puedo mover fondos entre cuentas?"
       },
       "recoverAccounts": {
-        "text": "Si. La BitBoxApp crea cuentas utilizando estándares muy establecidos compatibles con la mayoría de otras carteras crypto.",
-        "title": "¿Puedo recuperar mis cuentas de otras carteras?"
+        "text": "Si. La BitBoxApp crea cuentas utilizando estándares muy establecidos compatibles con la mayoría de otras billeteras crypto.",
+        "title": "¿Puedo recuperar mis cuentas de otras billeteras?"
       },
       "supportedCoins": {
         "link": {
@@ -943,7 +1027,7 @@
         "title": "¿Cuales monedas son compatibles?"
       },
       "whatAreAccounts": {
-        "text": "Su cartera puede administrar cuentas de la misma moneda. Las cuentas son útiles cuando se quiere guardar los fondos de forma separada.",
+        "text": "tu billetera puede administrar cuentas de la misma moneda. Las cuentas son útiles cuando se quiere guardar los fondos de forma separada.",
         "title": "¿Qué son las cuentas?"
       },
       "whatIsRememberWallet": {
@@ -1087,11 +1171,11 @@
         "title": "¿Cuándo cambian las direcciones?"
       },
       "addressFormats": {
-        "text": "Por defecto, el tipo de dirección es Native Segwit. Esta dirección es ampliamente adoptada por otras carteras/exchanges y proporciona las mejores comisiones para las transacciones del día a día. En cambio, se puede elegir enviar a Taproot (Bitcoin Only), que es el último tipo de direcciones, pero puede que no sea ampliamente soportada todavía. Como alternativa, si tiene complicaciones enviando a Native Segwit (el tipo de dirección por defecto), puede intentar cambiar al antiguo tipo de dirección Wrapped Segwit que puede ser compatible con mas carteras/exchanges.\n",
+        "text": "Por defecto, el tipo de dirección es Native Segwit. Esta dirección es ampliamente adoptada por otras billeteras/exchanges y proporciona las mejores comisiones para las transacciones del día a día. En cambio, se puede elegir enviar a Taproot (Bitcoin Only), que es el último tipo de direcciones, pero puede que no sea ampliamente soportada todavía. Como alternativa, si tienes complicaciones enviando a Native Segwit (el tipo de dirección por defecto), puedes intentar cambiar al antiguo tipo de dirección Wrapped Segwit que puede ser compatible con mas carteras/exchanges.",
         "title": "¿Cuándo utilizar \"cambio de tipo de dirección\"?"
       },
       "howVerify": {
-        "text": "Para la BitBox01, haz clic en el icono BitBox en la barra lateral de la izquierda y revisa las opciones de emparejamiento. Esta guía se actualizará y podrás seguir las nuevas instrucciones desde allí.\nPara la BitBox02, puedes verificar las direcciones directamente en tu dispositivo durante el proceso de envío y recepción. ",
+        "text": "Puedes verificar direcciones directamente en la BitBox durante el proceso de envío/recepción.",
         "title": "¿Cómo puedo verificar una dirección de forma segura?"
       },
       "plugout": {
@@ -1107,7 +1191,7 @@
         "title": "¿Por qué hay tantas direcciones?"
       },
       "whyVerify": {
-        "text": "No es recomendable confiar en tu ordenador para generar y mostrar direcciones auténticas. Su amplia superficie de ataque lo hace significativamente más vulnerable que una billetera de hardware. En la BitBox01, el botón para verificar la dirección envía de manera segura la dirección a un teléfono móvil emparejado, desde donde también puedes escanear y verificar el código QR. En la BitBox02, la dirección se puede verificar directamente en la pantalla de la BitBox02.",
+        "text": "No debes confiar en tu ordenador para generar y mostrar direcciones auténticas. Su gran superficie de ataque lo hace significativamente más vulnerable que una billetera de hardware. La dirección se puede verificar directamente en la pantalla de la BitBox.",
         "title": "¿Por qué debo verificar la dirección de forma segura?"
       }
     },
@@ -1215,7 +1299,7 @@
         "title": "Perdí mi dispositivo. ¿Ahora qué?"
       },
       "useWithoutDevice": {
-        "text": "Lamentablemente, esto todavía no es posible en este momento.",
+        "text": "Sí, puedes recordar las billeteras en la sección \"Administrar cuentas\" de la configuración. De esta manera, puedes ver tu billetera sin usar una BitBox.",
         "title": "¿Puedo usar la aplicación sin un dispositivo?"
       },
       "welcome": {
@@ -1399,15 +1483,15 @@
       "title": "Como funciona"
     },
     "intro": {
-      "message": "Una passphrase proporciona una capa de seguridad por encima de su cartera.\nAprendamos cómo funciona.",
+      "message": "Una passphrase proporciona una capa de seguridad por encima de tu billetera.\nAprendamos cómo funciona.",
       "title": "Configurar passphrase"
     },
     "progressDisable": {
-      "message": "Confirme en su BitBox que quiere <strong>desactivar</strong> la opción de passphrase.",
+      "message": "Confirma en tu BitBox que quieres <strong>desactivar</strong> passphrase opcional.",
       "title": "Confirmar en el dispositivo"
     },
     "progressEnable": {
-      "message": "Confirme en su BitBox que quiere <strong>activar</strong> la opción de passphrase.",
+      "message": "Confirma en tu BitBox que quieres <strong>activar</strong> la passphrase opcional.",
       "title": "Confirmar en el dispositivo"
     },
     "successDisabled": {
@@ -1421,7 +1505,7 @@
       "tips": "Consejos",
       "tipsList": [
         "Te sugerimos enviar una pequeña cantidad a su billetera con passphrase primero. Después desconecta y vuelve a conectar tu BitBox e introduce tu contraseña y tu passphrase. Si has introducido la passphrase correctamente, deberías ver las monedas en tu billetera.",
-        "Si quiere entrar en su cartera original sin passphrase, puede seguir haciéndolo no introduciendo nada cuando le solicite introducir la passphrase. O puede desactivar la característica de passphrase."
+        "Si quieres entrar en tu billetera original sin passphrase, puedes seguir haciéndolo no introduciendo nada cuando le te solicite introducir la passphrase. O puedes desactivar la característica de passphrase."
       ],
       "title": "Passphrase desactivada"
     },
@@ -1431,8 +1515,8 @@
       "understand": "Entiendo como funciona la passphrase y sus riesgos asociados.",
       "understandList": [
         "La passphrase es una capa adicional de seguridad por encima de su copia de seguridad.",
-        "Introducir un passphrase diferente siempre generará carteras diferentes.",
-        "Para restaurar su cartera necesita <strong>tanto la passphrase como la copia de seguridad</strong>.",
+        "Introducir un passphrase diferente siempre generará billeteras diferentes.",
+        "Para restaurar tu billeteras necesitas <strong>tanto la passphrase como la copia de seguridad</strong>.",
         "Si olvidas tu passphrase, ya no podrás <strong>acceder a tus monedas</strong>."
       ]
     },
@@ -1454,10 +1538,6 @@
       "paste": "para pegar texto, activa \"MOSTRAR {{label}}\""
     }
   },
-  "random": {
-    "button": "Generar número aleatorio",
-    "description": "Tu BitBox ha generado el siguiente número aleatorio de {{bits}} bits:"
-  },
   "receive": {
     "bitsuranceWarning": "Esta es una cuenta asegurada, lo que significa que sólo puede recibir a Segwit Nativo. Esto es para que no recibas accidentalmente a Wrapped Segwit o Taproot, que no están asegurados.",
     "changeScriptType": "Cambiar el tipo de dirección",
@@ -1473,7 +1553,7 @@
       "p2wpkh-p2sh": "Wrapped Segwit (formato compatible)"
     },
     "selectAccount": "Seleccionar cuenta ",
-    "taprootWarning": "Nota: Taproot es una nueva característica de Bitcoin y todavía no es ampliamente aceptada. Los fondos recibidos en direcciones Taproot pueden no ser mostradas en carteras de terceros. Muchas carteras y exchanges no pueden enviar a direcciones Taproot.",
+    "taprootWarning": "Nota: Taproot es una nueva característica de Bitcoin y todavía no es ampliamente aceptada. Los fondos recibidos en direcciones Taproot pueden no ser mostrados en billeteras de terceros. Muchas billeteras y exchanges no pueden enviar a direcciones Taproot.",
     "title": "Recibir {{accountName}}",
     "verify": "Verificar la dirección de forma segura",
     "verifyBitBox02": "Verifica la dirección en tu BitBox",
@@ -1521,7 +1601,7 @@
       "description2": "Elige una contraseña de recuperación para la billetera y selecciona \"Establecer contraseña de recuperación ahora\"",
       "description3": "La copia de seguridad en la tarjeta micro SD y su contraseña de recuperación es el único método para recuperar sus fondos en caso de pérdida o robo del dispositivo BitBox.",
       "description4": "No puedes cambiar tu contraseña de recuperación más adelante sin transferir sus fondos.",
-      "title": "Crear una cartera nueva"
+      "title": "Crear una billetera nueva"
     },
     "password": {
       "label": "Contraseña de recuperación",
@@ -1539,7 +1619,7 @@
       "description1": "Inserta la tarjeta micro SD en el BitBox y haz clic en \"Continuar\"",
       "description2": "Elije una copia de seguridad y haz clic en \"Restablecer\"",
       "description3": "Ingresa la contraseña de recuperación",
-      "description4": "Debes confirmar para entender que una contraseña incorrecta creará una cartera diferente.",
+      "description4": "Debes confirmar para entender que una contraseña incorrecta creará una billetera diferente.",
       "title": "Cómo restaurar una billetera desde una copia de seguridad"
     }
   },
@@ -1784,6 +1864,7 @@
     "fee": "Tarifa de red",
     "fiatHistorical": "Historial",
     "gas": "Gas",
+    "no-results": "No se encontraron transacciones que coincidan con \"{{searchTerm}}\"",
     "note": {
       "edit": "Editar nota",
       "save": "Guardar nota"
@@ -1887,6 +1968,7 @@
   },
   "warning": {
     "coincontrol": "Uno o más UTXOs cuentan con una dirección reutilizada. Ten en cuenta que el receptor verá todos los UTXOs asociados con esas direcciones.",
+    "offline": "En este momento estás desconectado. No podrás enviar transacciones ni ver los últimos tipos de cambio.",
     "sdcard": "Manten la tarjeta micro SD guardada aparte de la BitBox, a menos que desees administrar las copias de seguridad.",
     "testnet": "Actualmente estás usando la billetera en modo Testnet. Las transacciones y los saldos aquí no son reales y no aparecerán en la red principal. Esta red está destinada únicamente a fines de prueba."
   },
@@ -1897,4 +1979,4 @@
     "message": "Por favor conecta tu BitBox y toca los lados para continuar.",
     "title": "Bienvenido"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/fa/app.json b/frontends/web/src/locales/fa/app.json
index 62b6c4aec2..9863317eff 100644
--- a/frontends/web/src/locales/fa/app.json
+++ b/frontends/web/src/locales/fa/app.json
@@ -188,7 +188,7 @@
   },
   "bootloader": {
     "button": "بروزرسانی سیستم عامل",
-    "progress": "بروزرسانی: {{progress}}%",
+    "progress": "بروزرسانی",
     "success": "ارتقا موفقیت آمیز بود! لطفا دستگاه را دوباره متصل نمایید. این بار، دکمه را لمس نکنید."
   },
   "button": {
@@ -527,10 +527,6 @@
       "paste": "برای جاگذاری، \"نمایش {{label}}\" را فعال نمایید."
     }
   },
-  "random": {
-    "button": "تولید شماره تصادفی",
-    "description": "BitBox شما این شماره {{bits}}-بیت زیر را تولید کرد:"
-  },
   "receive": {
     "label": "آدرس شما",
     "onlyThisCoin": {
@@ -769,4 +765,4 @@
   "welcome": {
     "title": "خوش آمديد"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/fr/app.json b/frontends/web/src/locales/fr/app.json
index d531dbd44f..61d57bdb6a 100644
--- a/frontends/web/src/locales/fr/app.json
+++ b/frontends/web/src/locales/fr/app.json
@@ -362,8 +362,8 @@
   "bootloader": {
     "button": "Mettre à jour le micrologiciel maintenant",
     "button_install": "Installer le firmware maintenant",
-    "progress": "Mise à jour : {{progress}}%",
-    "progress_install": "Installation : {{progress}}%",
+    "progress": "Mise à jour",
+    "progress_install": "Installation",
     "success": "Mise à jour réussie ! Veuillez rebrancher l'appareil. Cette fois, ne touchez pas le bouton."
   },
   "button": {
@@ -749,8 +749,7 @@
   "exchange": {
     "buySell": {
       "coinNotSupported": "Aucune option disponible pour ce type de coin.",
-      "regionNotSupported": "Aucune option disponible pour cette région.",
-      "updateNow": "Mise à jour maintenant"
+      "regionNotSupported": "Aucune option disponible pour cette région."
     },
     "pocket": {
       "terms": {
@@ -1420,10 +1419,6 @@
       "paste": "Pour coller du texte, activez \"Montrer {{label}}\""
     }
   },
-  "random": {
-    "button": "Générer un numéro aléatoire",
-    "description": "Votre BitBox a généré le numéro aléatoire à {{bits}}-bit suivant :"
-  },
   "receive": {
     "bitsuranceWarning": "Ceci est un compte assuré, ce qui signifie qu'il ne peut recevoir des fonds que sur des adresses Native Segwit. Ceci afin d'éviter que vous ne receviez accidentellement des fonds vers des adresses Wrapped Segwit ou Taproot, qui ne sont elles pas assurées.",
     "changeScriptType": "Changer de type d'adresse",
@@ -1834,4 +1829,4 @@
     "loadingAccounts": "Chargement des comptes",
     "title": "Bienvenue"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/he/app.json b/frontends/web/src/locales/he/app.json
index 21d37d681b..07257c91c8 100644
--- a/frontends/web/src/locales/he/app.json
+++ b/frontends/web/src/locales/he/app.json
@@ -204,7 +204,7 @@
   },
   "bootloader": {
     "button": "שדרג קושחה עכשיו",
-    "progress": "%משדרג: {{progress}}",
+    "progress": "%משדרג",
     "success": ".שודרג בהצלחה! אנא חבר מחדש את ההתקן. הפעם, אל תגע בכפתור"
   },
   "button": {
@@ -604,10 +604,6 @@
       "paste": "״בכדי להדביק תמליל, אפשר ״הצג {{label}}"
     }
   },
-  "random": {
-    "button": "צור מספר אקראי",
-    "description": ":הביטבוקס שלך יצר מספר של {{bits}}-ביטים אקראי"
-  },
   "receive": {
     "label": "כתובתך",
     "onlyThisCoin": {
@@ -879,4 +875,4 @@
   "welcome": {
     "title": "ברוך הבא"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/hi/app.json b/frontends/web/src/locales/hi/app.json
index 58ef6fbe56..1abe501ad4 100644
--- a/frontends/web/src/locales/hi/app.json
+++ b/frontends/web/src/locales/hi/app.json
@@ -187,7 +187,7 @@
   },
   "bootloader": {
     "button": "अब फर्मवेयर अपग्रेड करें",
-    "progress": "अपग्रेड हो रहा है: {{progress}}%",
+    "progress": "अपग्रेड हो रहा है",
     "success": "अपग्रेड सफल हुआ! कृपया डिवाइस को फिर से डाले। इस बार, बटन को स्पर्श न करें।"
   },
   "button": {
@@ -527,10 +527,6 @@
       "paste": "text चिपकाने के लिए, \"{{label}} दिखाए\" को सक्षम करें "
     }
   },
-  "random": {
-    "button": "रेण्डम संख्या उत्पन्न करें",
-    "description": "आपके BitBox ने निम्न {{bits}}-bit यादृच्छिक संख्या उत्पन्न किया :"
-  },
   "receive": {
     "label": "आपका एड्रेस",
     "onlyThisCoin": {
@@ -769,4 +765,4 @@
   "welcome": {
     "title": "आपका स्वागत हे"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/it/app.json b/frontends/web/src/locales/it/app.json
index df63f6474e..9e9068cec4 100644
--- a/frontends/web/src/locales/it/app.json
+++ b/frontends/web/src/locales/it/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "Account",
+    "accounts": "Account",
+    "backupReminder": "Il tuo wallet <strong>{{name}}</strong> ha superato {{fiat}} {{threshold}}!\n\nTi consigliamo di creare un backup cartaceo per una protezione extra. È veloce e semplice.",
+    "backupReminderLink": "Crea un backup cartaceo",
     "disconnect": "Connessione interrotta. Riprovo...",
-    "export": "Esporta",
+    "export": "Esporta transazioni",
     "exportTransactions": "Esporta transazioni in formato CSV nella cartella download",
     "fatalError": "Si è verificato un errore inatteso",
     "incoming": "In entrata",
@@ -95,6 +99,8 @@
   },
   "auth": {
     "authButton": "Autenticati",
+    "dismissButton": "Annulla",
+    "missing": "Per favore configura una schermata di blocco dalle impostazioni del dispositivo",
     "title": "Autenticati per continuare"
   },
   "backup": {
@@ -129,6 +135,7 @@
     "description": "Scegli <strong>il file di backup del wallet</strong>",
     "insert": "Inserisci la carta microSD per gestire i backup.",
     "insertButton": "Ho inserito la carta microSD",
+    "link": "Vai a gestisci backup",
     "list": "I tuoi backup sulla carta microSD",
     "noBackups": "Non ci sono backup su questa carta microSD",
     "restore": {
@@ -191,6 +198,13 @@
     "followInstructionsMnemonicTitle": "Ripristina utilizzando le parole di recupero"
   },
   "bitbox02Settings": {
+    "bluetoothToggleEnabled": {
+      "alertDisabled": "Il Bluetooth è ora disattivato sul tuo BitBox. Se vorrai connetterti con un iPhone in futuro, dovrai riabilitarlo.",
+      "alertEnabled": "Il Bluetooth è ora abilitato. ",
+      "description": "Il Bluetooth è usato per connettersi con iPhone.",
+      "titleDisabled": "Abilita Bluetooth",
+      "titleEnabled": "Disabilita Bluetooth"
+    },
     "deviceName": {
       "current": "Nome attuale del dispositivo",
       "error": "Non è stato possibile configurare il nome del dispositivo",
@@ -370,8 +384,8 @@
   "bootloader": {
     "button": "Aggiornare il firmware",
     "button_install": "Installa il firmware adesso",
-    "progress": "Aggiornamento: {{progress}}%",
-    "progress_install": "Installazione: {{progress}}%\n",
+    "progress": "Aggiornamento",
+    "progress_install": "Installazione",
     "success": "Aggiornamento riuscito! Ricollegare il dispositivo. Questa volta non toccare il pulsante."
   },
   "button": {
@@ -398,14 +412,57 @@
     "upgrade": "Aggiorna"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "Fondi insufficienti per acquistare una gift card. "
+      },
+      "transactionNote": "Inviato a Bitrefill"
+    },
     "exchange": {
       "bankTransfer": "Bonifico bancario",
       "bestDeal": "Miglior prezzo",
       "buy": "Compra",
       "creditCard": "Carta di credito",
+      "description_bitrefill": "Acquista gift card, ricariche telefoniche e altro",
       "fast": "Rapido",
       "fee": "commissione",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Limiti di acquisto di Bitrefill",
+              "text": "Puoi usare Bitrefill senza creare un account, entro determinati limiti. Per aumentare i tuoi limiti di spesa, puoi creare un account base o diventare un cliente verificato. Per maggiori dettagli, vedi i limiti di acquisto di Bitrefill.",
+              "title": "Account e limiti"
+            },
+            "claims": {
+              "link": "Supporto Bitrefill",
+              "text": "Se riscontri qualche problema durante l'acquisto, per favore contatta direttamente Bitrefill entro 30 giorni dall'ordine.",
+              "title": "Reclami"
+            },
+            "dataProtection": {
+              "link": "Informativa sulla privacy di Bitrefill",
+              "text": "La BitBoxApp non raccoglie dati personali. Bitrefill raccoglie informazioni in conformità alla sua Informativa sulla Privacy.",
+              "title": "Protezione dei dati"
+            },
+            "fees": {
+              "text": "Bitrefill non applica commissioni esplicite, ma i prezzi dei prodotti possono includere un ricarico, che può variare a seconda del rivenditore, della regione e del tasso di cambio applicato da Bitrefill.",
+              "title": "Commissioni"
+            },
+            "intro": {
+              "text": "Bitrefill è una piattaforma online che permette di acquistare gift card, ricaricare telefonini, e pagare bollette usando bitcoin o altre criptovalute. È un modo semplice di spendere crypto su beni e servizi quotidiani senza doverle convertire in denaro tradizionale. Bitrefill offre una vasta gamma di prodotti di marchi globali ed è molto apprezzata da chi vuole vivere con le crypto o fare acquisti in modo privato.",
+              "title_bitcoin": "Spendi bitcoin con Bitrefill",
+              "title_crypto": "Spendi crypto con Bitrefill"
+            },
+            "security": {
+              "link": "Security threat model di BitBox",
+              "text": "Bitrefill è un servizio esterno che non rientra nel security threat model di BitBox. Quando fai un acquisto, il tuo pagamento viene inviato ad un indirizzo di Bitrefill. Il BitBox non può verificare che questo indirizzo sia corretto.",
+              "title": "Avviso di sicurezza"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefill è una piattaforma online dove puoi spendere bitcoin e altre criptovalute in beni di prima necessità acquistando gift card, ricariche telefoniche, e una varietà di servizi. L'integrazione con la BitBoxApp ti permette di spendere le tue monete direttamente dal tuo BitBox senza doverle spostare su un exchange o un altro portafoglio."
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -434,8 +491,8 @@
               "title": "Servizio personalizzato con prezzo fisso"
             },
             "security": {
-              "link": "Security threat model del BitBox02",
-              "text": "Il Private Trading Desk di BTC Direct è un servizio esterno non coperto dal modello di sicurezza del BitBox02. Tuttavia, BTC Direct conosce bene i prodotti BitBox e offre una guida sicura e competente. I prodotti BitBox verificano gli indirizzi crypto durante le transazioni per garantire una consegna sicura.",
+              "link": "Security threat model di BitBox",
+              "text": "Il Private Trading Desk di BTC Direct è un servizio esterno non coperto dal security threat model di BitBox. Tuttavia, BTC Direct conosce bene i prodotti BitBox e offre una guida sicura e competente. I prodotti BitBox verificano gli indirizzi crypto durante le transazioni per garantire una consegna sicura.",
               "title": "Sicurezza"
             },
             "title": "Disclaimer"
@@ -457,7 +514,7 @@
         },
         "btcdirectWidget": {
           "disclaimer": {
-            "description": "Collaboriamo con BTC Direct, un fidato broker europeo, per semplificare l'acquisto di criptovalute all'interno della BitBoxApp. Questo servizio è disponibile in tutta Europa tramite bonifico bancario, carte di credito e altri metodi di pagamento locali.",
+            "description": "Collaboriamo con BTC Direct, un fidato broker europeo, per semplificare l'acquisto di criptovalute all'interno della BitBoxApp. Questo servizio è disponibile in tutta Europa tramite bonifico bancario, carte di credito e molti metodi di pagamento locali.",
             "kyc": {
               "description": "Per effettuare qualsiasi transazione, è richiesta la verifica della tua identità. Ti verrà richiesto di scattare un selfie e di caricare una foto di un documento d'identità ufficiale.",
               "title": "Verifica dell'identità"
@@ -465,15 +522,16 @@
             "paymentMethods": {
               "buy": "Acquisto: Paga in EUR per ricevere i fondi direttamente sul tuo BitBox. Puoi scegliere tra acquisti singoli e acquisti ricorrenti. Per i bonifici bancari, il tasso di cambio viene fissato quando BTC Direct riceve il denaro. I metodi istantanei usano un tasso di cambio fisso per un periodo limitato.",
               "note": "Nota: i tassi di cambio di BTC Direct potrebbero differire leggermente dai tassi della BitBoxApp.",
+              "sell": "Vendita: Invia le tue criptovalute a BTC Direct e ricevi EUR sul tuo conto bancario. Il tasso di cambio è fissato non appena BTC Direct riceve le tue monete.",
               "title": "Metodi di pagamento e commissioni"
             },
             "security": {
               "description": "BTC Direct è un servizio esterno non incluso nel security threat model del BitBox. Tuttavia, collaboriamo a stretto contatto con BTC Direct per migliorare la sicurezza complessiva.",
-              "link": "Security threat model del BitBox02",
+              "link": "Security threat model di BitBox",
               "title": "Sicurezza"
             },
-            "title_bitcoin": "Compra bitcoin con BTC Direct",
-            "title_crypto": "Compra criptovalute con BTC Direct"
+            "title_bitcoin": "Compra e vendi bitcoin con BTC Direct",
+            "title_crypto": "Compra e vendi crypto con BTC Direct"
           },
           "infobox": {
             "feesBuying": {
@@ -483,7 +541,11 @@
               "sofort": "Sofort: {{fee}}%",
               "title": "Commissioni per l'acquisto"
             },
-            "intro": "Acquisto di criptovalute in Europa con EUR.",
+            "feesSelling": {
+              "bankTransfer": "Bonifico bancario: {{fee}}%",
+              "title": "Commissioni per la vendita"
+            },
+            "intro": "Acquisto e vendita di criptovalute in Europa con EUR.",
             "payment": {
               "bancontact": "Bancontact",
               "bankTransfer": "Bonifico bancario, SEPA Instant, iDEAL",
@@ -552,7 +614,8 @@
       "noExchanges": "Mi dispiace, non ci sono exchange disponibili in questo Paese",
       "region": "Paese",
       "selectRegion": "Non specificato",
-      "sell": "Vendi"
+      "sell": "Vendi",
+      "spend": "Spendi"
     },
     "info": {
       "continue": "Accetta e continua",
@@ -583,8 +646,8 @@
           "title": "Protezione dei dati"
         },
         "security": {
-          "descriptionGeneric_bitcoin": "Quando acquisti Bitcoin tramite un exchange partner, stai usando un servizio esterno. Questo servizio è fuori dall'ambito del Securiy Threat model del BitBox02 e si affida al grado di sicurezza dell'ambiente in cui il software BitBoxApp è in esecuzione.",
-          "descriptionGeneric_crypto": "Quando acquisti crypto tramite un exchange partner, stai usando un servizio esterno. Questo servizio è fuori dall'ambito del Securiy Threat model del BitBox02 e si affida al grado di sicurezza dell'ambiente in cui il software BitBoxApp è in esecuzione.",
+          "descriptionGeneric_bitcoin": "Quando acquisti Bitcoin tramite un exchange partner, stai usando un servizio esterno. Questo servizio è fuori dall'ambito del securiy threat model di BitBox e si affida al grado di sicurezza dell'ambiente in cui il software della BitBoxApp è in esecuzione.",
+          "descriptionGeneric_crypto": "Quando acquisti crypto tramite un exchange partner, stai usando un servizio esterno. Questo servizio è fuori dall'ambito del security threat model di BitBox e si affida al grado di sicurezza dell'ambiente in cui il software della BitBoxApp è in esecuzione.",
           "link": "Security threat model",
           "title": "Security model"
         },
@@ -598,7 +661,7 @@
     },
     "pocket": {
       "error": {
-        "insufficientFunds": "Fondi insufficienti sul conto selezionato."
+        "insufficientFunds": "Fondi insufficienti sull'account selezionato."
       },
       "paymentRequestNote": "Richiesta di pagamento da",
       "previousTransactions": "Lo storico di transazioni di questo account non è vuoto. Condividere questo account renderà tutte le transazioni passate e future visibili per Pocket. Procedere comunque? ",
@@ -646,7 +709,7 @@
         "description": "Crea o verifica il tuo backup su microSD."
       },
       "showRecoveryWords": {
-        "description": "Mostra e verifica le parole di recupero."
+        "description": "Mostra e verifica le parole di recupero sullo schermo del BitBox."
       },
       "title": "Backup"
     },
@@ -756,10 +819,13 @@
     "wrongKeystore2": "Se stai utilizzando la passphrase opzionale, assicurati di avere inserito quella corretta per questo account."
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "Valuta imprevista nella richiesta di pagamento",
+      "insufficientFunds": "Fondi insufficienti sull'account selezionato."
+    },
     "buySell": {
       "coinNotSupported": "Nessuna opzione disponibile per questo tipo di valuta.",
-      "regionNotSupported": "Nessuna opzione disponibile per questa regione.",
-      "updateNow": "Aggiorna ora"
+      "regionNotSupported": "Nessuna opzione disponibile per questa regione."
     },
     "pocket": {
       "terms": {
@@ -782,8 +848,8 @@
           "title": "KYC/AML (Know Your Customer / Anti-Money Laundering)"
         },
         "security": {
-          "link": "Security threat model del BitBox02",
-          "p1": "L'utilizzo di Pocket è un servizio esterno e non è coperto dal security threat model del BitBox02. Tuttavia, lavoriamo a stretto contatto con Pocket per migliorare la sicurezza complessiva.",
+          "link": "Security threat model di BitBox",
+          "p1": "L'utilizzo di Pocket è un servizio esterno e non è coperto dal security threat model di BitBox. Tuttavia, lavoriamo a stretto contatto con Pocket per migliorare la sicurezza complessiva.",
           "p2": "<strong>Acquistare bitcoin:</strong> Riceverai un'e-mail per confermare il tuo indirizzo di ricezione bitcoin attraverso un secondo canale di comunicazione.",
           "p3": "<strong>Vendere bitcoin:</strong> il BitBox verifica crittograficamente l'indirizzo di deposito Bitcoin e visualizza \"Pocket\" sull'hardware wallet.",
           "title": "Sicurezza"
@@ -803,18 +869,36 @@
   "footer": {
     "appVersion": "Versione dell'app:"
   },
+  "gapLimit": {
+    "change": "Gap limit per gli indirizzi di resto",
+    "description": "Configura gap limiti personalizzati per gli indirizzi bitcoin di ricezione e di resto.",
+    "maxValue": "il gap limit non deve superare {{max}}.",
+    "minValue": "Il gap limit deve essere almeno {{min}}.",
+    "receive": "Gap limiti per indirizzi di ricezione",
+    "title": "Impostazioni personalizzate di gap limit"
+  },
   "generic": {
     "buy": "Acquista {{coinCode}}",
     "buySell": "Compra e vendi",
     "buy_bitcoin": "Acquista Bitcoin",
     "buy_crypto": "Acquista crypto",
+    "close": "Chiudi",
     "enabled_false": "Disabilitato",
     "enabled_true": "Abilitato",
+    "noOptionOnIos": "Non disponibile su iOS",
     "noOptions": "Nessuna opzione trovata",
+    "paymentRequestNote": "{{name}} pagamento {{orderId}}\n",
     "receive": "Ricevi {{coinCode}}",
     "receive_bitcoin": "Ricevi Bitcoin",
     "receive_crypto": "Ricevi crypto",
-    "search": "Cerca..."
+    "resetToDefault": "Ripristina le impostazioni predefinite",
+    "search": "Cerca...",
+    "searchButton": "Cerca",
+    "sell": "Vendi {{coinCode}}",
+    "sell_bitcoin": "Vendi Bitcoin",
+    "sell_crypto": "Vendi crypto",
+    "spend_bitcoin": "Spendi bitcoin",
+    "spend_crypto": "Spendi crypto"
   },
   "genericError": "Si è verificato un errore. Se noti qualche problema, riavvia l'applicazione.",
   "goal": {
@@ -1091,7 +1175,7 @@
         "title": "Quando uso \"Cambia tipo di indirizzo\"?"
       },
       "howVerify": {
-        "text": "Per il BitBox01, clicca sull'icona BitBox nella barra laterale a sinistra e vedi la sezione Abbinamento. La guida si aggiornerà e potrai continuare a seguire le istruzioni da lì.\nPer il BitBox02, è possibile verificare gli indirizzi direttamente sul dispositivo durante il processo di invio/ricezione.",
+        "text": "Puoi verificare gli indirizzi direttamente sul BitBox durante il processo di invio/ricezione.",
         "title": "Come posso verificare un indirizzo in modo sicuro?"
       },
       "plugout": {
@@ -1107,7 +1191,7 @@
         "title": "Perché così tanti indirizzi?"
       },
       "whyVerify": {
-        "text": "Non dovresti fidarti del computer per generare e visualizzare indirizzi genuini. L'ampia superficie di attacco lo rende molto più vulnerabile di un hardware wallet. Nel caso del BitBox01, il pulsante per verificare l'indirizzo invia in modo sicuro l'indirizzo a un telefono cellulare associato, dal quale è anche possibile scansionare e verificare il codice QR. Per il BitBox02, l'indirizzo può essere verificato direttamente sul display del BitBox02.",
+        "text": "Non dovresti fidarti del tuo computer per generare e mostrare indirizzi autentici. La sua ampia superficie di attacco lo rende significativamente più vulnerabile rispetto a un hardware wallet. L'indirizzo può essere verificato direttamente sul display di BitBox.",
         "title": "Perché dovrei verificare l'indirizzo in modo sicuro?"
       }
     },
@@ -1215,7 +1299,7 @@
         "title": "Ho perso il mio dispositivo. E adesso?"
       },
       "useWithoutDevice": {
-        "text": "Purtroppo, questo non è ancora possibile al momento.",
+        "text": "Sì, puoi ricordare i portafogli nelle impostazioni di gestione dell’account. In questo modo puoi vedere il tuo portafoglio senza utilizzare un BitBox.",
         "title": "Posso usare l'applicazione senza un dispositivo?"
       },
       "welcome": {
@@ -1454,10 +1538,6 @@
       "paste": "per incollare il testo, attivare \"MOSTRA {{label}}\""
     }
   },
-  "random": {
-    "button": "Genera un numero casuale",
-    "description": "Il tuo BitBox ha generato il seguente numero casuale {{bits}}-bit:"
-  },
   "receive": {
     "bitsuranceWarning": "Questo è un account assicurato, e può ricevere transazioni solo su indirizzi di tipo Native Segwit. In questo modo non riceverai accidentalmente fondi su indirizzi di tipo Wrapped Segwit o Taproot, che non sono assicurati.",
     "changeScriptType": "Cambia il tipo di indirizzo",
@@ -1629,7 +1709,7 @@
     "scanQRNoCameraMessage": "Camera non trovata. Assicurati che il tuo dispositivo supporti una camera e che i permessi siano correttamente configurati.",
     "success": "La transazione è stata firmata ed inviata.",
     "title": "Invia {{accountName}}",
-    "toggleCoinControl": "Toggle coin control",
+    "toggleCoinControl": "Coin control",
     "transactionDetails": "Dettagli della transazione"
   },
   "settings": {
@@ -1784,6 +1864,7 @@
     "fee": "Commissione",
     "fiatHistorical": "Storico",
     "gas": "Gas",
+    "no-results": "Nessuna transazione trovata corrispondente a \"{{searchTerm}}\"",
     "note": {
       "edit": "Modifica nota",
       "save": "Salva nota"
@@ -1887,6 +1968,7 @@
   },
   "warning": {
     "coincontrol": "Una o più UTXO hanno un indirizzo riutilizzato. Sappi che il destinatario vedrà tutte le UTXO associate a tali indirizzi.",
+    "offline": "Sei attualmente offline. Non sarai in grado di inviare transazioni o visualizzare i tassi di cambio più recenti.",
     "sdcard": "Tenere la scheda microSD separata dal BitBox, a meno che non si vogliano gestire i backup.",
     "testnet": "Stai utilizzando la modalità Testnet. Le transazioni e le monete qui non sono reali e non hanno valore. Usare solo per scopi di test."
   },
@@ -1897,4 +1979,4 @@
     "message": "Connetti il tuo BitBox e tocca il lato per continuare.",
     "title": "Benvenuto"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/ja/app.json b/frontends/web/src/locales/ja/app.json
index e264e8805b..0a622b8304 100644
--- a/frontends/web/src/locales/ja/app.json
+++ b/frontends/web/src/locales/ja/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "アカウント",
+    "accounts": "アカウント",
+    "backupReminder": "あなたのウォレット<strong>{{name}}</strong>が {{fiat}} {{threshold}} を超えました。\n\n追加の保護のために、ペーパー・バックアップの作成をおすすめします。手順は簡単で、すぐに行えます。",
+    "backupReminderLink": "紙にバックアップを作成",
     "disconnect": "接続が切れました。再試行中です…",
-    "export": "エクスポート",
+    "export": "取引データを書き出す",
     "exportTransactions": "取引一覧をCSV形式でダウンロードフォルダにエクスポートする\n",
     "fatalError": "予期せぬエラーが起こりました。",
     "incoming": "受信中",
@@ -45,6 +49,7 @@
     "fiatBalance": "フィアット残高",
     "name": "アカウント名",
     "noAccount": "表示できるアカウントがありません。",
+    "portfolio": "ポートフォリオ",
     "subtotalWithCoinName": "合計（{{coinName}}）",
     "title": "ポートフォリオ",
     "total": "合計",
@@ -80,7 +85,7 @@
     "labelAddress": "アドレス",
     "labelMessage": "メッセージ",
     "reverifyInfoText": "アドレスの確認",
-    "signing": "進めるには、BitBox02でメッセージに署名してください",
+    "signing": "次に進むには、BitBox でメッセージを署名してください",
     "success": {
       "message": "{{host}}で進めてください",
       "title": "アドレスの送信に成功"
@@ -94,6 +99,8 @@
   },
   "auth": {
     "authButton": "認証",
+    "dismissButton": "キャンセル",
+    "missing": "お使いの端末のシステム設定から、画面ロックを設定してください。",
     "title": "続行するには認証してください"
   },
   "backup": {
@@ -128,6 +135,7 @@
     "description": "<strong>ウォレットのバックアップファイル</strong>を選択してください",
     "insert": "バックアップを管理するにはSDカードを挿入してください。",
     "insertButton": "SDカードを挿入しました",
+    "link": "バックアップの管理画面へ",
     "list": "microSDカード上のバックアップ",
     "noBackups": "このmicroSDカードにはバックアップが存在しません。",
     "restore": {
@@ -160,7 +168,7 @@
     "abort": "アップグレードしない – 前の画面に戻る",
     "abort_noUpgrade": "前の画面に戻る",
     "additionalUpgradeFollows1": "このアップグレードの直後に、追加のアップグレードが行われます。",
-    "additionalUpgradeFollows2": "すべてのアップグレードが完了するまで、BitBox02を接続したままにしてください。",
+    "additionalUpgradeFollows2": "BitBox はアップグレードが終わるまで接続したままにしてください",
     "advanced": {
       "label": "詳細設定",
       "toggleShowFirmwareHash": "起動時に毎回ファームウェアのハッシュを表示"
@@ -169,8 +177,8 @@
     "orientation": "デバイスの向きは合っていますか？　",
     "success": "アップグレードに成功しました！",
     "success_install": "インストールが成功しました！",
-    "upgradeTitle": "BitBox02ファームウェアのアップグレードしています",
-    "upgradeTitle_install": "BitBox02ファームウェアのインストールしています"
+    "upgradeTitle": "BitBox のファームウェアをアップグレード中",
+    "upgradeTitle_install": "BitBox のファームウェアをインストール中"
   },
   "bitbox": {
     "error": {
@@ -180,26 +188,33 @@
     }
   },
   "bitbox02Interact": {
-    "confirmDate": "本日の日付をBitBox02で確認してください",
+    "confirmDate": "BitBox 上で本日の日付を確認してください",
     "confirmDateText": "この日付はバックアップ作成に使用されます。",
-    "confirmName": "名前をBitBox02で確認してください",
-    "confirmWords": "あなたのBitBox02に{{amount}}のリカバリーワードを記入してください",
-    "confirmWordsText": "その後、BitBox02は、バックアップが正しいかどうかを確認するために、各単語を確認するよう求めます。",
-    "followInstructions": "BitBox02の手順に従ってください。",
-    "followInstructionsMnemonic": "バックアップからリカバリーワードを入力し、ウォレットを復元するために、BitBox02の指示に従ってください。",
+    "confirmName": "BitBox 上で名前を確認してください",
+    "confirmWords": "BitBox に表示される {{amount}} 個のリカバリーワードを書き留めてください。",
+    "confirmWordsText": "その後、バックアップが正しいことを確認するために、BitBox が各単語の確認を求めてきます。",
+    "followInstructions": "BitBox の画面の指示に従って操作してください。",
+    "followInstructionsMnemonic": "バックアップからリカバリーワードを入力してウォレットを復元するために、BitBox の画面の指示に従って操作してください。",
     "followInstructionsMnemonicTitle": "リカバリーワードから復元する"
   },
   "bitbox02Settings": {
+    "bluetoothToggleEnabled": {
+      "alertDisabled": "BitBoxのBluetoothは現在オフになっています。今後iPhoneと接続する場合は、Bluetoothを再度有効にしてください",
+      "alertEnabled": "Bluetoothがオンになりました。",
+      "description": "iPhoneと接続する際にBluetoothを使用します。",
+      "titleDisabled": "Bluetoothをオンにする",
+      "titleEnabled": "Bluetoothをオフにする"
+    },
     "deviceName": {
       "current": "現在のデバイス名",
       "error": "デバイス名を設定できませんでした。",
       "error_104": "デバイス上でデバイス名の確認が中止されました。",
-      "input": "BitBox02　名前",
+      "input": "BitBoxの名前",
       "placeholder": "新しいデバイス名",
-      "title": "BitBox02の名前を設定"
+      "title": "BitBox のデバイス名を設定"
     },
     "gotoStartupSettings": {
-      "description": "これにより、BitBox02が再起動し、起動設定に入ります",
+      "description": "これにより BitBox が再起動し、起動設定に入ります。",
       "title": "起動設定に移動"
     }
   },
@@ -209,7 +224,7 @@
       "outOfDate": "ファームウェアの更新が必要です",
       "seed12WordInfo": "ウォレットを作成した後で単語の数を変更することはできないことに注意してください。",
       "seed12WordLabel": "24語のシードの代わりに12語のシードを作成します。",
-      "seed12WordText": "デフォルトでは、BitBox02は24語のシードを使用します。どちらのシード長も実際のところブルートフォース攻撃に対して安全です。一部のユーザーは12語のシードの便利さを好むかもしれません。",
+      "seed12WordText": "BitBox はデフォルトで 24 語のシードを使用します。どちらのシード長も、実際には総当たり攻撃に対して十分な安全性があります。ただし、利便性を重視して 12 語のシードを選ぶユーザーもいます。",
       "skipSDCardLabel": "マイクロSDカードのバックアップをスキップして、代わりにリカバリーワードを書き留めてください",
       "skipSDCardText": "セットアップ後にmicroSDカードのバックアップを作成したり、リカバリーワードを書き込んだりするオプションは常に用意されています。これは、設定から行うことができます。",
       "title": "高度なバックアップオプション"
@@ -219,15 +234,15 @@
       "point1": "microSDカードのバックアップを選択してください",
       "point2": "デバイスのパスワードを設定",
       "restoreText": "さあ、バックアップを復元しましょう！",
-      "text1": "これでBitBox02のパスワードは設定され、ウォレットも作成されました。次はバックアップを作成しましょう、microSDカードがデバイスに挿入されていることを確認してから次に進んでください。",
+      "text1": "BitBox のパスワードが設定され、ウォレットが作成されました。続いて、最初のバックアップを作成します。BitBox に microSD カードが挿入されていることを確認し、続行してください。",
       "text2": "デバイス上の画面の指示に従って、バックアップを作成してください。",
-      "text3": "バックアップ作成後にデバイスからmicroSDカードを取り外し、<strong>安全な場所</strong>に保管してください。microSDカードの内容はパスワード保護されていません。BitBox02以外のデバイスに挿入しないよう気をつけてください。",
+      "text3": "バックアップの作成が完了したら、microSD カードを取り出し、<strong>安全な場所</strong>に保管してください。microSD カードの内容はパスワードで保護されていません。BitBox以外のデバイスには絶対に挿入しないでください。\n",
       "userConfirmation1": "バックアップは安全な場所に保管するべきです。",
       "userConfirmation2": "バックアップはパスワードによって保護されていません。バックアップにアクセスできる人はあなたのウォレットにもアクセスできます。",
-      "userConfirmation3": "BitBox02が損傷または紛失した際には、バックアップからしか、資金を復元できません。",
-      "userConfirmation4": "バックアップとBitBox02の両方を紛失または損傷させた場合、資金は失われます。",
-      "userConfirmation5": "マイクロSDカードのバックアップをコンピューター、携帯電話、プリンター、またはBitBox02以外の任意のデバイスに挿入すべきではありません。",
-      "userConfirmation5mnemonic": "リカバリーワードをBitBox02以外のコンピュータ、電話、プリンタ、または他のデバイスに入れるべきではありません。"
+      "userConfirmation3": "BitBox を紛失したり故障した場合、資金を復元する唯一の方法は、バックアップからの復元です。",
+      "userConfirmation4": "バックアップと BitBox の両方を紛失または故障させた場合、資金は失われます。",
+      "userConfirmation5": "microSD カードのバックアップは、BitBox 以外のコンピューター、スマートフォン、プリンター、その他の機器に挿入してはいけません。",
+      "userConfirmation5mnemonic": "リカバリーワードをBitBox以外のコンピュータ、スマートフォン、プリンタ、またはその他の機器に保存してはいけません。"
     },
     "create": {
       "button": "デバイス名を設定して続行",
@@ -245,10 +260,10 @@
     },
     "noPasswordMatch": "パスワードが一致しませんでした、再度試してください。",
     "pairing": {
-      "failed": "ペアリングが確認できません。BitBox02を挿し直してください。",
+      "failed": "ペアリングが確認できませんでした。BitBox を再接続してください。",
       "paired": "あなたのデバイスで以下のコードを確認しました。続行してください。",
       "title": "ペアリングコードを確認する",
-      "unpaired": "ペアリングされていないBitBox02が検出されました。ペアリングコードがBitBox02に表示されているものと一致することを確認してください。"
+      "unpaired": "未ペアリングの BitBox が検出されました。BitBox に表示されているペアリングコードと一致していることを確認してください。"
     },
     "restoreFromMnemonic": {
       "e104": "カバリーワードからの復元がキャンセルされました。",
@@ -264,37 +279,37 @@
       "title": "バックアップを復元しました！"
     },
     "stepConnected": {
-      "unlock": "BitBox02のパスワードを入力してロックを解除してください"
+      "unlock": "BitBoxのパスワードを入力してロックを解除してください"
     },
     "stepCreate": {
-      "description": "この名前は、デバイス名およびバックアップに使用されます。",
+      "description": "この名前は、デバイス名およびバックアップ名として使用されます。",
       "error": {
         "genericMessage": "文字、数字、基本的な記号、スペースを使用してください。最大30文字までです。",
         "invalidChars": "名前に無効な文字が含まれています: {{invalidChars}}.",
         "tooLong": "名前が長すぎます。"
       },
-      "nameLabel": "BitBox02の名前",
-      "namePlaceholder": "私のBitBox02",
-      "title": "BitBox02の名前を決めてください",
-      "toastMicroSD": "ウォレットのバックアップを保存するために、BitBox02にmicroSDカードを挿入してください。"
+      "nameLabel": "BitBoxの名前",
+      "namePlaceholder": "私のBitBox",
+      "title": "BitBoxの名前を決めてください",
+      "toastMicroSD": "ウォレットのバックアップを保存するために、BitBoxにmicroSDカードを挿入してください。"
     },
     "stepCreateSuccess": {
-      "removeMicroSD": "BitBox02からmicroSDカードを抜いて安全な場所にしまってください。",
+      "removeMicroSD": "BitBoxからmicroSDカードを取り外し、安全な場所に保管してください。",
       "storeMnemonic": "リカバリーワードを安全な場所に保管してください",
       "success": "バックアップの作成に成功しました。"
     },
     "stepInsertSD": {
-      "insertSDCard": "次へ進むにはBitBox02にmicroSDカードを挿入してください。",
-      "insertSDCardToSeeBackups": "バックアップを確認するには、microSDカードをBitBox02に挿入してください。",
+      "insertSDCard": "次へ進むにはBitBoxにmicroSDカードを挿入してください。",
+      "insertSDCardToSeeBackups": "バックアップを確認するには、microSDカードをBitBoxに挿入してください。",
       "insertSDcardTitle": "microSDカードを挿入してください。"
     },
     "stepPassword": {
       "e104": "パスワードの設定がキャンセルされました。",
-      "title": "BitBox02のパスワードを設定する",
-      "useControls": "BitBox02を操作してパスワードを設定してください。"
+      "title": "BitBoxのパスワードを設定する",
+      "useControls": "BitBoxを操作してパスワードを設定してください。"
     },
     "stepUninitialized": {
-      "create": "BitBox02で新しいウォレットを作成したいです。",
+      "create": "BitBoxで新しいウォレットを作成したいです。",
       "restore": "バックアップからウォレットを復元する。",
       "restoreMicroSD": "microSDカードから復元する",
       "restoreMnemonic": "リカバリーワードから復元",
@@ -331,14 +346,14 @@
       "listItem2": "恐喝（例：5ドルの鉄パイプ攻撃など）",
       "listItem3": "火災、水害、自然災害による損害",
       "month": "月",
-      "text": "BitBox02と最大100,000ユーロ相当のビットコインに保険をかけることができます。",
+      "text": "BitBox と最大 €100,000 相当のビットコインを対象に保険をかけましょう",
       "text2": "保険プランは年間30ユーロ（月額2.50ユーロ）から。Bitsuranceの詳細と正確な保険内容については、以下をご覧ください。",
       "text3": "現在ドイツで入手可能で、今後さらに多くの地域で入手可能になる予定。",
       "title": "始める"
     },
     "intro": {
       "link": "Bitsurance のウェブサイト",
-      "text1": "BitBoxはBitsuranceと連携して、ビットコインの追加の保護層を提供します。BitBox02は資金を安全に保管し、Bitsuranceは自宅での盗難、恐喝、またはハードウェアウォレット自体の破壊など、テクノロジーだけでは緩和できない脅威に対処します。"
+      "text1": "BitBox は Bitsurance と連携し、ビットコインに対する保護をさらに強化します。BitBox が資金のセキュリティを担保する一方で、Bitsurance は技術だけでは防ぎきれない自宅でのリスクたとえば、空き巣や脅迫、ハードウェアウォレット自体の破損などに備えた補償を提供します。"
     },
     "terms": {
       "link": "Bitsuranceプライバシーポリシー",
@@ -359,11 +374,18 @@
   "blink": {
     "button": "点滅"
   },
+  "bluetooth": {
+    "connected": "接続済み",
+    "connectionFailed": "接続に失敗しました",
+    "connectionIssues": "接続に問題がありますか？",
+    "enable": "Bluetoothをオンにしてください",
+    "select": "BitBoxを選択してください"
+  },
   "bootloader": {
     "button": "ファームウェアをアップグレードする",
     "button_install": "ファームウェアをインストールする",
-    "progress": "アップグレード中：{{progress}}\r%",
-    "progress_install": "インストール中：{{progress}}\n%",
+    "progress": "アップグレード中",
+    "progress_install": "インストール中",
     "success": "アップグレートが完了しました。今回は、ボタンを触らずにデバイスを挿入し直してください。"
   },
   "button": {
@@ -390,14 +412,57 @@
     "upgrade": "アップグレード"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "ギフトカードを購入するための残高が足りません。"
+      },
+      "transactionNote": "Bitrefill に送金済み"
+    },
     "exchange": {
       "bankTransfer": "銀行振込",
       "bestDeal": "最良の取引",
       "buy": "購入",
       "creditCard": "クレジットカード",
+      "description_bitrefill": "ギフトカード、通話リチャージなどを購入",
       "fast": "高速",
       "fee": "手数料",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Bitrefillの購入上限",
+              "text": "アカウントを作成しなくても、一定の範囲でBitrefillをご利用いただけます。上限を引き上げるには、基本アカウントの作成または本人確認が必要です。詳しくは、Bitrefillの購入上限をご覧ください。",
+              "title": "アカウント情報と利用上限"
+            },
+            "claims": {
+              "link": "BitrBitrefillのサポート",
+              "text": "ご購入に関して問題が発生した場合は、ご注文から30日以内に直接Bitrefillへお問い合わせください。",
+              "title": "申し立てについて"
+            },
+            "dataProtection": {
+              "link": "Bitrefillのプライバシーポリシー",
+              "text": "BitBoxAppは個人情報を収集しません。Bitrefillは、そのプライバシーポリシーに基づいて情報を収集します。",
+              "title": "個人データの保護"
+            },
+            "fees": {
+              "text": "Bitrefillでは手数料は明記されていませんが、商品価格に上乗せが含まれている場合があります。上乗せの割合は、販売元・地域・為替レートによって異なります。",
+              "title": "手数料"
+            },
+            "intro": {
+              "text": "Bitrefillは、ビットコインなどの暗号資産でギフトカードを購入したり、携帯電話をチャージしたり、請求書の支払いができるオンラインプラットフォームです。暗号資産を法定通貨に換えることなく、日常の買い物やサービスに使える手軽な方法として利用されています。Bitrefillは、世界中の有名ブランドの商品を幅広く取り扱っており、暗号資産だけで生活したい人や買い物をしたい人に人気があります。",
+              "title_bitcoin": "Bitrefillでビットコインを使う",
+              "title_crypto": "Bitrefillで暗号資産を使う"
+            },
+            "security": {
+              "link": "BitBox security tBitBox security threat modelhreat model",
+              "text": "BitrefillはBitBoxとは別の外部サービスであり、BitBoxのセキュリティ設計には含まれていません。購入時に送金される宛先アドレスはBitrefillが指定するもので、BitBoxがその正当性を確認することはできません。",
+              "title": "セキュリティに関するお知らせ"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefillは、ビットコインなどの暗号資産でギフトカードや携帯電話のチャージ、各種サービスを購入できるオンラインサービスです。BitBoxAppと連携することで、取引所や他のウォレットに資産を移動することなく、BitBoxから直接支払いが可能になります。"
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -419,15 +484,15 @@
               "fee": "最低取引額は50,000ユーロで、手数料は0.5%から1%の範囲で明確に設定されています。",
               "sell": "ビットコインの売却:",
               "sell2": "売却注文を出す際に、OTC（店頭取引）の固定価格を確定することができます。仮想通貨をBTC Directに送付すると、ユーロでの支払いが行われます。必要に応じて、パーソナルサポートもご利用いただけます。",
-              "title": "支払い方法と手数料"
+              "title": "お支払い方法と手数料"
             },
             "personal": {
               "text": "プライベートトレーディングの各クライアントには、専任のアカウントマネージャーが割り当てられ、電話、ビデオ通話、メール、またはチャットを通じて個別サポートを提供します。注文が確定した時点で、売買価格は即座に固定され、決済が後日行われる場合でも変更されません。注文はBTC DirectのOTCデスクを通じて実行されるため、スリッページが最小限に抑えられます。",
               "title": "固定価格でのパーソナルサービス"
             },
             "security": {
-              "link": "BitBox02のセキュリティ脅威モデル",
-              "text": "BTC Directのプライベートトレーディングデスクは外部サービスであり、BitBox02のセキュリティ脅威モデルの対象外です。しかし、BTC DirectはBitBox製品に精通しており、安全かつ専門的なサポートを提供します。BitBox製品は、取引中に暗号資産のアドレスを検証し、安全な送付を確実にします。",
+              "link": "BitBoxのセキュリティ脅威モデル",
+              "text": "BTC Direct のプライベートトレーディングデスクは、BitBox のセキュリティ脅威モデルの対象外となる外部サービスです。ただし、BTC Direct は BitBox 製品に精通しており、安全かつ専門的なガイダンスを提供しています。BitBox 製品は、取引時に暗号資産アドレスを検証することで、安全な送金を確保します。",
               "title": "セキュリティ"
             },
             "title": "免責事項"
@@ -449,7 +514,7 @@
         },
         "btcdirectWidget": {
           "disclaimer": {
-            "description": "私たちは、信頼できる欧州のブローカーであるBTC Directと提携し、BitBoxApp内で簡単に仮想通貨を購入できるようにしています。このサービスは、銀行振込、クレジットカード、その他多くの地域の支払い方法を利用して、ヨーロッパ全域でご利用いただけます。",
+            "description": "BitBoxApp では、信頼できるヨーロッパのブローカーである BTC Direct と提携し、暗号資産の売買を簡単に行えるようにしています。このサービスは、銀行振込、クレジットカード、その他多くの現地決済手段に対応しており、ヨーロッパ全域で利用可能です。",
             "kyc": {
               "description": "すべての取引には顧客の本人確認が必要です。セルフィー（自撮り）と、公的な書類の写真を撮影して提出してください。",
               "title": "本人確認"
@@ -457,15 +522,16 @@
             "paymentMethods": {
               "buy": "購入：EURで支払いを行うと、コインが直接BitBoxに送られます。一回限りの購入と定期購入のどちらかを選択できます。銀行振込の場合、BTC Directが資金を受け取った時点で為替レートが固定されます。即時決済方法では、一定時間固定された換算レートが適用されます。",
               "note": "注意：BTC Directの為替レートは、BitBoxAppのレートと若干異なる場合があります。",
-              "title": "支払い方法と手数料"
+              "sell": "売却：BTC Direct に暗号資産を送金すると、ユーロがあなたの銀行口座に振り込まれます。BTC Direct がコインを受け取った時点で、為替レートが確定します。",
+              "title": "お支払い方法と手数料"
             },
             "security": {
-              "description": "BTC Directは、BitBox02のセキュリティ脅威モデルの対象外となる外部サービスです。私たちはBTC Directと緊密に連携し、全体的なセキュリティの向上に努めています。",
-              "link": "BitBox02のセキュリティ脅威モデル",
+              "description": "BTC Direct は、BitBox のセキュリティ脅威モデルの対象外となる外部サービスです。ただし、私たちは BTC Direct と緊密に連携し、全体的なセキュリティの強化に取り組んでいます。",
+              "link": "BitBoxのセキュリティ脅威モデル",
               "title": "セキュリティ"
             },
-            "title_bitcoin": "BTC Directでビットコインを購入",
-            "title_crypto": "BTC Directで仮想通貨を購入"
+            "title_bitcoin": "BTC Directでビットコインを売買する",
+            "title_crypto": "BTC Direct で暗号資産を売買する"
           },
           "infobox": {
             "feesBuying": {
@@ -473,9 +539,13 @@
               "bankTransfer": "銀行振込、SEPA、iDEAL：{{fee}}%",
               "creditDebitCard": "クレジットカード、Cartes Bancaires：{{fee}}%",
               "sofort": "Sofort：{{fee}}%",
-              "title": "購入手数料"
+              "title": "購入時の手数料"
+            },
+            "feesSelling": {
+              "bankTransfer": "銀行振込手数料：{{fee}}%",
+              "title": "売却手数料"
             },
-            "intro": "EURを使ったヨーロッパでの仮想通貨購入",
+            "intro": "ヨーロッパでのユーロ建て暗号資産の売買",
             "payment": {
               "bancontact": "Bancontact",
               "bankTransfer": "銀行振込、SEPA Instant、iDEAL",
@@ -544,7 +614,8 @@
       "noExchanges": "申し訳ございませんが、この地域では利用可能な取引所はございません。",
       "region": "地域",
       "selectRegion": "指定なし",
-      "sell": "売却"
+      "sell": "売却",
+      "spend": "支払う"
     },
     "info": {
       "continue": "同意して続ける",
@@ -575,8 +646,8 @@
           "title": "データ保護"
         },
         "security": {
-          "descriptionGeneric_bitcoin": "パートナーの取引所経由でBitcoinを購入するとき、あなたは外部のサービスを利用しています。このサービスはBitBox02のセキュリティ脅威モデルの範囲外であり、BitBoxAppソフトウェアが動作している環境の安全性とセキュリティに依存しています。",
-          "descriptionGeneric_crypto": "パートナーの取引所経由で仮想通貨を購入するとき、あなたは外部のサービスを利用しています。このサービスはBitBox02のセキュリティ脅威モデルの範囲外であり、BitBoxAppソフトウェアが動作している環境の安全性とセキュリティに依存しています。",
+          "descriptionGeneric_bitcoin": "パートナー取引所を通じてビットコインを購入する場合、外部サービスを利用することになります。このサービスは BitBox のセキュリティ脅威モデルの対象外であり、BitBoxApp ソフトウェアが実行されている環境の安全性とセキュリティに依存します。",
+          "descriptionGeneric_crypto": "パートナー取引所を通じて暗号資産を購入する場合、外部サービスを利用することになります。このサービスは BitBox のセキュリティ脅威モデルの対象外であり、BitBoxApp ソフトウェアが実行されている環境の安全性とセキュリティに依存しています。",
           "link": "キュリティ脅威モデル",
           "title": "セキュリティモデル"
         },
@@ -620,8 +691,8 @@
   },
   "confirmOnDevice": "デバイス上で確認してください。",
   "connectKeystore": {
-    "promptNoName": "続行するには、BitBox02を接続してください",
-    "promptWithName": "\"{{name}}\" という名前のBitBox02を接続してください"
+    "promptNoName": "続行するには、BitBoxを接続してください",
+    "promptWithName": "\"{{name}}\" という名前のBitBoxを接続してください"
   },
   "darkmode": {
     "toggle": "ダークモード"
@@ -638,7 +709,7 @@
         "description": "マイクロSDカードのバックアップを作成するか確認してください。"
       },
       "showRecoveryWords": {
-        "description": "リカバリーワードを表示し、確認する。"
+        "description": "BitBoxの画面にリカバリーワードを表示し、確認します。"
       },
       "title": "バックアップ"
     },
@@ -681,11 +752,11 @@
         }
       },
       "factoryReset": {
-        "description": "デバイスを工場出荷時の設定にリセットしてください。これによって、BitBox02からウォレットが削除されます！",
+        "description": "デバイスを初期化します。これにより、BitBoxからウォレットが削除されます！",
         "title": "工場出荷時の設定にリセットします。"
       },
       "goToStartupSettings": {
-        "description": "BitBox02のブートローダーに入ります。ここからファームウェアハッシュを有効にすることができます。"
+        "description": "BitBox のブートローダーを起動します。ここからファームウェアハッシュを有効にできます。"
       },
       "passphrase": {
         "description": "パスフレーズ機能を有効または無効にします。",
@@ -708,7 +779,7 @@
       "attestation": {
         "false": "認証チェックに失敗しました",
         "label": "真贋チェック",
-        "true": "あなたのBitBox02は本物です"
+        "true": "あなたのBitBoxは本物です"
       },
       "sdcard": {
         "false": "挿入されていません",
@@ -719,6 +790,7 @@
       "title": "ハードウェア"
     },
     "loading": "デバイス情報を読込中…",
+    "noDevice": "デバイスが接続されていません",
     "secrets": {
       "manageBackups": "バックアップを管理",
       "title": "秘密"
@@ -747,10 +819,13 @@
     "wrongKeystore2": "オプションのパスフレーズを使用している場合、アカウントの正しいパスフレーズを入力していることを確認してください。"
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "支払いリクエストに想定外の通貨が含まれています",
+      "insufficientFunds": "選択されたアカウントの残高が不足しています。"
+    },
     "buySell": {
       "coinNotSupported": "このコインタイプにはオプションが利用できません。",
-      "regionNotSupported": "この地域ではオプションが利用できません。",
-      "updateNow": "今すぐ更新"
+      "regionNotSupported": "この地域ではオプションが利用できません。"
     },
     "pocket": {
       "terms": {
@@ -764,19 +839,19 @@
           "note": "注：Pocketの為替レートはBitBoxAppのレートと異なる場合があります。",
           "p1": "<strong>ビットコインの購入:</strong> SEPA銀行振込を使用してEURまたはCHFを送金すると、Pocketが振込を受け取った後、通常同日中にビットコインが直接BitBoxに送付されます。\n",
           "p2": "<strong>ビットコインの売却:</strong> ビットコインをPocketに送金し、登録済みの銀行口座でEURまたはCHFを受け取ります。為替レートは、Pocketがビットコインを受け取った時点で固定されます。",
-          "title": "支払い方法と手数料"
+          "title": "お支払い方法と手数料"
         },
         "kyc": {
           "link": "PocketのFAQを読む",
-          "p1": "1日あたり950ユーロ（1000スイスフラン）までの取引には、追加の書類は必要ありません。",
+          "p1": "30日間で 1000 ユーロ／スイスフランまでの取引であれば、追加書類は不要です。",
           "p2": "大口の金額の場合、KYC/AML手続きを完了するためにPocketとの通話が必要です。",
           "title": "KYC/AML（顧客確認 / マネーロンダリング防止）"
         },
         "security": {
-          "link": "BitBox02のセキュリティ脅威モデル",
-          "p1": "Pocketの利用は外部サービスであり、BitBox02のセキュリティ脅威モデルには含まれていません。ただし、全体的なセキュリティ向上のためにPocketと密接に協力しています。",
+          "link": "BitBoxのセキュリティ脅威モデル",
+          "p1": "Pocket の利用は外部サービスに該当し、BitBoxのセキュリティ脅威モデルの対象外です。ただし、私たちは Pocket と緊密に連携し、全体的なセキュリティの向上に取り組んでいます。",
           "p2": "<strong>ビットコインの購入:</strong> ビットコイン受取用アドレスを確認するためのメールが、別の通信手段で送信されます。",
-          "p3": "<strong>ビットコインの売却:</strong> BitBox02はビットコインの入金アドレスを暗号的に検証し、ハードウェアウォレットに「Pocket」と表示します。",
+          "p3": "<strong>ビットコインの売却時：</strong> BitBox はビットコインの入金アドレスを暗号的に検証し、ハードウェアウォレット上に「Pocket」と表示します。",
           "title": "セキュリティ"
         },
         "welcome": {
@@ -794,16 +869,36 @@
   "footer": {
     "appVersion": "アプリのバージョン："
   },
+  "gapLimit": {
+    "change": "おつりアドレスのギャップ制限",
+    "description": "ビットコインの受取アドレスとおつりアドレスのギャップ制限をカスタマイズできます",
+    "maxValue": "ギャップ制限は最大 {{max}} までです。",
+    "minValue": "ギャップ制限は {{min}} 未満には設定できません。",
+    "receive": "受取用アドレスに適用されるギャップ制限",
+    "title": "カスタムギャップ制限の設定"
+  },
   "generic": {
     "buy": "{{coinCode}}を購入」",
-    "buySell": "購入 & 売却",
+    "buySell": "マーケットプレイス（売買サービス）",
     "buy_bitcoin": "ビットコインを購入",
     "buy_crypto": "仮想通貨を購入",
+    "close": "閉じる",
     "enabled_false": "無効化",
     "enabled_true": "有効化",
+    "noOptionOnIos": "iOSでは利用できません",
+    "noOptions": "該当する選択肢が見つかりません",
+    "paymentRequestNote": "{{name}} の支払い（注文番号：{{orderId}}）",
     "receive": "{{coinCode}}を受け取る",
     "receive_bitcoin": "ビットコインを受け取る",
-    "receive_crypto": "仮想通貨を受け取る"
+    "receive_crypto": "仮想通貨を受け取る",
+    "resetToDefault": "初期設定に戻す",
+    "search": "検索…",
+    "searchButton": "検索する",
+    "sell": "{{coinCode}} を売却",
+    "sell_bitcoin": "Bitcoin を売却",
+    "sell_crypto": "暗号資産を売却",
+    "spend_bitcoin": "Bitcoin を使う",
+    "spend_crypto": "暗号資産を使う"
   },
   "genericError": "エラーが発生しました。問題が起きた場合はソフトウェアを再起動してください。",
   "goal": {
@@ -928,7 +1023,7 @@
         "link": {
           "text": "サポートされているコインを表示する"
         },
-        "text": "BitBoxAppは、Bitcoin、Litecoin、Ethereum、および一部のERC20トークンに対応しています。Cardanoやその他のトークンについては、AdaLiteやRabbyなどの別のソフトウェアとBitBox02を併用してください。対応しているすべてのコインの一覧は、当社のウェブサイトでご確認いただけます。",
+        "text": "BitBoxApp は、Bitcoin、Litecoin、Ethereum、および一部の ERC20 トークンに対応しています。Cardano やその他のトークンを利用する場合は、AdaLite や Rabby などの代替ソフトウェアと組み合わせて BitBox をご利用ください。対応しているすべてのコインの一覧は、当社のウェブサイトでご確認いただけます：",
         "title": "どのコインに対応していますか？"
       },
       "whatAreAccounts": {
@@ -936,7 +1031,7 @@
         "title": "アカウントとは何ですか？"
       },
       "whatIsRememberWallet": {
-        "text": "「ウォレットを記憶する」を有効にすると、BitBox02が接続されていない状態でもBitBoxAppでこのウォレットのアカウントを表示できます。これにより、いつでも残高とポートフォリオを確認できます。ただし、コインを送受信するには、BitBox02を接続し、ロックを解除する必要があります。\n\n「ウォレットを記憶する」を無効にすると、該当するBitBox02（またはパスフレーズウォレット）をBitBoxAppでアカウントを表示するために接続する必要があります。\n",
+        "text": "「ウォレットを記憶する」を有効にすると、BitBox を接続していない状態でも BitBoxApp 上でそのウォレットのアカウントを表示できます。これにより、いつでも残高やポートフォリオを確認できます。ただし、コインの送受信には BitBox を接続し、ロック解除する必要があります。\n\n「ウォレットを記憶する」を無効にしている場合は、BitBox（またはパスフレーズウォレット）を接続しないと、該当するアカウントを BitBoxApp 上で表示できません。\n",
         "title": "「ウォレットを記憶する」を有効／無効にするとどうなりますか？"
       },
       "whyIsThisUseful": {
@@ -946,7 +1041,9 @@
     },
     "appendix": {
       "link": "ご連絡ください！",
-      "text": "他にも質問がありますか？"
+      "questionService": "{{serviceName}} に関してお困りですか？",
+      "text": "他にも質問がありますか？",
+      "textService": "{{serviceName}} に関する問題は、直接お問い合わせください："
     },
     "backups": {
       "check": {
@@ -1035,12 +1132,12 @@
         "link": {
           "text": "真贋チェックの詳細はこちら"
         },
-        "text": "BitBoxAppは、デバイスが本物であることを確認するために、BitBox02に対して認証チェックを実行します。このチェックはローカルで行われ、サーバーには接続しません。",
+        "text": "BitBoxApp は BitBox に対して証明チェック（アテステーション）を行い、デバイスが正規品であるかを検証します。このチェックはローカルで実行され、外部サーバーへの接続は行われません。",
         "title": "真贋チェックはどのように行われるのですか？"
       },
       "name": {
         "text": "これはあなたのウォレットとバックアップの名前です。この名前は将来のバックアップに使われ、異なるウォレットを区別するのに役立つことがあります。いつでも変更することができますが、変更前に作成したバックアップは以前の名前を使用し続けることに注意してください。",
-        "title": "BitBox02の名前は何に使われているのですか？"
+        "title": "BitBoxの名前は何に使われているのですか？"
       },
       "secure-chip": {
         "link": {
@@ -1056,7 +1153,7 @@
       "accountSummary": "アカウント概要ガイド",
       "advancedSettings": "詳細設定ガイド",
       "appearance": "アピアランスガイド",
-      "buySell": "購入＆売却ガイド",
+      "buySell": "マーケットプレイスガイド",
       "insurance": "インシュアランスガイド",
       "manageAccount": "アカウント管理ガイド",
       "manageDevice": "デバイス管理ガイド",
@@ -1078,7 +1175,7 @@
         "title": "\"アドレスタイプを変更\"はいつ使用しますか？」という質問に対する回答は次のとおりです："
       },
       "howVerify": {
-        "text": "BitBox01については、左側のサイドバーにあるBitBoxアイコンをクリックし、「ペアリング」セクションを参照してください。ガイドが更新され、そこから指示に従って続行することができます。\nBitBox02では、送受信プロセス中にデバイス上で直接アドレスを確認することができます。",
+        "text": "送金や受取の際に、BitBox 上でアドレスを直接確認できます。",
         "title": "安全にアドレスを検証するにはどうすればいいですか？"
       },
       "plugout": {
@@ -1094,7 +1191,7 @@
         "title": "なぜこんなにたくさんのアドレスが存在するのですか？"
       },
       "whyVerify": {
-        "text": "コンピュータが本物のアドレスを生成して表示することを信用してはいけません。攻撃対象が大きいので、ハードウェアウォレットよりもかなり脆弱です。BitBox01の場合、アドレスを確認するボタンは、ペアリングされた携帯電話にアドレスを安全に送信し、そこからQRコードをスキャンして確認することもできます。BitBox02の場合は、BitBox02のディスプレイ上で直接アドレスを確認することができます。",
+        "text": "正当なアドレスの生成や表示をパソコンに任せるべきではありません。パソコンは攻撃対象領域（アタックサーフェス）が広いため、ハードウェアウォレットと比べてはるかに脆弱です。アドレスは BitBoxの画面で直接確認できます。",
         "title": "なぜ安全にアドレスを検証したほうがいいのですか？"
       }
     },
@@ -1202,12 +1299,19 @@
         "title": "デバイスを紛失してしまったのですが？"
       },
       "useWithoutDevice": {
-        "text": "残念ながら現段階では使用できません。",
+        "text": "はい、アカウント管理設定でウォレットを記憶させることができます。これにより、BitBox を接続せずにポートフォリオを確認できます。",
         "title": "アプリをデバイスなしでも使用することができますか？"
       },
       "welcome": {
         "text": "スイスのShift Cryptoにより開発されたこのアプリをご使用いただきありがとうございます。現在はまだベータ版となっているため、使い勝手においての不明点・お気付きの点などのご連絡をいただけると幸いです。",
         "title": "BitBoxAppにようこそ！"
+      },
+      "worksWithIos": {
+        "link": {
+          "text": "BitBox02 Nova を注文する"
+        },
+        "text": "iOS に対応しているのは BitBox02 Nova のみです。通常版の BitBox02 は、それ以外のすべてのプラットフォームで使用できます。BitBox02 Nova の購入をご希望の方は、当社オンラインショップをご覧ください。",
+        "title": "iOS で使える BitBox はどれですか？"
       }
     },
     "walletConnect": {
@@ -1253,7 +1357,7 @@
   },
   "loading": "ロード中…",
   "manageAccounts": {
-    "accountHidden": "このアカウントは、閲覧専用アカウントから非表示にされています。再度表示するには、BitBox02を接続してください。",
+    "accountHidden": "このアカウントは、ウォッチ専用アカウントから非表示になっています。再び表示するには、BitBoxを接続してください。",
     "editAccount": "編集",
     "editAccountNameTitle": "アカウント名を編集する",
     "noAccounts": "アカウントが見つかりません",
@@ -1325,7 +1429,7 @@
           "title": "ウォレットが保存されました"
         },
         "name": "ウォレットを記憶する",
-        "warning": "これで記憶していたウォレットが削除されます。再び表示するには、このウォレットの ためにBitBox02 を接続する必要があります。このウォレット内のコインは影響を受けません。続行しますか？\n",
+        "warning": "この操作により、記憶されたウォレットが削除されます。再び表示するには、このウォレットに対応する BitBoxを接続する必要があります。ウォレット内のコインには影響しません。続行しますか？\n",
         "warningTitle": "ウォレットを記憶しない"
       },
       "toggleSats": {
@@ -1344,16 +1448,30 @@
     "newTxs_one": "{{accountName}} での新しい取引",
     "newTxs_other": "{{accountName}}に{{count}}件の新しい取引があります"
   },
+  "novaConnectionIssues": {
+    "connectionIssueTips": "接続トラブル対処のヒント",
+    "description1": "iOS に対応しているのは BitBox02 Nova のみです。通常の BitBox02 は、Windows、macOS、Android、または Linux でご利用ください。BitBox02 Nova のご購入は、当社オンラインショップから可能です：",
+    "description2": "画面が点灯しない場合は、デバイスに電源が入っていない可能性があります。",
+    "description3": "BitBox02 Nova は iPhone または iPad の近くに置いてください。できるだけ直接デバイスに接続することをおすすめします。",
+    "description4": "BitBox02 Nova は iOS と Bluetooth で接続します。他のプラットフォームでは、BitBoxApp の設定から Bluetooth をオン／オフにできます。",
+    "link1": "BitBox02 Nova を注文する",
+    "link2": "サポートへお問い合わせ",
+    "stillHavingIssues": "まだ問題は解決していませんか？",
+    "title1": "iOS では BitBox02 Nova のみをご使用ください",
+    "title2": "BitBox02 Nova の電源が入っていることを確認してください",
+    "title3": "BitBox02 Nova をデバイスの近くに置いてください",
+    "title4": "BitBox02 Nova の Bluetooth がオフになっていないか確認してください"
+  },
   "passphrase": {
     "considerations": {
       "button": "バックアップについて",
-      "message": "パスフレーズは、あなたのウォレットのバックアップ（マイクロSDカードまたはリカバリーワード）に保護の層を追加します。誰かがあなたのバックアップにアクセスできる場合、あなたのウォレットにアクセスするためにもパスフレーズが必要になります。\n\nしかし、これはあなたがBitBox02を失ったり壊したりした場合、パスフレーズを有効にしたウォレットを復元するためには<strong>パスフレーズ + ウォレットのバックアップ</strong>の両方が必要になることを意味します。パスフレーズを忘れたり失ったりすると、そのウォレットの全てのコインにアクセスできなくなります。\n\nパスフレーズを保存する際には、バックアップとは別の場所に置くことを検討してください。そのようにすると、誰かがあなたのバックアップを見つけてもパスフレーズは見つけられないでしょう。",
+      "message": "パスフレーズは、ウォレットのバックアップ（microSD カードまたはリカバリーフレーズ）に対する追加の保護層として機能します。\n誰かがあなたのバックアップにアクセスした場合でも、ウォレットにアクセスするにはパスフレーズも必要になります。\n\nただしこれは、BitBox を紛失したり故障したりした場合に、<strong>パスフレーズとウォレットのバックアップ<strong>の両方がなければ、パスフレーズ対応のウォレットを復元できないことも意味します。パスフレーズを忘れたり失ったりすると、そのウォレットに保管されているすべてのコインにアクセスできなくなります。\n\nパスフレーズを保管する際は、バックアップとは別の場所に保存することを検討してください。そうすることで、誰かがバックアップを見つけてもパスフレーズまでは見つけられないようにできます。",
       "title": "バックアップについて"
     },
     "disable": "パスフレーズを無効にする",
     "disableInfo": {
       "button": "無効にする",
-      "message": "パスフレーズを無効にした後、BitBox02のロックを解除した後でパスフレーズを入力するよう求められることはもうありません。したがって、デフォルトのウォレットを入力することになります。\n\nパスフレーズウォレット上のコインはそのまま残りますが、BitBox02のロックを解除した後はデフォルトのウォレットが開くため、アクセスできなくなります。\n\n再度パスフレーズウォレットにアクセスするには、単にパスフレーズ機能を再有効にし、BitBox02のロックを解除した後に関連するパスフレーズを入力します。\n\n<strong>ヒント:</strong>パスフレーズを空白にすることで、元のウォレットに依然として入ることができます。"
+      "message": "パスフレーズを無効にすると、BitBox のロック解除後にパスフレーズの入力は求められなくなります。そのため、デフォルトのウォレットに入ることになります。\n\nパスフレーズ付きウォレットのコインは引き続きそのウォレットに存在しますが、BitBox を解除したあとはデフォルトウォレットが開かれるため、アクセスできなくなります。\n\n再びパスフレーズ付きウォレットにアクセスするには、パスフレーズ機能を再度有効にし、BitBox のロック解除後に該当のパスフレーズを入力してください。\n\n<strong>Tip:</strong> パスフレーズを空欄のままにすることで、元のデフォルトウォレットにアクセスできます。"
     },
     "enable": "パスフレーズを有効にする",
     "error": {
@@ -1361,7 +1479,7 @@
     },
     "how": {
       "button": "どのようなものか",
-      "message": "パスフレーズは、あなたが普段使っているパスワードとは異なります。パスフレーズを間違って入力しても、通知はされません。これは、<strong>すべてのパスフレーズが異なる、しかしそれでも有効なウォレットを作成する</strong>からです。これは、あなたが望むだけの多くのウォレットに対して複数のパスフレーズを使用できることを意味します。しかし、各ウォレットは対応するパスフレーズを入力したときにのみアクセスできます。\n\nBitBox02を接続すると、通常どおりデバイスのパスワードが求められます。その後、デバイス上でパスフレーズを入力するよう求められます。\n\nパスフレーズを入力した後、入力したパスフレーズが表示されます。これは、あなたが正しく入力したことを確認するためです。",
+      "message": "パスフレーズは、一般的なパスワードのようには機能しません。入力ミスをしても通知はされません。これは、<strong>すべてのパスフレーズが、それぞれ異なる正当なウォレットを生成するため</strong>です。\nつまり、複数のパスフレーズを使って、いくつでもウォレットを作成できます。ただし、それぞれのウォレットには、対応するパスフレーズを正しく入力しないとアクセスできません。\n\nBitBoxを接続すると、まず通常どおりデバイスパスワードの入力が求められます。その後、パスフレーズの入力が求められます。\n\nパスフレーズを入力すると、その内容が画面に表示されます。これは、入力した内容に誤りがないか確認できるようにするためです。",
       "title": "どのような仕組みになっているのか"
     },
     "intro": {
@@ -1378,15 +1496,15 @@
     },
     "successDisabled": {
       "message": "オプションのパスフレーズ <strong>successfully enabled</strong>！\n今後、パスフレーズの入力が求められます。",
-      "messageEnd": "今すぐBitBox02を再接続してください。",
+      "messageEnd": "BitBoxを再接続してください。",
       "title": "パスフレーズを有効にする"
     },
     "successEnabled": {
       "message": "オプションのパスフレーズは<strong>正常に無効化されました</strong>！\n\nパスフレーズの入力を求められることはなくなりました。",
-      "messageEnd": "今すぐあなたのBitBox02を再接続してください。",
+      "messageEnd": "BitBoxを再接続してください。",
       "tips": "ヒント",
       "tipsList": [
-        "まず少額をパスフレーズウォレットに送金することをおすすめします。その後、BitBox02を抜き差しし、パスワードとパスフレーズを入力します。パスフレーズを正しく入力した場合、ウォレットにコインが表示されます。",
+        "まず、パスフレーズ付きウォレットに少額を送金することをおすすめします。その後、BitBoxをいったん取り外してから再接続し、パスワードとパスフレーズを入力してください。\nパスフレーズが正しく入力されていれば、ウォレット内にコインが表示されるはずです。",
         "パスフレーズなしで元のウォレットに入りたい場合、パスフレーズの入力を求められたときに何も入力しないことでパスフレーズを入力することができます。また、パスフレーズ機能を無効にすることもできます。"
       ],
       "title": "パスフレーズ無効"
@@ -1404,12 +1522,12 @@
     },
     "what": {
       "button": "この仕組みについてはこちら",
-      "message": "ウォレットは非常に大きなランダムな数値（シードとも呼ばれる）から作成（派生）されます。このシードはBitBox02を初めて設定したときに作成され、マイクロSDカードまたはリカバリーワードでバックアップされます。シードにアクセスできる人は、そのウォレットの資金を完全にコントロールすることができます。\n\nパスフレーズは、シードに追加される<strong>オプションの秘密</strong>です。パスフレーズを使用すると、各パスフレーズはシード + パスフレーズ（オプションの秘密）に基づいた新しいウォレットを作成します。パスフレーズは何でもよいです：文字、単語、特殊文字、または空でも可能です。デフォルトのウォレットは実際にはシード + 空のパスフレーズから派生します。\n\nパスフレーズはBIP39標準の一部であり、これは同じ標準をサポートするすべてのウォレットと互換性があることを意味します。",
+      "message": "ウォレットは、非常に大きなランダムな数（シード）から作成（導出）されます。\nこのシードは、BitBox を初期設定する際に生成され、microSD カードまたはリカバリーフレーズによってバックアップされます。\nシードにアクセスできる人は、そのウォレットの資金を完全に管理することができます。\n\nパスフレーズは、シードに追加される<strong>任意の秘密情報</strong>です。パスフレーズを使用する場合、シード + パスフレーズ（任意の秘密）の組み合わせに基づいて、新しいウォレットが生成されます。\nパスフレーズには、文字、単語、記号など何を使ってもよく、空欄でも構いません。デフォルトのウォレットは、実際には「シード + 空のパスフレーズ」から導出されています。\n\nパスフレーズは BIP39 規格の一部であり、この仕様に対応したすべてのウォレットと互換性があります。",
       "title": "パスフレーズとは何ですか？"
     },
     "why": {
       "button": "パスフレーズを使用する理由",
-      "message": "BitBox02は、デバイス自体からのシードの抽出を防ぎますが、バックアップ（マイクロSDカードまたはリカバリーワード）はウォレットへの完全なアクセスを提供します。そのため、それは安全な場所に保存するべきです！\n\nパスフレーズが既存のシードを使用して新しいウォレットを作成するため、パスフレーズウォレットの復元には<strong>バックアップとパスフレーズの両方が必要</strong>です。これの利点は、誰かがあなたのバックアップを見つけても、パスフレーズウォレットにアクセスするためにはパスフレーズが必要であるということです。\n\nさらに、パスフレーズ機能を使用すると、同じデバイス上に複数のウォレットを作成したり、デフォルトのものに加えて「隠されたウォレット」を作成したりすることができます。",
+      "message": "BitBox は、シードがデバイス本体から抽出されるのを防ぎますが、バックアップ（microSD カードまたはリカバリーフレーズ）にはウォレットへの完全なアクセス権があります。\nそのため、バックアップは安全な場所に保管する必要があります。\n\nパスフレーズは既存のシードを使って新しいウォレットを生成するため、パスフレーズ対応ウォレットを復元するには、<strong>バックアップとパスフレーズの両方が必要</strong>です。この仕組みにより、誰かがバックアップを見つけたとしても、パスフレーズがなければそのウォレットにアクセスすることはできません。\n\nさらに、パスフレーズ機能を使えば、同じデバイス上に複数のウォレット、あるいはデフォルトウォレットに加えて「隠しウォレット」を作成することも可能です。",
       "title": "なぜパスフレーズを使うのですか？"
     }
   },
@@ -1420,10 +1538,6 @@
       "paste": "貼り付けを行うには「{{label}}を表示」を有効にしてください"
     }
   },
-  "random": {
-    "button": "乱数を生成する",
-    "description": "あなたのBitBoxは次の{{bits}}bit乱数を生成しました："
-  },
   "receive": {
     "bitsuranceWarning": "これは保険のかかったアカウントであり、Native Segwitへの入金のみが許可されています。これはWrapped SegwitやTaprootへ誤って入金しないようにするための措置です。これらは保険の対象外です。",
     "changeScriptType": "アドレスの種類を変更する",
@@ -1442,7 +1556,7 @@
     "taprootWarning": "注意：Taprootは新しいビットコインの機能であり、まだ広く採用されていません。Taprootアドレスで受け取った資金は、サードパーティのwatch-only ウォレットでは表示されない場合があります。多くのウォレットと取引所はまだTaprootアドレスに送金することができません。",
     "title": "受け取る{{accountName}}",
     "verify": "安全にアドレスを検証する",
-    "verifyBitBox02": "BitBox02のアドレスを確認する",
+    "verifyBitBox02": "BitBoxでアドレスを確認",
     "verifyInstruction": "下記アドレスがデバイス画面に表示されているものと一致することを確認してください。"
   },
   "reset": {
@@ -1530,7 +1644,7 @@
       "title": "アウトプットから送信します。"
     },
     "confirm": {
-      "infoMessage": "BitBox02で金額とアドレスが正しいか慎重に確認してください。",
+      "infoMessage": "金額とアドレスが正しいことを BitBox上でよく確認してください。",
       "selected-coins": "選択されたコイン",
       "title": "トランザクションの確認と送信",
       "to": "To",
@@ -1538,7 +1652,7 @@
     },
     "edit": "取引内容を変更",
     "error": {
-      "erc20InsufficientGasFunds": "このERC20トランザクションの手数料を支払うために十分なイーサがないようです。ウォレットに十分なイーサが保有されているか確認してください。",
+      "erc20InsufficientGasFunds": "この ERC20 トランザクションを実行するのに十分な Ether（ETH）が不足しています。ウォレットに Ether を追加してから、もう一度お試しください。",
       "feeTooLow": "手数料が低すぎます。",
       "feesNotAvailable": "手数料を見積もることができませんでした。",
       "insufficientFunds": "資金が不十分です",
@@ -1595,7 +1709,7 @@
     "scanQRNoCameraMessage": "カメラが見つかりません。デバイスがカメラをサポートしていること、および許可が正しく設定されていることを確認してください。",
     "success": "取引は署名され送信されました。",
     "title": "{{accountName}}送信する。",
-    "toggleCoinControl": "コインコントロールの切り替え",
+    "toggleCoinControl": "コインコントロール",
     "transactionDetails": "トランザクションの詳細"
   },
   "settings": {
@@ -1656,6 +1770,7 @@
       "up-to-date": "お使いのアプリは最新版です。",
       "version": "アプリのバージョン"
     },
+    "more": "その他",
     "notes": {
       "export": {
         "description": "取引メモとアカウント名のバックアップを作成します。",
@@ -1703,6 +1818,33 @@
       "title": "成功"
     }
   },
+  "testWallet": {
+    "connect": {
+      "description": "Testnetでデバイスを使わずにテストできるソフトウェアテスト用ウォレット",
+      "title": "テスト用ウォレット"
+    },
+    "disconnect": {
+      "description": "ソフトウェアテスト用ウォレットを削除します",
+      "title": "テスト用ウォレットの接続を解除"
+    },
+    "prompt": {
+      "button": "解除",
+      "passwordLabel": "テスト用パスワード",
+      "title": "テスト用ウォレットのロックを解除する"
+    }
+  },
+  "testnet": {
+    "activate": {
+      "description": "機能を検証・確認するには、テストネットモードでアプリを再起動してください。",
+      "prompt": "テストネットモードに切り替えるには、アプリを終了してからもう一度起動してください。",
+      "title": "テストネットモードを開始"
+    },
+    "deactivate": {
+      "description": "テストネットモードを終了するには、アプリをいったん終了し、再起動してください。",
+      "prompt": "テストネットモードを終了するには、アプリを終了してください。",
+      "title": "テストネットモードを終了"
+    }
+  },
   "transaction": {
     "confirmation": "認証済み",
     "details": {
@@ -1722,6 +1864,7 @@
     "fee": "手数料",
     "fiatHistorical": "Historical",
     "gas": "Gas",
+    "no-results": "{{searchTerm}}」に一致する取引は見つかりませんでした",
     "note": {
       "edit": "ノートを編集する",
       "save": "ノートを保存する"
@@ -1825,13 +1968,15 @@
   },
   "warning": {
     "coincontrol": "1つ以上のUTXOに再利用されたアドレスがあります。受信者はそれらのアドレスに関連するすべてのUTXOを確認できます。",
+    "offline": "現在オフラインのため、取引の送信や最新の為替レートの確認はできません。",
     "sdcard": "バックアップを管理したい場合を除き、BitBoxとマイクロSDカードを別々に保管してください。",
-    "testnet": "警告：現在、ウォレットをTestnetモードで使用しています。このモードでの取引や残高は実際のものではなく、メインネットには反映されません。Testnetは、テストおよび開発目的でのみ使用されることを意図しています。"
+    "testnet": "現在、Testnet モードを使用しています。このモードでのトランザクションやコインは実際のものではなく、金銭的な価値もありません。テスト目的のみに使用してください。"
   },
   "welcome": {
-    "connect": "BitBox02を接続する",
-    "getStarted": "BitBox02にファームウェアをインストールして始めましょう。",
+    "connect": "BitBox を接続してください",
+    "getStarted": "BitBox にファームウェアをインストールして、はじめましょう。",
     "loadingAccounts": "アカウントを読み込み中",
+    "message": "BitBox を接続し、本体の側面をタップして続行してください。",
     "title": "ようこそ"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/ms/app.json b/frontends/web/src/locales/ms/app.json
index 4ebb7eeec3..617d1e0edc 100644
--- a/frontends/web/src/locales/ms/app.json
+++ b/frontends/web/src/locales/ms/app.json
@@ -370,8 +370,8 @@
   "bootloader": {
     "button": "Naik taraf Firmware sekarang",
     "button_install": "Pasang firmware sekarang",
-    "progress": "Menaiktaraf: {{progress}}%",
-    "progress_install": "Memasang: {{progress}}%",
+    "progress": "Menaiktaraf",
+    "progress_install": "Memasang",
     "success": "Naik taraf berjaya! Sila pasang ulang peranti. Kali ini, jangan sentuh butang."
   },
   "button": {
@@ -758,8 +758,7 @@
   "exchange": {
     "buySell": {
       "coinNotSupported": "Tiada pilihan tersedia untuk jenis syiling ini.",
-      "regionNotSupported": "Tiada pilihan tersedia untuk wilayah ini.",
-      "updateNow": "Kemas kini sekarang"
+      "regionNotSupported": "Tiada pilihan tersedia untuk wilayah ini."
     },
     "pocket": {
       "terms": {
@@ -1454,10 +1453,6 @@
       "paste": "untuk menampal teks, aktifkan \"SHOW {{label}}\""
     }
   },
-  "random": {
-    "button": "Menjana Nombor Rawak",
-    "description": "BitBox anda telah menjana nombor rawak {{bits}}-bit berikut:"
-  },
   "receive": {
     "bitsuranceWarning": "Ini ialah akaun yang diinsuranskan, bermakna ia hanya boleh menerima kepada Native Segwit. Ini supaya anda tidak menerima secara tidak sengaja kepada Wrapped Segwit atau Taproot, yang tidak diinsuranskan.",
     "changeScriptType": "Tukar jenis alamat",
@@ -1897,4 +1892,4 @@
     "message": "Sila sambungkan BitBox anda dan ketik bahagian tepi untuk meneruskan.",
     "title": "Selamat datang"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/nl/app.json b/frontends/web/src/locales/nl/app.json
index 74d87d696c..f6aecc181e 100644
--- a/frontends/web/src/locales/nl/app.json
+++ b/frontends/web/src/locales/nl/app.json
@@ -1,7 +1,11 @@
 {
   "account": {
+    "account": "Account",
+    "accounts": "Accounts",
+    "backupReminder": "Je wallet <strong>{{name}}</strong> is meer dan {{fiat}} {{threshold}} waard!\n\nWe raden je aan een papieren backup te maken voor extra veiligheid. Het is makkelijk en snel.",
+    "backupReminderLink": "Papieren backup maken",
     "disconnect": "Verbinding verbroken. Opnieuw aan het verbinden...",
-    "export": "Exporteren",
+    "export": "Transacties exporteren",
     "exportTransactions": "Transacties als CSV bestand naar de downloads map exporteren",
     "fatalError": "Er is een onverwachte fout opgetreden",
     "incoming": "Binnenkomend",
@@ -45,6 +49,7 @@
     "fiatBalance": "Fiat balans",
     "name": "Accountnaam",
     "noAccount": "Er zijn geen accounts om weer te geven",
+    "portfolio": "Portfolio",
     "subtotalWithCoinName": "Totaal ({{coinName}})",
     "title": "Mijn portfolio",
     "total": "Totaal",
@@ -80,7 +85,7 @@
     "labelAddress": "Adres",
     "labelMessage": "Bericht",
     "reverifyInfoText": "Adres verifiëren",
-    "signing": "Onderteken het bericht op je BitBox02 om door te gaan",
+    "signing": "Onderteken het bericht op je BitBox om door te gaan",
     "success": {
       "message": "Ga door op {{host}}",
       "title": "Adres verzonden"
@@ -94,6 +99,8 @@
   },
   "auth": {
     "authButton": "Inloggen\n",
+    "dismissButton": "Annuleren",
+    "missing": "Stel in de instellingen van je apparaat een schermbeveiliging in",
     "title": "Log in om door te gaan"
   },
   "backup": {
@@ -128,6 +135,7 @@
     "description": "Selecteer <strong>wallet backup bestand</strong>",
     "insert": "Voer de microSD kaart in om je backups te beheren",
     "insertButton": "Ik heb de microSD kaart ingevoerd",
+    "link": "Ga naar backups beheren",
     "list": "Jouw microSD kaart backups",
     "noBackups": "Er zijn geen backups op deze microSD kaart aanwezig.",
     "restore": {
@@ -160,7 +168,7 @@
     "abort": "Terug - doe de update niet",
     "abort_noUpgrade": "Breng me terug",
     "additionalUpgradeFollows1": "Een tweede upgrade zal direct na deze volgen.",
-    "additionalUpgradeFollows2": "Houd je BitBox02 aangesloten tot alle upgrades voltooid zijn",
+    "additionalUpgradeFollows2": "Houd je BitBox aangesloten tot alle upgrades voltooid zijn",
     "advanced": {
       "label": "Geavanceerde instellingen",
       "toggleShowFirmwareHash": "Toon de firmware hash iedere keer tijdens het opstarten"
@@ -169,8 +177,8 @@
     "orientation": "Tekst op je BitBox ondersteboven?",
     "success": "Upgrade voltooid! ",
     "success_install": "Installatie voltooid! ",
-    "upgradeTitle": "BitBox02 firmware aan het upgraden",
-    "upgradeTitle_install": "BitBox02 firmware aan het installeren"
+    "upgradeTitle": "BitBox firmware aan het upgraden",
+    "upgradeTitle_install": "BitBox firmware aan het installeren"
   },
   "bitbox": {
     "error": {
@@ -180,26 +188,33 @@
     }
   },
   "bitbox02Interact": {
-    "confirmDate": "Bevestig de huidige datum op je BitBox02",
+    "confirmDate": "Bevestig de huidige datum op je BitBox",
     "confirmDateText": "Deze datum wordt gebruikt om je backup te maken.",
-    "confirmName": "Bevestig naam op je BitBox02",
-    "confirmWords": "Schrijf de {{amount}}",
+    "confirmName": "Bevestig naam op je BitBox",
+    "confirmWords": "Schrijf de {{amount}} herstelwoorden van je BitBox op",
     "confirmWordsText": "Hierna vraagt de BitBox je om ieder woord te bevestigen zodat je zeker weet dat de backup correct is.",
-    "followInstructions": "Volg de instructies op je BitBox02",
-    "followInstructionsMnemonic": "Volg de instructies op je BitBox02 om te herstellen met je herstelwoorden.",
+    "followInstructions": "Volg de instructies op je BitBox",
+    "followInstructionsMnemonic": "Volg de instructies op je BitBox om te herstellen met je herstelwoorden.",
     "followInstructionsMnemonicTitle": "Met herstelwoorden herstellen"
   },
   "bitbox02Settings": {
+    "bluetoothToggleEnabled": {
+      "alertDisabled": "De bluetooth van je BitBox is nu uitgeschakeld. Als je in de toekomst met een iPhone wilt verbinden, zul je het opnieuw aan moeten zetten.",
+      "alertEnabled": "Bluetooth is nu ingeschakeld",
+      "description": "Bluetooth wordt nu gebruikt om met iPhones te verbinden",
+      "titleDisabled": "Bluetooth inschakelen",
+      "titleEnabled": "Bluetooth uitschakelen"
+    },
     "deviceName": {
       "current": "Huidige naam",
       "error": "Het is niet gelukt de naam in te stellen.",
       "error_104": "Het instellen van de naam is afgebroken door de BitBox.",
-      "input": "BitBox02 naam",
+      "input": "BitBox naam",
       "placeholder": "Nieuwe naam",
-      "title": "BitBox02 naam instellen"
+      "title": "BitBox naam instellen"
     },
     "gotoStartupSettings": {
-      "description": "",
+      "description": "Dit start je BitBox opnieuw op om om de opstartinstellingen te kunnen wijzigen.",
       "title": "Ga naar opstartinstellingen"
     }
   },
@@ -209,7 +224,7 @@
       "outOfDate": "Er is een firmware update nodig",
       "seed12WordInfo": "De hoeveelheid woorden kan niet veranderd worden nadat je de wallet hebt aangemaakt.",
       "seed12WordLabel": "Seed met 12 ipv 24 herstelwoorden aanmaken",
-      "seed12WordText": "De BitBox maakt standaard een backup met 24 herstelwoorden aan. Backups met zowel 12 als 24 woorden zijn in de praktijk veilig tegen \"brute force\" aanvallen. ",
+      "seed12WordText": "De BitBox maakt standaard een backup met 24 herstelwoorden aan. Backups met zowel 12 als 24 woorden zijn in de praktijk veilig tegen \"brute force\" aanvallen. Sommige gebruikers vinden een backup met 12 woorden makkelijker.",
       "skipSDCardLabel": "MicroSD backup overslaan en herstelwoorden opschrijven",
       "skipSDCardText": "Je hebt altijd de mogelijkheid om via de instellingen alsnog een microSD- of herstelwoord-backup te maken.",
       "title": "Geavanceerde backup-opties"
@@ -219,14 +234,14 @@
       "point1": "Selecteer een backup op de microSD kaart",
       "point2": "Stel een wachtwoord in voor je apparaat",
       "restoreText": "Ok, laten we een backup herstellen!",
-      "text1": "Je BitBox02 wachtwoord is ingesteld en je wallet is aangemaakt. Nu gaan we je eerste backup instellen. Zorg dat je microSD kaart is ingevoerd in de BitBox02 en ga verder.",
+      "text1": "Je BitBox wachtwoord is ingesteld en je wallet is aangemaakt. Nu gaan we je eerste backup instellen. Zorg dat je microSD kaart is ingevoerd in de BitBox en ga verder.",
       "text2": "Volg de instructies op je BitBox om een backup te maken.",
-      "text3": "Verwijder de microSD kaart en sla hem op in een <strong>veilige locatie</strong> nadat je backup is aangemaakt. De inhoud van de microSD kaart is niet beveiligd met een wachtwoord. Voer je microSD kaart nooit in een ander apparaat dan je BitBox02 in.",
+      "text3": "Verwijder de microSD kaart en sla hem op in een <strong>veilige locatie</strong> nadat je backup is aangemaakt. De inhoud van de microSD kaart is niet beveiligd met een wachtwoord. Voer je microSD kaart nooit in een ander apparaat dan je BitBox in.",
       "userConfirmation1": "Ik zal mijn backup in een veilige locatie opslaan.",
       "userConfirmation2": "Mijn backup is niet beveiligd met een wachtwoord. Iedereen die er toegang tot heeft, heeft toegang tot mijn wallet.",
-      "userConfirmation3": "Als ik mijn BitBox02 verlies of beschadig, is de backup mijn enige manier om weer toegang tot mijn wallet te krijgen.",
-      "userConfirmation4": "Als ik mijn BitBox02 én mijn backup verlies of beschadig, is mijn wallet permanent verloren.",
-      "userConfirmation5": "Ik moet mijn microSD kaart niet in een computer, telefoon, printer of ieder ander apparaat dan een BitBox02 invoeren.",
+      "userConfirmation3": "Als ik mijn BitBox verlies of beschadig, is de backup mijn enige manier om weer toegang tot mijn wallet te krijgen.",
+      "userConfirmation4": "Als ik mijn BitBox én mijn backup verlies of beschadig, is mijn wallet permanent verloren.",
+      "userConfirmation5": "Ik moet mijn microSD kaart niet in een computer, telefoon, printer of ieder ander apparaat dan een BitBox invoeren.",
       "userConfirmation5mnemonic": "Ik snap dat ik mijn herstelwoorden NOOIT in een computer, telefoon, printer of ieder ander apparaat dat geen BitBox is moet invoeren"
     },
     "create": {
@@ -248,7 +263,7 @@
       "failed": "Koppeling niet bevestigd. Plug je BitBox opnieuw in.",
       "paired": "Je hebt de volgende code op je BitBox bevestigd. Klik om door te gaan.",
       "title": "Verifieer koppelcode",
-      "unpaired": "Er is een nieuwe BitBox02 gedetecteerd. Controleer dat onderstaande code overeenkomt met wat er op je BitBox staat"
+      "unpaired": "Er is een nieuwe BitBox gedetecteerd. Controleer dat onderstaande code overeenkomt met wat er op je BitBox staat"
     },
     "restoreFromMnemonic": {
       "e104": "Het herstellen is afgebroken",
@@ -264,7 +279,7 @@
       "title": "Backup hersteld!"
     },
     "stepConnected": {
-      "unlock": "Voer je BitBox02 wachtwoord in om te ontgrendelen."
+      "unlock": "Voer je BitBox wachtwoord in om te ontgrendelen."
     },
     "stepCreate": {
       "description": "Deze naam zal worden gebruikt als apparaatnaam en voor de backup",
@@ -273,28 +288,28 @@
         "invalidChars": "De naam bevat ongeldige karakters: {{invalidChars}}.",
         "tooLong": "Naam is te lang"
       },
-      "nameLabel": "BitBox02 naam",
-      "namePlaceholder": "Mijn BitBox02",
-      "title": "Kies een naam voor je BitBox02",
-      "toastMicroSD": "Zorg dat je microSD kaart is ingevoerd in je BitBox02; deze wordt gebruikt om een backup van je wallet op te slaan."
+      "nameLabel": "BitBox naam",
+      "namePlaceholder": "Mijn BitBox",
+      "title": "Kies een naam voor je BitBox",
+      "toastMicroSD": "Zorg dat je microSD kaart is ingevoerd in je BitBox; deze wordt gebruikt om een backup van je wallet op te slaan."
     },
     "stepCreateSuccess": {
-      "removeMicroSD": "Haal de microSD kaart uit je BitBox02 en bewaar deze in een veilige locatie.",
+      "removeMicroSD": "Haal de microSD kaart uit je BitBox en bewaar deze in een veilige locatie.",
       "storeMnemonic": "Bewaar je herstelwoorden op een veilige locatie",
       "success": "Je backup is aangemaakt."
     },
     "stepInsertSD": {
-      "insertSDCard": "Stop een microSD kaart in je BitBox02 om door te gaan.",
+      "insertSDCard": "Stop een microSD kaart in je BitBox om door te gaan.",
       "insertSDCardToSeeBackups": "Voer de microSD kaart in je BitBox in om je backups te kunnen zien.",
       "insertSDcardTitle": "Voer microSD kaart in"
     },
     "stepPassword": {
       "e104": "Het instellen van een wachtwoord is afgebroken",
-      "title": "BitBox02 wachtwoord instellen",
-      "useControls": "Gebruik de touch-sensors op je BitBox02 om een wachtwoord in te voeren."
+      "title": "BitBox wachtwoord instellen",
+      "useControls": "Gebruik de touch-sensors op je BitBox om een wachtwoord in te voeren."
     },
     "stepUninitialized": {
-      "create": "Ik wil een nieuwe wallet op mijn BitBox02 aanmaken.",
+      "create": "Ik wil een nieuwe wallet op mijn BitBox aanmaken.",
       "restore": "Ik wil de backup van een bestaande wallet herstellen.",
       "restoreMicroSD": "Herstel met microSD kaart",
       "restoreMnemonic": "Herstel met herstelwoorden",
@@ -331,14 +346,14 @@
       "listItem2": "Afpersing of bedreiging",
       "listItem3": "Vernietiging door brand, waterschade of natuurrampen",
       "month": "maand",
-      "text": "Verzeker je BitBox02 en tot €100 000 aan bitcoin tegen",
+      "text": "Verzeker je BitBox en tot €100 000 aan bitcoin tegen",
       "text2": "Verzekeringen zijn verkrijgbaar vanaf €30 per jaar (€2,50 per maand). Je kunt meer te weten komen over Bitsurance en hun verzekeringsaanbod op de",
       "text3": "Op dit moment alleen beschikbaar in Duitsland, andere landen volgen later",
       "title": "Aan de slag"
     },
     "intro": {
       "link": "Bitsurance website",
-      "text1": "BitBox werkt met Bitsurance om een extra laag van bescherming voor je bitcoin te bieden. Waar de BitBox02 je coins beveiligt, dekt Bitsurance ook de dingen die niet op te lossen zijn met technologie, zoals diefstal, afpersing en bedreiging of vernietiging van de hardware wallet zelf."
+      "text1": "BitBox werkt met Bitsurance om een extra laag van bescherming voor je bitcoin te bieden. Waar de BitBox je coins beveiligt, dekt Bitsurance ook de dingen die niet op te lossen zijn met technologie, zoals diefstal, afpersing en bedreiging of vernietiging van de hardware wallet zelf."
     },
     "terms": {
       "link": "Bitsurance privacy policy",
@@ -359,11 +374,18 @@
   "blink": {
     "button": "Knipperen"
   },
+  "bluetooth": {
+    "connected": "Verbonden",
+    "connectionFailed": "mislukt",
+    "connectionIssues": "Heb je verbindingsproblemen?",
+    "enable": "Zet je bluetooth aan",
+    "select": "Selecteer je BitBox"
+  },
   "bootloader": {
     "button": "Firmwareupgrade uitvoeren",
     "button_install": "Firmware installeren",
-    "progress": "Firmwareupgrade wordt uitgevoerd: {{progress}}%",
-    "progress_install": "Firmware wordt geïnstalleerd: {{progress}}%",
+    "progress": "Firmwareupgrade wordt uitgevoerd",
+    "progress_install": "Firmware wordt geïnstalleerd",
     "success": "Upgrade voltooid! Plug je BitBox opnieuw in. Druk deze keer niet op de knop."
   },
   "button": {
@@ -390,14 +412,57 @@
     "upgrade": "Upgraden"
   },
   "buy": {
+    "bitrefill": {
+      "error": {
+        "insufficientFunds": "Onvoldoende middelen om deze cadeaukaart te kopen"
+      },
+      "transactionNote": "Stuur naar Bitrefill"
+    },
     "exchange": {
       "bankTransfer": "Bankoverschrijving",
       "bestDeal": "Beste deal",
       "buy": "Kopen",
       "creditCard": "Creditcard",
+      "description_bitrefill": "Koop cadeaukaarten, beltegoed, en meer",
       "fast": "Snel",
       "fee": "transactiekosten",
       "infoContent": {
+        "bitrefill": {
+          "disclaimer": {
+            "account": {
+              "link": "Bitrefill aankooplimieten",
+              "text": "Je kunt Bitrefill binnen bepaalde limieten gebruiken zonder een account aan te maken. Om je limieten te verhogen kun je een basisaccount aanmaken of een geverifieerde klant worden. Voor alle details, zie Bitrefill aankooplimieten.",
+              "title": "Accounts en limieten"
+            },
+            "claims": {
+              "link": "Bitrefill ondersteuning",
+              "text": "Als je een probleem hebt met je aankoop, neem dan alsjeblieft direct contact op met Bitrefill, binnen 30 dagen van je aankoop.",
+              "title": "Restituties"
+            },
+            "dataProtection": {
+              "link": "Bitrefill privacy policy",
+              "text": "De BitBoxApp verzamelt geen persoonlijke informatie. Bitrefill verzamelt informatie zoals beschreven in hun Privacy Policy.",
+              "title": "Databescherming"
+            },
+            "fees": {
+              "text": "Bitrefill brengt niet direct kosten in rekening, maar de prijzen van hun producten kunnen een marge bevatten die varieert tussen verschillende verkopers, regio's en de geldende wisselkoers.",
+              "title": "Kosten"
+            },
+            "intro": {
+              "text": "Bitrefill is een online platform waarop je bv. cadeaukaarten en beltegoed kunt kopen, of je rekeningen kunt betalen met bitcoin of andere cryptovaluta. Het is een makkelijke manier om crypto te besteden aan alledaagse dingen zonder het eerst naar een traditionele valuta te moeten wisselen. Bitrefill biedt een breed assortiment van producten aan en is populair onder mensen die geheel op crypto willen leven of privé willen winkelen.",
+              "title_bitcoin": "Geef bitcoin uit met Bitrefill",
+              "title_crypto": "Geef crypto uit met Bitrefill"
+            },
+            "security": {
+              "link": "BitBox Beveiligings- en Risicomodel",
+              "text": "Bitrefill is een externe dienst die niet onder het BitBox Beveiligings- en Risicomodel valt. Als je een aankoop maakt, stuur je een transactie naar een Bitrefill adres; je BitBox kan niet verifiëren dat dit adres correct is.",
+              "title": "Beveiligingswaarschuwing"
+            }
+          },
+          "infobox": {
+            "intro": "Bitrefill is een online platform waar je bitcoin en andere cryptovaluta kunt spenderen aan je alledaagse uitgaven door cadeaukaarten, beltegoed en verscheidene diensten te kopen. De integratie in de BitBoxApp laat je je coins direct uit je BItBox uitgeven zonder ze eerst naar een exchange of een andere wallet te hoeven sturen."
+          }
+        },
         "btcdirect": {
           "disclaimer": {
             "dataProtection": {
@@ -426,8 +491,8 @@
               "title": "Persoonlijke service met vaste prijzen"
             },
             "security": {
-              "link": "BitBox02 bedreigingsmodel",
-              "text": "De Private Trading Desk van BTC Direct is een externe dienst die niet valt onder het BitBox Security Threat model. BTC Direct is echter goed bekend met BitBox-producten en biedt veilige, deskundige begeleiding. BitBox-producten verifiëren cryptoadressen tijdens transacties om een veilige levering te garanderen.",
+              "link": "BitBox beveiligings- en risicomodel",
+              "text": "De Private Trading Desk van BTC Direct is een externe dienst die niet valt onder het BitBox Beveiligings- en Risicomodel. BTC Direct is echter goed bekend met BitBox-producten en biedt veilige, deskundige begeleiding. BitBox-producten verifiëren cryptoadressen tijdens transacties om een veilige levering te garanderen.",
               "title": "Beveiliging"
             },
             "title": "Disclaimer"
@@ -457,11 +522,12 @@
             "paymentMethods": {
               "buy": "Aankopen: Je betaalt in EUR om de coins direct in je BitBox te ontvangen. Je kunt kiezen tussen een eenmalige aankoop en periodieke aankopen. Voor bankoverschrijvingen wordt de wisselkoers vastgesteld op het moment dat BTC Direct de overschrijving ontvangt. Voor instant-betalingen wordt de wisselkoers voor een korte periode vastgezet.",
               "note": "Let op: De wisselkoers die BTC Direct aanhoudt kan iets afwijken van die in de BitBoxApp getoond worden.",
+              "sell": "Verkopen: Stuur je cryptovaluta naar BTC Direct en ontvang EUR op je bankrekening. De wisselkoers wordt vastgesteld zodra BTC Direct je coins ontvangt.",
               "title": "Betaalmethoden en kosten"
             },
             "security": {
-              "description": "BTC Direct is een externe dienst die niet valt onder het BitBox Security Threat model. We werken nauw samen met BTC Direct om de algemene veiligheid te verbeteren.",
-              "link": "BitBox Security Threat model",
+              "description": "BTC Direct is een externe dienst die niet valt onder het BitBox Beveiligings- en Risicomodel. We werken nauw samen met BTC Direct om de algemene veiligheid te verbeteren.",
+              "link": "BitBox Beveiligings- en Risicomodel",
               "title": "Veiligheid"
             },
             "title_bitcoin": "Koop bitcoin met BTC Direct",
@@ -475,7 +541,11 @@
               "sofort": "Sofort: {{fee}}%",
               "title": "Kosten voor aankopen"
             },
-            "intro": "Cryptovaluta kopen met EUR in Europa",
+            "feesSelling": {
+              "bankTransfer": "Bankoverschrijving: {{fee}}%",
+              "title": "Kosten voor verkoop"
+            },
+            "intro": "Cryptovaluta kopen en verkopen met EUR.",
             "payment": {
               "bancontact": "Bancontact",
               "bankTransfer": "Bankoverschrijving, SEPA Instant, iDeal",
@@ -544,7 +614,8 @@
       "noExchanges": "Sorry, er zijn geen exchanges beschikbaar in jouw regio",
       "region": "Regio",
       "selectRegion": "Niet aangegeven",
-      "sell": "Verkopen"
+      "sell": "Verkopen",
+      "spend": "Uitgeven"
     },
     "info": {
       "continue": "Akkoord, verder",
@@ -620,8 +691,8 @@
   },
   "confirmOnDevice": "Bevestig op je BitBox",
   "connectKeystore": {
-    "promptNoName": "Verbind je BitBox02 om verder te gaan",
-    "promptWithName": "Verbind de BitBox02 die je \"{{name}}\" hebt genoemd om verder te gaan"
+    "promptNoName": "Verbind je BitBox om verder te gaan",
+    "promptWithName": "Verbind de BitBox die je \"{{name}}\" hebt genoemd om verder te gaan"
   },
   "darkmode": {
     "toggle": "Donkere kleurstelling"
@@ -685,7 +756,7 @@
         "title": "Terugzetten naar fabrieksinstellingen"
       },
       "goToStartupSettings": {
-        "description": "Ga naar de bootloader van de BitBox02. Je kunt hier het laten zien van de \"firmware hash\" inschakelen."
+        "description": "Ga naar de bootloader van de BitBox. Je kunt hier het laten zien van de \"firmware hash\" inschakelen."
       },
       "passphrase": {
         "description": "Zet de optionele passphrase aan of uit",
@@ -708,7 +779,7 @@
       "attestation": {
         "false": "Autentiteitscontrole mislukt",
         "label": "Autentiteitscontrole",
-        "true": "Je hebt een autentieke BitBox02"
+        "true": "Je hebt een autentieke BitBox"
       },
       "sdcard": {
         "false": "Niet ingevoerd",
@@ -719,6 +790,7 @@
       "title": "Hardware"
     },
     "loading": "Apparaatinformatie aan het verzamelen...",
+    "noDevice": "Geen apparaat verbonden",
     "secrets": {
       "manageBackups": "Backups beheren",
       "title": "Geheimen"
@@ -747,10 +819,13 @@
     "wrongKeystore2": "Als je de optionele passphrase hebt ingeschakeld, zorg er dan voor dat je de juiste passphrase voor dit account hebt ingevoerd."
   },
   "exchange": {
+    "btcdirect": {
+      "currencyMismatch": "Onverwachte valuta in betaalverzoek",
+      "insufficientFunds": "Onvoldoende balans op het geselecteerde account"
+    },
     "buySell": {
       "coinNotSupported": "Geen opties beschikbaar voor dit coin-type.",
-      "regionNotSupported": "Geen opties beschikbaar in jouw regio.",
-      "updateNow": "Nu updaten"
+      "regionNotSupported": "Geen opties beschikbaar in jouw regio."
     },
     "pocket": {
       "terms": {
@@ -768,15 +843,15 @@
         },
         "kyc": {
           "link": "Lees Pocket's veelgestelde vragen",
-          "p1": "Je hebt geen extra documentatie nodig voor aan- en verkopen tot 950 EUR (1000 CHF) per dag.",
+          "p1": "Je hebt geen extra documentatie nodig voor aan- en verkopen tot ~1050 EUR (1000 CHF) per 30 dagen.",
           "p2": "Voor grotere bedragen is een telefoongesprek met Pocket vereist om het KYC/AML-proces te doorlopen.",
           "title": "KYC/AML (Know Your Customer / Anti-Money Laundering)"
         },
         "security": {
-          "link": "BitBox02 beveligingsrisicomodel",
-          "p1": "Pocket is een externe dienst, en valt dus niet binnen het toepassingsgebied van het beveiligingsrisicomodel van de BitBox02. We werken natuurlijk wel nauw samen met Pocket om de algehele veiligheid te waarborgen en te verbeteren.",
+          "link": "BitBox beveiligings- en risicomodel",
+          "p1": "Pocket is een externe dienst, en valt dus niet binnen het toepassingsgebied van het beveiligings- en risicomodel van de BitBox. We werken natuurlijk wel nauw samen met Pocket om de algehele veiligheid te waarborgen en te verbeteren.",
           "p2": "<strong>Bitcoin kopen:</strong> Je krijgt een email om je bitcoinadres via een extern communicatiekanaal nogmaals te bevestigen.",
-          "p3": "<strong>Bitcoin verkopen:</strong> De BitBox02 verifieert cryptografisch het Bitcoin stortingsadres en laat \"Pocket\" zien op de hardware wallet.",
+          "p3": "<strong>Bitcoin verkopen:</strong> De BitBox verifieert cryptografisch het Bitcoin stortingsadres en laat \"Pocket\" zien op de hardware wallet.",
           "title": "Beveiliging"
         },
         "welcome": {
@@ -794,16 +869,36 @@
   "footer": {
     "appVersion": "App versie:"
   },
+  "gapLimit": {
+    "change": "Gap-limiet voor wisselgeldadres",
+    "description": "Stel handmatig een nieuw gap-limiet in voor bitcoin ontvangst- en wisselgeldadressen.",
+    "maxValue": "Het gap-limiet mag niet hoger zijn dan {{max}}.",
+    "minValue": "Het gap-limiet moet minstens {{min}} zijn.",
+    "receive": "Gap-limiet voor ontvangstadressen.",
+    "title": "Gap-limiet handmatig instellen"
+  },
   "generic": {
     "buy": "{{coinCode}} kopen",
-    "buySell": "Kopen en verkopen",
+    "buySell": "Marktplaats",
     "buy_bitcoin": "Bitcoin kopen",
     "buy_crypto": "Crypto kopen",
+    "close": "Sluiten",
     "enabled_false": "Uitgeschakeld",
     "enabled_true": "Ingeschakeld",
+    "noOptionOnIos": "Niet beschikbaar op iOS",
+    "noOptions": "Geen opties gevonden",
+    "paymentRequestNote": "{{name}} betaling {{orderId}}",
     "receive": "{{coinCode}} ontvangen",
     "receive_bitcoin": "Bitcoin ontvangen",
-    "receive_crypto": "Crypto ontvangen"
+    "receive_crypto": "Crypto ontvangen",
+    "resetToDefault": "Terugzetten naar standaardwaarden",
+    "search": "Zoeken...",
+    "searchButton": "Zoeken",
+    "sell": "{{coinCode}} verkopen",
+    "sell_bitcoin": "Bitcoin verkopen",
+    "sell_crypto": "Crypto verkopen",
+    "spend_bitcoin": "Bitcoin uitgeven",
+    "spend_crypto": "Crypto uitgeven"
   },
   "genericError": "Er is een fout opgetreden. Start de applicatie opnieuw op als je problemen tegenkomt.",
   "goal": {
@@ -928,7 +1023,7 @@
         "link": {
           "text": "Ondersteunde munten weergeven"
         },
-        "text": "De BitBoxApp ondersteunt Bitcoin, Litecoin, Ethereum, en een beperkte selerctie van ERC-20 tokens. Voor Cardano en andere tokens moet je je BitBox02 met alternatieve apps zoals AdaLite of Rabby gebruiken. Je kunt een volledige lijst van alle ondersteunde munten op onze website vinden:",
+        "text": "De BitBoxApp ondersteunt Bitcoin, Litecoin, Ethereum, en een beperkte selerctie van ERC-20 tokens. Voor Cardano en andere tokens moet je je BitBox met alternatieve apps zoals AdaLite of Rabby gebruiken. Je kunt een volledige lijst van alle ondersteunde munten op onze website vinden:",
         "title": "Welke munten worden ondersteund?"
       },
       "whatAreAccounts": {
@@ -936,7 +1031,7 @@
         "title": "Wat zijn accounts?"
       },
       "whatIsRememberWallet": {
-        "text": "Als je \"wallet onthouden\" hebt ingeschakeld, kun je de accounts voor deze wallet bekijken, zelfs zonder dat je BitBox02 is verbonden. Zo kun je je portfolio inzien wanneer je wilt. Om te verzenden en te ontvangen, moet je nog steeds je BitBox02 verbinden.\n\nAls je deze optie uitzet, moet je je BitBox02 ingeplugd hebben om de bijbehorende accounts in te zien.",
+        "text": "Als je \"wallet onthouden\" hebt ingeschakeld, kun je de accounts voor deze wallet bekijken, zelfs zonder dat je BitBox is verbonden. Zo kun je je portfolio inzien wanneer je wilt. Om te verzenden en te ontvangen, moet je nog steeds je BitBox verbinden.\n\nAls je deze optie uitzet, moet je je BitBox ingeplugd hebben om de bijbehorende accounts in te zien.",
         "title": "Wat gebeurt er als ik \"wallet onthouden\" in- of uitschakel?"
       },
       "whyIsThisUseful": {
@@ -946,7 +1041,9 @@
     },
     "appendix": {
       "link": "Neem contact met ons op!",
-      "text": "Nog een vraag?"
+      "questionService": "Heb je problemen met {{serviceName}}?",
+      "text": "Nog een vraag?",
+      "textService": "Als je een probleem hebt met {{serviceName}}, neem dan alsjeblieft direct contact met hen op."
     },
     "backups": {
       "check": {
@@ -1040,7 +1137,7 @@
       },
       "name": {
         "text": "Dit is de naam van je wallet en van je backup. De naam wordt gebruikt voor toekomstige backups en kan ook gebruikt worden om verschillende wallets te onderscheiden. Deze kun je op ieder moment veranderen, maar backups die je hiervoor gemaakt hebt zullen nog steeds de oude naam gebruiken.",
-        "title": "Waar wordt de BitBox02-naam voor gebruikt?"
+        "title": "Waar wordt de BitBox-naam voor gebruikt?"
       },
       "secure-chip": {
         "link": {
@@ -1056,7 +1153,7 @@
       "accountSummary": "Handleiding voor accountsamenvatting",
       "advancedSettings": "Handleiding voor geavanceerde accountinstellingen",
       "appearance": "Handleiding voor ",
-      "buySell": "Koop- en verkoophandleiding",
+      "buySell": "Marktplaatshandleiding",
       "insurance": "Handleiding voor verzekeringen",
       "manageAccount": "Handleiding voor accountbeheer",
       "manageDevice": "Handleiding voor apparaatbeheer",
@@ -1078,7 +1175,7 @@
         "title": "Wanneer moet ik \"Adrestype wijzigen\" gebruiken?"
       },
       "howVerify": {
-        "text": "Voor de BitBox01 klik je op het BitBox icoon in het zijmenu aan de linkerkant en ga je naar de 'koppelen'-sectie. Als je daar bent, updatet de hulp en kun je de instructies daar verder volgen.\nOp de BitBox02 kun je adressen direct op het apparaat verifiëren tijdens het proces van verzenden of ontvangen.",
+        "text": "Tijdens het verzenden en ontvangen kun je het adres direct op je BitBox controleren.",
         "title": "Hoe kan ik veilig mijn adressen verifiëren?"
       },
       "plugout": {
@@ -1094,7 +1191,7 @@
         "title": "Waarom zo veel adressen?"
       },
       "whyVerify": {
-        "text": "Je zou je computer niet moeten vertrouwen om adressen te genereren en weer te geven. Je computer heeft een veel hoger aanvalsrisico dan een hardware wallet, waardoor de kans op virussen en malware vele malen hoger is. \nVoor de BitBox01 klik je op de knop om een veilig adres naar de gekoppelde telefoon te sturen, die je ook kun gebruiken om de QR-code te scannen en verifiëren. Voor de BitBox02 kun je het adres direct op het display verifiëren. ",
+        "text": "Je kunt je computer niet vertrouwen om authentieke adressen te genereren en weer te geven. Je computer heeft een veel hoger aanvalsrisico dan een hardware wallet, waardoor de kans op virussen en malware vele malen hoger is. \nHet adres kan direct op het scherm van je BitBox geverifieerd worden.",
         "title": "Waarom moet ik mijn adressen verifiëren. "
       }
     },
@@ -1202,12 +1299,19 @@
         "title": "Ik ben mijn BitBox kwijt, wat nu?"
       },
       "useWithoutDevice": {
-        "text": "Dat is op dit moment niet mogelijk.",
+        "text": "Je kunt wallets onthouden in de accountinstellingen. Op deze manier kun je je portfolio bekijken zonder een BitBox.",
         "title": "Kan ik de app ook zonder BitBox gebruiken?"
       },
       "welcome": {
         "text": "Bedankt voor het gebruiken van deze app, gemaakt door Shift Crypto in Zwitserland. We waarderen alle feedback die je voor ons hebt! Die kun je delen door op de link onderaan het scherm te klikken.",
         "title": "Welkom in de BitBoxApp!"
+      },
+      "worksWithIos": {
+        "link": {
+          "text": "Bestel een BitBox02 Nova"
+        },
+        "text": "Alleen de BitBox02 Nova werkt met iOS. De normale BitBox02 kan met alle andere platformen gebruikt worden. Je kunt een BitBox02 Nova kopen in onze webwinkel.",
+        "title": "Welke BitBox werkt er met iOS?"
       }
     },
     "walletConnect": {
@@ -1253,7 +1357,7 @@
   },
   "loading": "laden...",
   "manageAccounts": {
-    "accountHidden": "Deze account is verborgen in je alleen-kijken accounts. Om hem weer te zien moet je je BitBox02 verbinden.",
+    "accountHidden": "Deze account is verborgen in je alleen-kijken accounts. Om hem weer te zien moet je je BitBox verbinden.",
     "editAccount": "Bewerken",
     "editAccountNameTitle": "Accountnaam bewerken",
     "noAccounts": "Geen accounts gevonden",
@@ -1325,7 +1429,7 @@
           "title": "Wallet onthouden"
         },
         "name": "Wallet onthouden",
-        "warning": "Je onthouden wallet wordt hiermee vergeten. Om hem weer te zien, moet je je BitBox02 opnieuw verbinden. Dit heeft geen enkele invloed op de coins die op je wallet staan. \n\nWil je doorgaan?",
+        "warning": "Je onthouden wallet wordt hiermee vergeten. Om hem weer te zien, moet je je BitBox voor deze wallet opnieuw verbinden. Dit heeft geen enkele invloed op de coins die op je wallet staan. \n\nWil je doorgaan?",
         "warningTitle": "Wallet niet meer onthouden"
       },
       "toggleSats": {
@@ -1344,6 +1448,20 @@
     "newTxs_one": "Nieuwe transactie in: {{accountName}}",
     "newTxs_other": "{{count}} nieuwe transacties in: {{accountName}}"
   },
+  "novaConnectionIssues": {
+    "connectionIssueTips": "Tips voor verbindingsproblemen",
+    "description1": "Alleen de BitBox02 Nova kan met iOS gebruikt worden. De normale BitBox02 kan enkel met Windows, macOS, Android of Linux gebruikt worden. Je kunt een BitBox02 Nova in onze webwinkel kopen:",
+    "description2": "Het scherm moet altijd aangaan. Als het scherm uit blijft, krijgt het apparaat geen stroom.",
+    "description3": "Houd de BitBox02 Nova dicht bij je iPhone/iPad. We raden aan om je BitBox02 Nova direct in je apparaat te pluggen.",
+    "description4": "De BitBox02 Nova verbindt met iOS via Bluetooth. Bluetooth kan in- of uitgeschakeld worden via de BitBoxApp instellingen op andere platformen.",
+    "link1": "Bestel een BitBox02 Nova",
+    "link2": "Neem contact op voor ondersteuning",
+    "stillHavingIssues": "Heb je nog steeds problemen?",
+    "title1": "Gebruik de BitBox02 Nova alleen met iOS",
+    "title2": "Zorg dat de BitBox02 Nova stroom krijgt",
+    "title3": "Houd de BitBox02 Nova binnen bereik",
+    "title4": "Zorg dat de Bluetooth van de BitBox02 Nova niet uitgeschakeld is "
+  },
   "passphrase": {
     "considerations": {
       "button": "Backup overwegingen",
@@ -1361,7 +1479,7 @@
     },
     "how": {
       "button": "Hoe het er uit ziet",
-      "message": "Een passphrase werkt niet zoals andere wachtwoorden waar je aan gewend bent. Als je je passphrase verkeerd invoerd, krijg je hier geen melding van. Dit komt omdat <strong>iedere passphrase een nieuwe, valide wallet maakt</strong>. Dit betekent dat je zo veel verschillende wallets kunt aanmaken als je wilt door een andere passphrase in te voeren. Je kunt weer toegang krijgen tot iedere wallet door de bijbehorende passphrase in te voeren.\n\nAls je je BitBox02 invoert, zul je zoals je gewend bent om het gewone wachtwoord gevraagd worden. Daarna kun je een passphrase invoeren.\n\nNadat je de passphrase hebt ingevoerd, kun je nog een keer checken wat je precies hebt ingevoerd, zodat je zeker weet dat het was wat je verwachtte.",
+      "message": "Een passphrase werkt niet zoals andere wachtwoorden waar je aan gewend bent. Als je je passphrase verkeerd invoerd, krijg je hier geen melding van. Dit komt omdat <strong>iedere passphrase een nieuwe, geldige wallet maakt</strong>. Dit betekent dat je zo veel verschillende wallets kunt aanmaken als je wilt door een andere passphrase in te voeren. Je kunt weer toegang krijgen tot iedere wallet door de bijbehorende passphrase in te voeren.\n\nAls je je BitBox02 invoert, zul je zoals je gewend bent om het gewone wachtwoord gevraagd worden. Daarna kun je een passphrase invoeren.\n\nNadat je de passphrase hebt ingevoerd, kun je nog een keer checken wat je precies hebt ingevoerd, zodat je zeker weet dat het was wat je verwachtte.",
       "title": "Hoe werkt het"
     },
     "intro": {
@@ -1378,12 +1496,12 @@
     },
     "successDisabled": {
       "message": "De passphrase <strong>staat nu aan</strong>!\nVanaf nu zul je tijdens het opstarten om een passphrase worden gevraagd.",
-      "messageEnd": "Plug alsjeblieft de BitBox opnieuw in.",
+      "messageEnd": "Plug de BitBox opnieuw in.",
       "title": "Passphrase aangezet"
     },
     "successEnabled": {
       "message": "De passphrase <strong>staat nu uit</strong>!\nVanaf nu zul je niet langer tijdens het opstarten om een passphrase worden gevraagd.",
-      "messageEnd": "Plug je BitBox02 opnieuw in.",
+      "messageEnd": "Plug je BitBox opnieuw in.",
       "tips": "Tips",
       "tipsList": [
         "We raden je aan om een kleine hoeveelheid coins naar de passphrase wallet te sturen. Plug daarna je BitBox opnieuw in en voer je wachtwoord en passphrase in. Als je passphrase correct is, zou je de coins in je wallet moeten zien.",
@@ -1404,12 +1522,12 @@
     },
     "what": {
       "button": "Leer hoe dit werkt",
-      "message": "Een wallet komt voort uit een heel groot willekeurig getal, ook wel bekend als je 'seed'. Deze seed is gemaakt toen je je BitBox02 voor het eerst instelde en is gebackupt met de microSD kaart of je lijst van herstelwoorden. Iedereen die toegang heeft tot de seed, heeft volledige controle over de coins in die wallet. \n\nEen passphrase is een <strong>optioneel geheim</strong> dat toegevoegd wordt aan de seed. Wanneer je de passphrase aanzet, maakt iedere verschillende passphrase een nieuwe wallet op basis van de seed <strong>en</strong> de passphrase. Een passphrase kan alles zijn; letters, woorden, speciale karakters, of helemaal niets. In feite is je standaardwallet een seed met een lege passphrase.\n\nDeze passphrase is onderdeel van de BIP39 standaard, wat betekent dat hij compatibel is met alle wallets die diezelfde standaard ondersteunen. ",
+      "message": "Een wallet komt voort uit een heel groot willekeurig getal, ook wel bekend als je 'seed'. Deze seed is gemaakt toen je je BitBox voor het eerst instelde en is gebackupt met de microSD kaart of je lijst van herstelwoorden. Iedereen die toegang heeft tot de seed, heeft volledige controle over de coins in die wallet. \n\nEen passphrase is een <strong>optioneel geheim</strong> dat toegevoegd wordt aan de seed. Wanneer je de passphrase aanzet, maakt iedere verschillende passphrase een nieuwe wallet op basis van de seed <strong>en</strong> de passphrase. Een passphrase kan alles zijn; letters, woorden, speciale karakters, of helemaal niets. In feite is je standaardwallet een seed met een lege passphrase.\n\nDeze passphrase is onderdeel van de BIP39 standaard, wat betekent dat hij compatibel is met alle wallets die diezelfde standaard ondersteunen. ",
       "title": "Wat is een passphrase?"
     },
     "why": {
       "button": "Waarom zou ik een passphrase gebruiken?",
-      "message": "De BitBox02 beschermt je seed op het apparaat zelf, maar de backup (op de microSD kaart of je herstelwoorden) geeft nog steeds volledige controle over de wallet. Dat is waarom deze backup veilig opgeslagen moet worden!\n\nOmdat een passphrase een nieuwe wallet genereert met de bestaande seed, heeft een passphrase wallet <strong>zowel de backup als de passphrase</strong> nodig om hem te herstellen. Het voordeel hiervan is dat als iemand je backup vindt, ze nog steeds je passphrase nodig hebben om toegang te krijgen tot je wallet.\n\nDaarnaast kun je met de passphrase meerdere wallets op hetzelfde device aanmaken, ook bekend als 'verborgen wallets', naast de bestaande wallet.",
+      "message": "De BitBox beschermt je seed op het apparaat zelf, maar de backup (op de microSD kaart of je herstelwoorden) geeft nog steeds volledige controle over de wallet. Dat is waarom deze backup veilig opgeslagen moet worden!\n\nOmdat een passphrase een nieuwe wallet genereert met de bestaande seed, heeft een passphrase wallet <strong>zowel de backup als de passphrase</strong> nodig om hem te herstellen. Het voordeel hiervan is dat als iemand je backup vindt, ze nog steeds je passphrase nodig hebben om toegang te krijgen tot je wallet.\n\nDaarnaast kun je met de passphrase meerdere wallets op hetzelfde device aanmaken, ook bekend als 'verborgen wallets', naast de bestaande wallet.",
       "title": "Waarom zou je een passphrase gebruiken?"
     }
   },
@@ -1420,10 +1538,6 @@
       "paste": "om tekst te plakken, schakel je \"SHOW {{label}}\" in"
     }
   },
-  "random": {
-    "button": "Genereer willekeurig getal",
-    "description": "Je BitBox heeft het volgende willekeurige getal van {{bits}} bits gegenereerd:"
-  },
   "receive": {
     "bitsuranceWarning": "Dit is een verzekerde account, wat betekent dat het alleen kan ontvangen naar Native Segwit adressen. Dit is om te voorkomen dat je geen bitcoin naar adressen stuurt die niet gedekt zijn.",
     "changeScriptType": "Adrestype wijzigen",
@@ -1442,7 +1556,7 @@
     "taprootWarning": "Let op: Taproot is een nieuwe adressoort in Bitcoin en wordt nog niet op grote schaal gebruikt. Het kan bijvoorbeeld zijn dat bitcoin die op een Taproot-adres ontvangen wordt, niet weergegeven wordt in andere watch-only wallets. Veel andere wallets en exchanges kunnen ook nog niet naar Taproot-adressen zenden.",
     "title": "{{accountName}} ontvangen",
     "verify": "Verifieer veilig je adres ",
-    "verifyBitBox02": "Verifieer het adres op je BitBox02",
+    "verifyBitBox02": "Verifieer het adres op je BitBox",
     "verifyInstruction": "Verifieer of het volgende adres hetzelfde is als het adres wat op je BitBox wordt getoond."
   },
   "reset": {
@@ -1530,7 +1644,7 @@
       "title": "Verstuur uit output"
     },
     "confirm": {
-      "infoMessage": "Controleer zorgvuldig op de BitBox02 of de hoeveelheid en het adres correct zijn",
+      "infoMessage": "Controleer zorgvuldig op de BitBox of de hoeveelheid en het adres correct zijn",
       "selected-coins": "Geselecteerde coins",
       "title": "Bevestigen & transactie versturen",
       "to": "Naar",
@@ -1595,7 +1709,7 @@
     "scanQRNoCameraMessage": "Camera niet gevonden. Zorg er alsjeblieft voor dat je apparaat een camera heeft en dat je de BitBoxApp hier toegang toe hebt verleend.",
     "success": "De transactie is ondertekend en verzonden.",
     "title": "Verstuur {{accountName}}",
-    "toggleCoinControl": "Coin control aan/uitzetten",
+    "toggleCoinControl": "Coin control",
     "transactionDetails": "Transactiedetails"
   },
   "settings": {
@@ -1656,6 +1770,7 @@
       "up-to-date": "Je app is bijgewerkt",
       "version": "App versie"
     },
+    "more": "Meer",
     "notes": {
       "export": {
         "description": "Backup van je transactienotities en accountnamen maken",
@@ -1703,6 +1818,33 @@
       "title": "Gelukt"
     }
   },
+  "testWallet": {
+    "connect": {
+      "description": "Een software testwallet om zonder apparaat in Testnet te testen",
+      "title": "Testwallet"
+    },
+    "disconnect": {
+      "description": "Verwijdert de software testwallet",
+      "title": "Testwallet afkoppelen"
+    },
+    "prompt": {
+      "button": "Ontgrendelen",
+      "passwordLabel": "Testwachtwoord",
+      "title": "Testwallet ontgrendelen"
+    }
+  },
+  "testnet": {
+    "activate": {
+      "description": "Start de app opnieuw op in testnet-modus om functies uit te testen.",
+      "prompt": "Sluit de app en start deze opnieuw op om testnet-modus te activeren",
+      "title": "Start testnet-modus"
+    },
+    "deactivate": {
+      "description": "Start de app opnieuw op om testnet-modus te deactiveren.",
+      "prompt": "Sluit de app om testnet-modus te deactiveren",
+      "title": "Testnet-modus deactiveren"
+    }
+  },
   "transaction": {
     "confirmation": "Bevestigingen",
     "details": {
@@ -1722,6 +1864,7 @@
     "fee": "Netwerkkosten",
     "fiatHistorical": "Historie",
     "gas": "Gas",
+    "no-results": "Geen transacties met \"{{searchTerm}}\" gevonden",
     "note": {
       "edit": "Notitie aanpassen",
       "save": "Notitie opslaan"
@@ -1825,13 +1968,15 @@
   },
   "warning": {
     "coincontrol": "Eén of meer UTXOs hebben een hergebruikt adres. Weet dat een eventuele ontvanger alle UTXOs die met deze adressen geassocieerd zijn zal kunnen zien",
+    "offline": "Je bent op dit moment offline. Je kunt geen transacties versturen of de huidige wisselkoersen zien.",
     "sdcard": "Bewaar de microSD kaart apart van de BitBox, tenzij je je backups aan het beheren bent.",
     "testnet": "Let op: Je gebruikt je wallet op dit moment in Testnet-modus. Transacties en balansen in deze wallet zijn niet echt en verschijnen niet op het mainnet. Testnet is enkel bedoeld om dingen te kunnen testen."
   },
   "welcome": {
-    "connect": "Verbind je BitBox02",
-    "getStarted": "Laten we beginnen door de firmware op je BitBox02 te installeren.",
+    "connect": "Verbind je BitBox",
+    "getStarted": "Laten we beginnen door de firmware op je BitBox te installeren.",
     "loadingAccounts": "Accounts laden",
+    "message": "Verbind je BitBox en tik op de zijkant om verder te gaan.",
     "title": "Welkom"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/pt/app.json b/frontends/web/src/locales/pt/app.json
index 23e886d5ea..9abce544de 100644
--- a/frontends/web/src/locales/pt/app.json
+++ b/frontends/web/src/locales/pt/app.json
@@ -376,8 +376,8 @@
   "bootloader": {
     "button": "Atualizar firmware agora",
     "button_install": "Instale o firmware agora",
-    "progress": "Atualizando: {{progress}}%",
-    "progress_install": "Instalando: {{progress}}%",
+    "progress": "Atualizando",
+    "progress_install": "Instalando",
     "success": "Atualização bem sucedida! Por favor, insira novamente o dispositivo. Desta vez, não toque no botão."
   },
   "button": {
@@ -751,8 +751,7 @@
   "exchange": {
     "buySell": {
       "coinNotSupported": "Não há opções disponíveis para este tipo de moeda.",
-      "regionNotSupported": "Não há opções disponíveis para esta região.",
-      "updateNow": "Atualizar agora"
+      "regionNotSupported": "Não há opções disponíveis para esta região."
     },
     "pocket": {
       "terms": {
@@ -1435,10 +1434,6 @@
       "paste": "para colar o texto, ative \"MOSTRAR {{label}}\""
     }
   },
-  "random": {
-    "button": "Gerar número aleatório",
-    "description": "Sua BitBox gerou o seguinte número aleatório de {{bits}} bits:"
-  },
   "receive": {
     "bitsuranceWarning": "Esta é uma conta segurada, o que significa que só pode receber em Segwit Nativo. Isso é para que você não receba acidentalmente Wrapped Segwit ou Taproot, que não são segurados.",
     "changeScriptType": "Alterar tipo de endereço",
@@ -1845,4 +1840,4 @@
     "loadingAccounts": "Carregando contas",
     "title": "Bem-vindo"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/ru/app.json b/frontends/web/src/locales/ru/app.json
index 66b271cd7a..7743f0d4d8 100644
--- a/frontends/web/src/locales/ru/app.json
+++ b/frontends/web/src/locales/ru/app.json
@@ -262,8 +262,8 @@
   "bootloader": {
     "button": "Обновить прошивку",
     "button_install": "Установить прошивку",
-    "progress": "Обновление: {{progress}}%",
-    "progress_install": "Установка: {{progress}}%",
+    "progress": "Обновление",
+    "progress_install": "Установка",
     "success": "Успешное обновление! Отсоедините и присоедените устройство заново. На этот раз не прикасайтесь к кнопке."
   },
   "button": {
@@ -851,10 +851,6 @@
       "paste": "Для того чтобы вставить текст, включите «ПОКАЗАТЬ {{label}}»"
     }
   },
-  "random": {
-    "button": "Сгенерировать случайное число",
-    "description": "Ваш BitBox сгенерировал следующее {{bits}}-битное случайное число:"
-  },
   "receive": {
     "changeScriptType": "Изменить тип адреса",
     "label": "Ваш адрес",
@@ -1142,4 +1138,4 @@
     "getStarted": "Давайте начнем с установки прошивки на ваш BitBox02",
     "title": "Добро пожаловать"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/sl/app.json b/frontends/web/src/locales/sl/app.json
index a08c1c736c..a7d5be59c0 100644
--- a/frontends/web/src/locales/sl/app.json
+++ b/frontends/web/src/locales/sl/app.json
@@ -370,8 +370,8 @@
   "bootloader": {
     "button": "Nadgradi \"firmware\"",
     "button_install": "Namestite firmware",
-    "progress": "Nadgrajujem: {{progress}}%",
-    "progress_install": "Nameščanje: {{progress}}%",
+    "progress": "Nadgrajujem",
+    "progress_install": "Nameščanje",
     "success": "Nadgradnja uspešna! Izključite in ponovno priključite napravo v USB režo. Tokrat se ne dotikajte gumba."
   },
   "button": {
@@ -758,8 +758,7 @@
   "exchange": {
     "buySell": {
       "coinNotSupported": "Za to vrsto kovanca ni na voljo nobenih možnosti.",
-      "regionNotSupported": "Za to regijo ni na voljo nobenih možnosti.",
-      "updateNow": "Posodobi"
+      "regionNotSupported": "Za to regijo ni na voljo nobenih možnosti."
     },
     "pocket": {
       "terms": {
@@ -1454,10 +1453,6 @@
       "paste": "da prilepite besedilo, omogočite \"PRIKAŽI {{label}}\""
     }
   },
-  "random": {
-    "button": "Ustvari naključno število",
-    "description": "BitBox je ustvaril {{bits}}-bitno naključno število:"
-  },
   "receive": {
     "bitsuranceWarning": "To je zavarovan račun, kar pomeni, da lahko prejema le tip Bitcoin naslova Native Segwit. To je zato, da slučajno ne prejmete t.i. starejšega  tipa Wrapped Segwit ali novejšega Taproot, ki nista zavarovana.",
     "changeScriptType": "Spremenite tip naslova",
@@ -1897,4 +1892,4 @@
     "message": "Priključite BitBox in se dotaknite strani naprave.",
     "title": "Dobrodošli"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/tr/app.json b/frontends/web/src/locales/tr/app.json
index b56a42c871..f62e60dc86 100644
--- a/frontends/web/src/locales/tr/app.json
+++ b/frontends/web/src/locales/tr/app.json
@@ -237,7 +237,7 @@
   },
   "bootloader": {
     "button": "Donanım yazılımını şimdi yükselt",
-    "progress": "Yükseltme: {{progress}}%",
+    "progress": "Yükseltme",
     "success": "Yükseltme başarılı! Lütfen cihazı tekrar takın. Bu kez, düğmeye dokunmayın."
   },
   "button": {
@@ -576,10 +576,6 @@
       "paste": "Metni yapıştırmak için \"GÖSTER\" butonunu etkinleştirin {{label}}\""
     }
   },
-  "random": {
-    "button": "Rastgele Sayı Üret",
-    "description": "BitBox'ınız aşağıdaki {{bits}}-bit random sayıları üretti:"
-  },
   "receive": {
     "label": "Sizin adresiniz",
     "onlyThisCoin": {
@@ -818,4 +814,4 @@
   "welcome": {
     "title": "Hoşgeldiniz"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/locales/zh/app.json b/frontends/web/src/locales/zh/app.json
index 4a71e81120..0eac63faec 100644
--- a/frontends/web/src/locales/zh/app.json
+++ b/frontends/web/src/locales/zh/app.json
@@ -187,7 +187,7 @@
   },
   "bootloader": {
     "button": "立即升级固件",
-    "progress": "升级： {{progress}}％",
+    "progress": "升级",
     "success": "升级成功！请重新插入设备。这次，请一定不要触摸按钮。"
   },
   "button": {
@@ -527,10 +527,6 @@
       "paste": "粘贴文本，启用“显示 {{label}}”"
     }
   },
-  "random": {
-    "button": "生成随机序号",
-    "description": "您的BitBox产生了以下 {{bits}}位随机数："
-  },
   "receive": {
     "label": "你的地址",
     "onlyThisCoin": {
@@ -769,4 +765,4 @@
   "welcome": {
     "title": "欢迎"
   }
-}
\ No newline at end of file
+}
diff --git a/frontends/web/src/routes/account/account.tsx b/frontends/web/src/routes/account/account.tsx
index 739b3d658e..e1e6345326 100644
--- a/frontends/web/src/routes/account/account.tsx
+++ b/frontends/web/src/routes/account/account.tsx
@@ -54,7 +54,7 @@ import { OfflineError } from '@/components/banners/offline-error';
 import style from './account.module.css';
 
 type Props = {
-  accounts: accountApi.IAccount[];
+  accounts: accountApi.TAccount[];
   code: accountApi.AccountCode;
   devices: TDevices;
 };
@@ -88,14 +88,14 @@ const RemountAccount = ({
 
   const { btcUnit } = useContext(RatesContext);
 
-  const [balance, setBalance] = useState<accountApi.IBalance>();
-  const status: accountApi.IStatus | undefined = useSync(
+  const [balance, setBalance] = useState<accountApi.TBalance>();
+  const status: accountApi.TStatus | undefined = useSync(
     () => accountApi.getStatus(code),
     cb => statusChanged(code, cb),
   );
   const syncedAddressesCount = useSubscribe(syncAddressesCount(code));
   const [transactions, setTransactions] = useState<accountApi.TTransactions>();
-  const [detailID, setDetailID] = useState<accountApi.ITransaction['internalID'] | null>(null);
+  const [detailID, setDetailID] = useState<accountApi.TTransaction['internalID'] | null>(null);
   const [showSearchBar, setShowSearchBar] = useState<boolean>(false);
   const [searchTerm, setSearchTerm] = useState<string>('');
   const debouncedSearchTerm = useDebounce(searchTerm, 200);
@@ -132,7 +132,7 @@ const RemountAccount = ({
     });
   }, [transactions, debouncedSearchTerm]);
 
-  const onAccountChanged = useCallback((status: accountApi.IStatus | undefined) => {
+  const onAccountChanged = useCallback((status: accountApi.TStatus | undefined) => {
     if (status === undefined || status.fatalError) {
       return;
     }
diff --git a/frontends/web/src/routes/account/actionButtons.tsx b/frontends/web/src/routes/account/actionButtons.tsx
index bd728f04d9..4b1171f820 100644
--- a/frontends/web/src/routes/account/actionButtons.tsx
+++ b/frontends/web/src/routes/account/actionButtons.tsx
@@ -19,7 +19,7 @@ import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { WalletConnectLight } from '@/components/icon';
 import { useMediaQuery } from '@/hooks/mediaquery';
-import { AccountCode, IAccount, CoinCode } from '@/api/account';
+import { AccountCode, TAccount, CoinCode } from '@/api/account';
 import { isEthereumBased } from './utils';
 import { ButtonLink } from '@/components/forms';
 import { connectKeystore } from '@/api/keystores';
@@ -30,9 +30,9 @@ type TProps = {
   code: AccountCode;
   coinCode: CoinCode;
   exchangeSupported?: boolean;
-  account: IAccount;
+  account: TAccount;
   accountDataLoaded: boolean;
-}
+};
 
 export const ActionButtons = ({ canSend, code, coinCode, exchangeSupported, account, accountDataLoaded }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/account/add/add-account-guide.tsx b/frontends/web/src/routes/account/add/add-account-guide.tsx
index ddf80a5fc6..9bc44cd393 100644
--- a/frontends/web/src/routes/account/add/add-account-guide.tsx
+++ b/frontends/web/src/routes/account/add/add-account-guide.tsx
@@ -18,12 +18,12 @@ import { useTranslation } from 'react-i18next';
 import { i18n } from '@/i18n/i18n';
 import { Entry } from '@/components/guide/entry';
 import { Guide } from '@/components/guide/guide';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { isBitcoinOnly } from '@/routes/account/utils';
 
 type TAddAccountGuide = {
-  accounts: IAccount[]
-}
+  accounts: TAccount[];
+};
 
 const getCoinsLink = () => {
   switch (i18n.resolvedLanguage) {
diff --git a/frontends/web/src/routes/account/add/add.tsx b/frontends/web/src/routes/account/add/add.tsx
index 9ae650fc82..f44cd0247b 100644
--- a/frontends/web/src/routes/account/add/add.tsx
+++ b/frontends/web/src/routes/account/add/add.tsx
@@ -27,12 +27,12 @@ import { Step, Steps } from './components/steps';
 import { CoinDropDown } from './components/coin-dropdown';
 import { Check } from '@/components/icon/icon';
 import { AddAccountGuide } from './add-account-guide';
-import { addAccount, CoinCode, TAddAccount, IAccount } from '@/api/account';
+import { addAccount, CoinCode, TAddAccount, TAccount } from '@/api/account';
 import styles from './add.module.css';
 
 type TAddAccountGuide = {
-  accounts: IAccount[]
-}
+  accounts: TAccount[];
+};
 
 type TStep = 'select-coin' | 'choose-name' | 'success';
 
@@ -43,7 +43,7 @@ export const AddAccount = ({ accounts }: TAddAccountGuide) => {
   const [coinCode, setCoinCode] = useState<'choose' | CoinCode>('choose');
   const [errorMessage, setErrorMessage] = useState<string>();
   const [step, setStep] = useState<TStep>('select-coin');
-  const [supportedCoins, setSupportedCoins] = useState<backendAPI.ICoin[]>([]);
+  const [supportedCoins, setSupportedCoins] = useState<backendAPI.TCoin[]>([]);
   const [adding, setAdding] = useState(false);
 
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/frontends/web/src/routes/account/add/components/coin-dropdown.tsx b/frontends/web/src/routes/account/add/components/coin-dropdown.tsx
index 4c758651d9..88bae7d075 100644
--- a/frontends/web/src/routes/account/add/components/coin-dropdown.tsx
+++ b/frontends/web/src/routes/account/add/components/coin-dropdown.tsx
@@ -22,14 +22,14 @@ import { Dropdown } from '@/components/dropdown/dropdown';
 import styles from './coin-dropdown.module.css';
 
 type TCoinDropDownProps = {
-  onChange: (coin: backendAPI.ICoin) => void;
-  supportedCoins: backendAPI.ICoin[];
+  onChange: (coin: backendAPI.TCoin) => void;
+  supportedCoins: backendAPI.TCoin[];
   value: string;
 };
 
 type TOption = {
   label: string;
-  value: backendAPI.ICoin['coinCode'];
+  value: backendAPI.TCoin['coinCode'];
 };
 
 const Option = ({ props }: { props: TOption }) => {
diff --git a/frontends/web/src/routes/account/add/components/steps.tsx b/frontends/web/src/routes/account/add/components/steps.tsx
index 2c629a8aad..9819a5bf31 100644
--- a/frontends/web/src/routes/account/add/components/steps.tsx
+++ b/frontends/web/src/routes/account/add/components/steps.tsx
@@ -21,7 +21,7 @@ import style from './steps.module.css';
 type TStepsProps = {
   current: number;
   children: ReactNode;
-}
+};
 
 export const Steps = ({
   current,
@@ -51,11 +51,11 @@ export const Steps = ({
 };
 
 type TStepProps = {
-    children: ReactNode;
-    line?: boolean;
-    status?: 'process' | 'finish' | 'wait';
-    hidden?: boolean;
-}
+  children: ReactNode;
+  line?: boolean;
+  status?: 'process' | 'finish' | 'wait';
+  hidden?: boolean;
+};
 
 export const Step = ({
   children,
diff --git a/frontends/web/src/routes/account/components/transaction-list.tsx b/frontends/web/src/routes/account/components/transaction-list.tsx
index 0a32bbdfac..3813317e0b 100644
--- a/frontends/web/src/routes/account/components/transaction-list.tsx
+++ b/frontends/web/src/routes/account/components/transaction-list.tsx
@@ -22,9 +22,9 @@ import style from '../account.module.css';
 
 type TransactionListProps = {
   transactionSuccess: boolean;
-  filteredTransactions: accountApi.ITransaction[];
+  filteredTransactions: accountApi.TTransaction[];
   debouncedSearchTerm: string;
-  onShowDetail: (internalID: accountApi.ITransaction['internalID']) => void;
+  onShowDetail: (internalID: accountApi.TTransaction['internalID']) => void;
 };
 
 export const TransactionList = memo<TransactionListProps>(({
diff --git a/frontends/web/src/routes/account/guide.tsx b/frontends/web/src/routes/account/guide.tsx
index 2404e13616..b6fa7337e5 100644
--- a/frontends/web/src/routes/account/guide.tsx
+++ b/frontends/web/src/routes/account/guide.tsx
@@ -16,13 +16,13 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { Entry } from '@/components/guide/entry';
 import { Guide } from '@/components/guide/guide';
 import { isBitcoinBased } from './utils';
 
 type Props = {
-  account: IAccount;
+  account: TAccount;
   unit?: string;
   hasNoBalance?: boolean;
   hasIncomingBalance?: boolean;
diff --git a/frontends/web/src/routes/account/info/buy-receive-cta.tsx b/frontends/web/src/routes/account/info/buy-receive-cta.tsx
index a3a7b73770..3eabff79ac 100644
--- a/frontends/web/src/routes/account/info/buy-receive-cta.tsx
+++ b/frontends/web/src/routes/account/info/buy-receive-cta.tsx
@@ -17,7 +17,7 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import type { AccountCode, CoinUnit, IAccount, IBalance } from '@/api/account';
+import type { AccountCode, CoinUnit, TAccount, TBalance } from '@/api/account';
 import { useMediaQuery } from '@/hooks/mediaquery';
 import { Button } from '@/components/forms';
 import { Balances } from '@/routes/account/summary/accountssummary';
@@ -29,17 +29,17 @@ import { SubTitle } from '@/components/title';
 import styles from './buy-receive-cta.module.css';
 
 type TBuyReceiveCTAProps = {
-  balanceList?: IBalance[];
+  balanceList?: TBalance[];
   code?: AccountCode;
   unit?: CoinUnit;
   exchangeSupported?: boolean;
-  account?: IAccount;
+  account?: TAccount;
 };
 
 type TAddBuyReceiveOnEmpyBalancesProps = {
   balances?: Balances;
-  accounts: IAccount[];
-}
+  accounts: TAccount[];
+};
 
 export const BuyReceiveCTA = ({
   balanceList,
@@ -108,7 +108,7 @@ export const BuyReceiveCTA = ({
 
 export const AddBuyReceiveOnEmptyBalances = ({ balances, accounts }: TAddBuyReceiveOnEmpyBalancesProps) => {
   const mounted = useMountedRef();
-  const [supportedAccounts, setSupportedAccounts] = useState<IAccount[]>();
+  const [supportedAccounts, setSupportedAccounts] = useState<TAccount[]>();
   const onlyHasOneActiveAccount = accounts.length === 1;
 
   useEffect(() => {
diff --git a/frontends/web/src/routes/account/info/guide.tsx b/frontends/web/src/routes/account/info/guide.tsx
index 099e36e68b..6a870392cb 100644
--- a/frontends/web/src/routes/account/info/guide.tsx
+++ b/frontends/web/src/routes/account/info/guide.tsx
@@ -18,13 +18,13 @@ import { useTranslation } from 'react-i18next';
 import { Entry } from '@/components/guide/entry';
 import { Guide } from '@/components/guide/guide';
 
-interface BitcoinBasedAccountInfoGuideProps {
-    coinName: string;
-}
+type Props = {
+  coinName: string;
+};
 
 export const BitcoinBasedAccountInfoGuide = ({
   coinName,
-}: BitcoinBasedAccountInfoGuideProps) => {
+}: Props) => {
   const { t } = useTranslation();
   return (
     <Guide title={t('guide.guideTitle.accountInformation')}>
diff --git a/frontends/web/src/routes/account/info/info.module.css b/frontends/web/src/routes/account/info/info.module.css
index d02654e618..26b0e0b507 100644
--- a/frontends/web/src/routes/account/info/info.module.css
+++ b/frontends/web/src/routes/account/info/info.module.css
@@ -1,5 +1,5 @@
 .title {
-    font-size: var(--header-default-font-size);
+    font-size: var(--size-header);
     font-weight: 400;
 }
 
diff --git a/frontends/web/src/routes/account/info/info.tsx b/frontends/web/src/routes/account/info/info.tsx
index c9eae11910..f2665ecf90 100644
--- a/frontends/web/src/routes/account/info/info.tsx
+++ b/frontends/web/src/routes/account/info/info.tsx
@@ -18,7 +18,7 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLoad, useSync } from '@/hooks/api';
-import { getInfo, IAccount, AccountCode, IStatus, getStatus, exportAccount, getTransactionList, TTransactions, TSigningConfiguration } from '@/api/account';
+import { getInfo, TAccount, AccountCode, TStatus, getStatus, exportAccount, getTransactionList, TTransactions, TSigningConfiguration } from '@/api/account';
 import { isBitcoinBased } from '@/routes/account/utils';
 import { Header } from '@/components/layout';
 import { BackButton } from '@/components/backbutton/backbutton';
@@ -31,7 +31,7 @@ import { statusChanged } from '@/api/accountsync';
 import style from './info.module.css';
 
 type TProps = {
-  accounts: IAccount[];
+  accounts: TAccount[];
   code: AccountCode;
 };
 
@@ -43,7 +43,7 @@ export const Info = ({
   const info = useLoad(getInfo(code));
   const [viewXPub, setViewXPub] = useState<number>(0);
   const [transactions, setTransactions] = useState<TTransactions>();
-  const status: IStatus | undefined = useSync(
+  const status: TStatus | undefined = useSync(
     () => getStatus(code),
     cb => statusChanged(code, cb),
   );
diff --git a/frontends/web/src/routes/account/info/signingconfiguration.tsx b/frontends/web/src/routes/account/info/signingconfiguration.tsx
index 3d53358e73..199dccc67b 100644
--- a/frontends/web/src/routes/account/info/signingconfiguration.tsx
+++ b/frontends/web/src/routes/account/info/signingconfiguration.tsx
@@ -18,7 +18,7 @@
 import { useState, ReactNode } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { AccountCode, IAccount, TBitcoinSimple, TEthereumSimple, TSigningConfiguration, verifyXPub } from '@/api/account';
+import { AccountCode, TAccount, TBitcoinSimple, TEthereumSimple, TSigningConfiguration, verifyXPub } from '@/api/account';
 import { getScriptName, isBitcoinBased } from '@/routes/account/utils';
 import { alertUser } from '@/components/alert/Alert';
 import { CopyableInput } from '@/components/copy/Copy';
@@ -27,12 +27,12 @@ import { QRCode } from '@/components/qrcode/qrcode';
 import style from './info.module.css';
 
 type TProps = {
-    account: IAccount;
-    info: TSigningConfiguration;
-    code: AccountCode;
-    signingConfigIndex: number;
-    children: ReactNode;
-}
+  account: TAccount;
+  info: TSigningConfiguration;
+  code: AccountCode;
+  signingConfigIndex: number;
+  children: ReactNode;
+};
 
 export const SigningConfiguration = ({ account, info, code, signingConfigIndex, children }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/account/receive/receive.module.css b/frontends/web/src/routes/account/receive/receive.module.css
index 02ca6d1c72..e2578d1cdd 100644
--- a/frontends/web/src/routes/account/receive/receive.module.css
+++ b/frontends/web/src/routes/account/receive/receive.module.css
@@ -40,7 +40,7 @@
     background: none;
     border: 0;
     color: var(--color-blue);
-    font-size: var(--size-button);
+    font-size: var(--size-default);
     line-height: 1;
     padding: 0;
     text-decoration: none;
diff --git a/frontends/web/src/routes/account/receive/receive.tsx b/frontends/web/src/routes/account/receive/receive.tsx
index bc60386e2b..bb2887f8f5 100644
--- a/frontends/web/src/routes/account/receive/receive.tsx
+++ b/frontends/web/src/routes/account/receive/receive.tsx
@@ -34,7 +34,7 @@ import { connectKeystore } from '@/api/keystores';
 import style from './receive.module.css';
 
 type TProps = {
-  accounts: accountApi.IAccount[];
+  accounts: accountApi.TAccount[];
   code: accountApi.AccountCode;
 };
 
@@ -104,7 +104,7 @@ const scriptTypes: accountApi.ScriptType[] = ['p2wpkh', 'p2tr', 'p2wpkh-p2sh'];
 
 // Find index in list of receive addresses that matches the given script type, or -1 if not found.
 const getIndexOfMatchingScriptType = (
-  receiveAddresses: accountApi.ReceiveAddressList[],
+  receiveAddresses: accountApi.TReceiveAddressList[],
   scriptType: accountApi.ScriptType
 ): number => {
   if (!receiveAddresses) {
@@ -123,7 +123,7 @@ export const Receive = ({
   // index into `availableScriptTypes`, or 0 if none are available.
   const [addressType, setAddressType] = useState<number>(0);
   const [addressTypeDialog, setAddressTypeDialog] = useState<boolean>(false);
-  const [currentAddresses, setCurrentAddresses] = useState<accountApi.IReceiveAddress[]>();
+  const [currentAddresses, setCurrentAddresses] = useState<accountApi.TReceiveAddress[]>();
   const [currentAddressIndex, setCurrentAddressIndex] = useState<number>(0);
 
   const account = accounts.find(({ code: accountCode }) => accountCode === code);
@@ -180,8 +180,8 @@ export const Receive = ({
     // For devices with a display, the dialog is dismissed by tapping the device.
     setVerifying('secure');
     try {
-      const addressesAtIndex = receiveAddresses[addressesIndex] as accountApi.ReceiveAddressList;
-      const address = addressesAtIndex.addresses[activeIndex] as accountApi.IReceiveAddress;
+      const addressesAtIndex = receiveAddresses[addressesIndex] as accountApi.TReceiveAddressList;
+      const address = addressesAtIndex.addresses[activeIndex] as accountApi.TReceiveAddress;
       await accountApi.verifyAddress(code, address.addressID);
     } finally {
       setVerifying(false);
@@ -213,7 +213,7 @@ export const Receive = ({
 
   let address = '';
   if (currentAddresses) {
-    address = (currentAddresses[activeIndex] as accountApi.IReceiveAddress).address;
+    address = (currentAddresses[activeIndex] as accountApi.TReceiveAddress).address;
     if (!verifying) {
       address = address.substring(0, 8) + '...';
     }
diff --git a/frontends/web/src/routes/account/send/coin-control.tsx b/frontends/web/src/routes/account/send/coin-control.tsx
index e56e9feb39..48e124d13d 100644
--- a/frontends/web/src/routes/account/send/coin-control.tsx
+++ b/frontends/web/src/routes/account/send/coin-control.tsx
@@ -16,17 +16,17 @@
 
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import type { IAccount } from '@/api/account';
+import type { TAccount } from '@/api/account';
 import { getConfig } from '@/utils/config';
 import { Button } from '@/components/forms';
 import { TSelectedUTXOs, UTXOs } from './utxos';
 import { isBitcoinBased } from '../utils';
 
 type TProps = {
-  account: IAccount;
+  account: TAccount;
   onSelectedUTXOsChange: (selectedUTXOs: TSelectedUTXOs) => void;
   onCoinControlDialogActiveChange?: (active: boolean) => void;
-}
+};
 
 export const CoinControl = ({
   account,
diff --git a/frontends/web/src/routes/account/send/components/confirm/confirm.module.css b/frontends/web/src/routes/account/send/components/confirm/confirm.module.css
index eca0d87259..9ac78c054b 100644
--- a/frontends/web/src/routes/account/send/components/confirm/confirm.module.css
+++ b/frontends/web/src/routes/account/send/components/confirm/confirm.module.css
@@ -79,6 +79,6 @@
 }
 
 .valueOriginalLarge {
-  font-size: var(--header-default-font-size);
+  font-size: var(--size-header);
   font-weight: 500;
 }
\ No newline at end of file
diff --git a/frontends/web/src/routes/account/send/components/confirm/confirm.tsx b/frontends/web/src/routes/account/send/components/confirm/confirm.tsx
index 5ec4969f16..275c5ac4a9 100644
--- a/frontends/web/src/routes/account/send/components/confirm/confirm.tsx
+++ b/frontends/web/src/routes/account/send/components/confirm/confirm.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import { CoinCode, ConversionUnit, FeeTargetCode, Fiat, IAccount, TAmountWithConversions } from '@/api/account';
+import { CoinCode, ConversionUnit, FeeTargetCode, Fiat, TAccount, TAmountWithConversions } from '@/api/account';
 import { UseDisableBackButton } from '@/hooks/backbutton';
 import { Amount } from '@/components/amount/amount';
 import { customFeeUnit } from '@/routes/account/utils';
@@ -27,7 +27,7 @@ import type { TSelectedUTXOs } from '../../utxos';
 import style from './confirm.module.css';
 
 type TransactionDetails = {
-  selectedReceiverAccount?: IAccount;
+  selectedReceiverAccount?: TAccount;
   proposedAmount?: TAmountWithConversions;
   proposedFee?: TAmountWithConversions;
   proposedTotal?: TAmountWithConversions;
@@ -45,7 +45,7 @@ type TConfirmSendProps = {
   selectedUTXOs: TSelectedUTXOs;
   coinCode: CoinCode;
   transactionDetails: TransactionDetails;
-}
+};
 
 type TUTXOsByAddress = {
   [address: string]: string[];
@@ -141,7 +141,7 @@ export const ConfirmSend = ({
               {' '}
               {receiverAccountNumberAndName?.number && (
                 <span className={style.address}>
-                (Account #{receiverAccountNumberAndName.number})
+                  (Account #{receiverAccountNumberAndName.number})
                 </span>
               )}
             </p>
diff --git a/frontends/web/src/routes/account/send/components/dialogs/scan-qr-dialog.tsx b/frontends/web/src/routes/account/send/components/dialogs/scan-qr-dialog.tsx
index 0c5b8ba5dd..ca94e89eca 100644
--- a/frontends/web/src/routes/account/send/components/dialogs/scan-qr-dialog.tsx
+++ b/frontends/web/src/routes/account/send/components/dialogs/scan-qr-dialog.tsx
@@ -24,7 +24,7 @@ type TProps = {
   toggleScanQR: () => void;
   onChangeActiveScanQR: (active: boolean) => void;
   parseQRResult: (result: string) => void;
-}
+};
 
 export const ScanQRDialog = ({
   parseQRResult,
diff --git a/frontends/web/src/routes/account/send/components/fiat-value.tsx b/frontends/web/src/routes/account/send/components/fiat-value.tsx
index e07051bd7a..2a8c77557e 100644
--- a/frontends/web/src/routes/account/send/components/fiat-value.tsx
+++ b/frontends/web/src/routes/account/send/components/fiat-value.tsx
@@ -22,7 +22,7 @@ type TFiatValueProps = {
   amount: string;
   baseCurrencyUnit: ConversionUnit;
   className?: string;
-}
+};
 
 export const FiatValue = ({
   amount,
diff --git a/frontends/web/src/routes/account/send/components/inputs/coin-input.tsx b/frontends/web/src/routes/account/send/components/inputs/coin-input.tsx
index bc4458b905..b0f10322e3 100644
--- a/frontends/web/src/routes/account/send/components/inputs/coin-input.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/coin-input.tsx
@@ -1,19 +1,35 @@
-import { ChangeEvent } from 'react';
+/**
+ * Copyright 2023-2025 Shift Crypto AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
+import type { TAmountWithConversions, TBalance } from '@/api/account';
 import { Checkbox, Input } from '@/components/forms';
-import { TAmountWithConversions, IBalance } from '@/api/account';
 import style from './coin-input.module.css';
 
 type TProps = {
-    balance?: IBalance
-    onAmountChange: (amount: string) => void;
-    onSendAllChange: (sendAll: boolean) => void;
-    sendAll: boolean;
-    amountError?: string;
-    proposedAmount?: TAmountWithConversions;
-    amount: string;
-    hasSelectedUTXOs: boolean;
-}
+  balance?: TBalance;
+  onAmountChange: (amount: string) => void;
+  onSendAllChange: (sendAll: boolean) => void;
+  sendAll: boolean;
+  amountError?: string;
+  proposedAmount?: TAmountWithConversions;
+  amount: string;
+  hasSelectedUTXOs: boolean;
+};
 
 export const CoinInput = ({
   balance,
diff --git a/frontends/web/src/routes/account/send/components/inputs/fiat-input.tsx b/frontends/web/src/routes/account/send/components/inputs/fiat-input.tsx
index 5d96c66b9a..d279450a1a 100644
--- a/frontends/web/src/routes/account/send/components/inputs/fiat-input.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/fiat-input.tsx
@@ -25,7 +25,7 @@ type TProps = {
   disabled: boolean;
   error?: string;
   fiatAmount: string;
-}
+};
 
 export const FiatInput = ({
   label,
diff --git a/frontends/web/src/routes/account/send/components/inputs/note-input.tsx b/frontends/web/src/routes/account/send/components/inputs/note-input.tsx
index 3f277533f4..667557bc87 100644
--- a/frontends/web/src/routes/account/send/components/inputs/note-input.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/note-input.tsx
@@ -20,9 +20,9 @@ import { Input } from '@/components/forms';
 import style from './note-input.module.css';
 
 type TProps = {
-    onNoteChange: (note: string) => void;
-    note: string;
-}
+  onNoteChange: (note: string) => void;
+  note: string;
+};
 
 export const NoteInput = ({ onNoteChange, note }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx b/frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx
index 8f542d344c..b6235b851b 100644
--- a/frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx
@@ -29,18 +29,19 @@ import { isBitcoinBased } from '@/routes/account/utils';
 import style from './receiver-address-input.module.css';
 
 type TReceiverAddressInputProps = {
-    account?: accountApi.IAccount;
-    activeAccounts?: accountApi.IAccount[];
-    addressError?: string;
-    onInputChange: (value: string) => void;
-    onAccountChange?: (account: accountApi.IAccount | null) => void;
-    parseQRResult: (uri: string) => void;
-    recipientAddress: string;
-}
+  account?: accountApi.TAccount;
+  activeAccounts?: accountApi.TAccount[];
+  addressError?: string;
+  onInputChange: (value: string) => void;
+  onAccountChange?: (account: accountApi.TAccount | null) => void;
+  parseQRResult: (uri: string) => void;
+  recipientAddress: string;
+};
+
 type TToggleScanQRButtonProps = {
   onClick: () => void;
   withDropdown?: boolean;
-}
+};
 
 export const ScanQRButton = ({ onClick, withDropdown = false }: TToggleScanQRButtonProps) => {
   const { isDarkMode } = useContext(DarkModeContext);
@@ -114,7 +115,7 @@ export const ReceiverAddressInput = ({
           className={style.inputWithIcon}
           labelSection={debug ? (
             <span id="sendToSelf" className={`${style.action || ''} ${style.sendToSelf || ''}`} onClick={handleSendToSelf}>
-          Send to self
+              Send to self
             </span>
           ) : undefined}
           autoFocus={!isMobile}>
diff --git a/frontends/web/src/routes/account/send/components/inputs/receiver-address-wrapper.tsx b/frontends/web/src/routes/account/send/components/inputs/receiver-address-wrapper.tsx
index c92b202a2c..4de7950dca 100644
--- a/frontends/web/src/routes/account/send/components/inputs/receiver-address-wrapper.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/receiver-address-wrapper.tsx
@@ -20,7 +20,7 @@ import { alertUser } from '@/components/alert/Alert';
 import { TOption } from '@/components/dropdown/dropdown';
 import { InputWithDropdown } from '@/components/forms/input-with-dropdown';
 import * as accountApi from '@/api/account';
-import { getReceiveAddressList, IAccount } from '@/api/account';
+import { getReceiveAddressList, TAccount } from '@/api/account';
 import { statusChanged, syncdone } from '@/api/accountsync';
 import { connectKeystore, getKeystoreFeatures } from '@/api/keystores';
 import { unsubscribe } from '@/utils/subscriptions';
@@ -33,21 +33,21 @@ import { Logo } from '@/components/icon';
 import receiverStyles from './receiver-address-input.module.css';
 import styles from './receiver-address-wrapper.module.css';
 
-type TAccountOption = TOption<IAccount | null> & { disabled?: boolean };
+type TAccountOption = TOption<TAccount | null> & { disabled?: boolean };
 
 type Props = {
-  option: TAccountOption,
-  isSelectedValue: boolean
-}
+  option: TAccountOption;
+  isSelectedValue: boolean;
+};
 
 type TReceiverAddressWrapperProps = {
-  accounts?: IAccount[];
+  accounts?: TAccount[];
   error?: string | object;
   onInputChange: (value: string) => void;
-  onAccountChange?: (account: IAccount | null) => void;
+  onAccountChange?: (account: TAccount | null) => void;
   recipientAddress: string;
   children?: React.ReactNode;
-}
+};
 
 const AccountOption = ({ option, isSelectedValue }: Props) => {
   if (!option.value) {
@@ -79,8 +79,8 @@ export const ReceiverAddressWrapper = ({
   const [showFirmwareUpgradeDialog, setShowFirmwareUpgradeDialog] = useState(false);
   const mounted = useMountedRef();
   const isMobile = useMediaQuery('(max-width: 768px)');
-  const [selectedAccount, setSelectedAccount] = useState<TOption<IAccount | null> | null>(null);
-  const [accountSyncStatus, setAccountSyncStatus] = useState<{ [code: string]: accountApi.IStatus }>({});
+  const [selectedAccount, setSelectedAccount] = useState<TOption<TAccount | null> | null>(null);
+  const [accountSyncStatus, setAccountSyncStatus] = useState<{ [code: string]: accountApi.TStatus }>({});
 
   const accountOptions: TAccountOption[] = accounts && accounts.length > 0 ? accounts.map(account => {
     const accountNumber = account.accountNumber;
@@ -92,7 +92,7 @@ export const ReceiverAddressWrapper = ({
     };
   }) : [];
 
-  const checkFirmwareSupport = useCallback(async (selectedAccount: accountApi.IAccount) => {
+  const checkFirmwareSupport = useCallback(async (selectedAccount: accountApi.TAccount) => {
     const rootFingerprint = selectedAccount.keystore.rootFingerprint;
     const connectResult = await connectKeystore(rootFingerprint);
     if (!connectResult.success) {
diff --git a/frontends/web/src/routes/account/send/components/inputs/scan-qr-video.tsx b/frontends/web/src/routes/account/send/components/inputs/scan-qr-video.tsx
index 372cd7f1d4..882553d48c 100644
--- a/frontends/web/src/routes/account/send/components/inputs/scan-qr-video.tsx
+++ b/frontends/web/src/routes/account/send/components/inputs/scan-qr-video.tsx
@@ -21,7 +21,7 @@ import style from './scan-qr-video.module.css';
 
 type TProps = {
   onResult: (result: string) => void;
-}
+};
 
 export const ScanQRVideo = ({
   onResult,
diff --git a/frontends/web/src/routes/account/send/feetargets.tsx b/frontends/web/src/routes/account/send/feetargets.tsx
index fd65937b8d..441f7349aa 100644
--- a/frontends/web/src/routes/account/send/feetargets.tsx
+++ b/frontends/web/src/routes/account/send/feetargets.tsx
@@ -37,13 +37,13 @@ type Props = {
   onFeeTargetChange: (code: accountApi.FeeTargetCode) => void;
   onCustomFee: (customFee: string) => void;
   error?: string;
-}
+};
 
 type TOption = {
   value: accountApi.FeeTargetCode;
   label: string;
   isDisabled?: boolean;
-}
+};
 
 export const FeeTargets = ({
   accountCode,
@@ -193,8 +193,10 @@ export const FeeTargets = ({
         ) : (
           <div className={style.rowCustomFee}>
             { noFeeTargets ? (
-              <Message small type="warning">
-                {t('send.noFeeTargets')}
+              <Message type="warning">
+                <label>
+                  {t('send.noFeeTargets')}
+                </label>
               </Message>
             ) : null }
             <div className={style.column}>
diff --git a/frontends/web/src/routes/account/send/send-guide.tsx b/frontends/web/src/routes/account/send/send-guide.tsx
index 51690e2608..0f9ac772dc 100644
--- a/frontends/web/src/routes/account/send/send-guide.tsx
+++ b/frontends/web/src/routes/account/send/send-guide.tsx
@@ -5,8 +5,8 @@ import { Guide } from '@/components/guide/guide';
 import { CoinCode } from '@/api/account';
 
 type TProps = {
-    coinCode: CoinCode
-}
+  coinCode: CoinCode;
+};
 
 export const SendGuide = ({ coinCode }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/account/send/send-wrapper.tsx b/frontends/web/src/routes/account/send/send-wrapper.tsx
index 22dd0773e5..5f28032cc7 100644
--- a/frontends/web/src/routes/account/send/send-wrapper.tsx
+++ b/frontends/web/src/routes/account/send/send-wrapper.tsx
@@ -15,15 +15,15 @@
  */
 
 import { useContext } from 'react';
-import { AccountCode, IAccount } from '@/api/account';
+import { AccountCode, TAccount } from '@/api/account';
 import { RatesContext } from '@/contexts/RatesContext';
 import { findAccount } from '@/routes/account/utils';
 import { Send } from './send';
 
 type TSendProps = {
-  activeAccounts: IAccount[];
+  activeAccounts: TAccount[];
   code: AccountCode;
-}
+};
 
 export const SendWrapper = ({ activeAccounts, code }: TSendProps) => {
   const { defaultCurrency } = useContext(RatesContext);
diff --git a/frontends/web/src/routes/account/send/send.tsx b/frontends/web/src/routes/account/send/send.tsx
index a0e7e21e20..139208b408 100644
--- a/frontends/web/src/routes/account/send/send.tsx
+++ b/frontends/web/src/routes/account/send/send.tsx
@@ -46,14 +46,14 @@ import { connectKeystore } from '@/api/keystores';
 import style from './send.module.css';
 
 type TProps = {
-  account: accountApi.IAccount;
-  activeAccounts?: accountApi.IAccount[];
+  account: accountApi.TAccount;
+  activeAccounts?: accountApi.TAccount[];
   activeCurrency: accountApi.Fiat;
-}
+};
 
 const useAccountBalance = (accountCode: accountApi.AccountCode) => {
   const mounted = useMountedRef();
-  const [balance, setBalance] = useState<accountApi.IBalance>();
+  const [balance, setBalance] = useState<accountApi.TBalance>();
 
   const updateBalance = useCallback(async (code: accountApi.AccountCode) => {
     if (mounted.current) {
@@ -87,7 +87,7 @@ export const Send = ({
   // state used for the "Receiver address" input - what the user types or the account's address that is selected
   const [recipientInput, setRecipientInput] = useState<string>('');
   // the selected account when sending to another account (for confirmation display with account name and number)
-  const [selectedReceiverAccount, setSelectedReceiverAccount] = useState<accountApi.IAccount | null>(null);
+  const [selectedReceiverAccount, setSelectedReceiverAccount] = useState<accountApi.TAccount | null>(null);
   const [amount, setAmount] = useState<string>('');
   const [fiatAmount, setFiatAmount] = useState<string>('');
   const [valid, setValid] = useState<boolean>(false);
diff --git a/frontends/web/src/routes/account/send/services.ts b/frontends/web/src/routes/account/send/services.ts
index e351be4e0e..7b0ae1eca9 100644
--- a/frontends/web/src/routes/account/send/services.ts
+++ b/frontends/web/src/routes/account/send/services.ts
@@ -19,10 +19,10 @@ import { alertUser } from '@/components/alert/Alert';
 import { i18n } from '@/i18n/i18n';
 
 export type TProposalError = {
-    addressError?: string;
-    amountError?: string;
-    feeError?: string;
-}
+  addressError?: string;
+  amountError?: string;
+  feeError?: string;
+};
 
 export const txProposalErrorHandling = (errorCode?: string): TProposalError => {
   const { t } = i18n;
diff --git a/frontends/web/src/routes/account/summary/accountssummary.tsx b/frontends/web/src/routes/account/summary/accountssummary.tsx
index 50529361fd..fc967217a4 100644
--- a/frontends/web/src/routes/account/summary/accountssummary.tsx
+++ b/frontends/web/src/routes/account/summary/accountssummary.tsx
@@ -41,12 +41,12 @@ import { BackupReminder } from '@/components/banners/backup';
 import { OfflineError } from '@/components/banners/offline-error';
 
 type TProps = {
-  accounts: accountApi.IAccount[];
+  accounts: accountApi.TAccount[];
   devices: TDevices;
 };
 
 export type Balances = {
-  [code: string]: accountApi.IBalance;
+  [code: string]: accountApi.TBalance;
 };
 
 export const AccountsSummary = ({
diff --git a/frontends/web/src/routes/account/summary/balancerow.tsx b/frontends/web/src/routes/account/summary/balancerow.tsx
index 0573d96d7c..684430a036 100644
--- a/frontends/web/src/routes/account/summary/balancerow.tsx
+++ b/frontends/web/src/routes/account/summary/balancerow.tsx
@@ -16,7 +16,7 @@
 
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { AccountCode, CoinCode, IBalance } from '@/api/account';
+import { AccountCode, CoinCode, TBalance } from '@/api/account';
 import { syncAddressesCount } from '@/api/accountsync';
 import { useSubscribe } from '@/hooks/api';
 import { useMediaQuery } from '@/hooks/mediaquery';
@@ -49,7 +49,7 @@ const NameCell = ({ coinCode, name, onClick }: TNameColProps) => {
 };
 
 type TProps = {
-  balance?: IBalance;
+  balance?: TBalance;
   code: AccountCode;
   coinCode: CoinCode;
   name: string;
diff --git a/frontends/web/src/routes/account/summary/chart.tsx b/frontends/web/src/routes/account/summary/chart.tsx
index baf921c88f..875bae2486 100644
--- a/frontends/web/src/routes/account/summary/chart.tsx
+++ b/frontends/web/src/routes/account/summary/chart.tsx
@@ -49,7 +49,7 @@ const defaultData: Readonly<TChartData> = {
 
 type FormattedData = {
   [key: number]: string;
-}
+};
 
 const getUTCRange = () => {
   const now = new Date();
diff --git a/frontends/web/src/routes/account/summary/coinbalance.tsx b/frontends/web/src/routes/account/summary/coinbalance.tsx
index abbaa59adf..3bea72bf53 100644
--- a/frontends/web/src/routes/account/summary/coinbalance.tsx
+++ b/frontends/web/src/routes/account/summary/coinbalance.tsx
@@ -22,7 +22,7 @@ import { Skeleton } from '@/components/skeleton/skeleton';
 import style from './accountssummary.module.css';
 
 type TProps = {
-  summaryData?: accountApi.TChartData,
+  summaryData?: accountApi.TChartData;
   coinsBalances?: accountApi.CoinFormattedAmount[];
 };
 
diff --git a/frontends/web/src/routes/account/summary/keystorebalance.tsx b/frontends/web/src/routes/account/summary/keystorebalance.tsx
index c0894fee0a..f740c1f943 100644
--- a/frontends/web/src/routes/account/summary/keystorebalance.tsx
+++ b/frontends/web/src/routes/account/summary/keystorebalance.tsx
@@ -41,12 +41,12 @@ const TotalBalance = ({ total, fiatUnit }: accountApi.TKeystoreBalance) => {
 };
 
 type TProps = {
-  accounts: accountApi.IAccount[];
+  accounts: accountApi.TAccount[];
   accountsByKeystore: TAccountsByKeystore[];
   keystore: TKeystore;
   keystoreBalance?: accountApi.TKeystoreBalance;
   balances?: Balances;
-}
+};
 
 export const KeystoreBalance = ({
   accountsByKeystore,
@@ -98,7 +98,7 @@ export const KeystoreBalance = ({
                 if (balanceRows && balanceRows?.length > 1) {
                   const accountsForCoin = accountsPerCoin[coinCode];
                   if (accountsForCoin && accountsForCoin.length >= 1) {
-                    const account = accountsForCoin[0] as accountApi.IAccount;
+                    const account = accountsForCoin[0] as accountApi.TAccount;
                     balanceRows.push(
                       <SubTotalRow
                         key={account.coinCode}
diff --git a/frontends/web/src/routes/account/summary/types.ts b/frontends/web/src/routes/account/summary/types.ts
index 04bdaf8f62..babd28a571 100644
--- a/frontends/web/src/routes/account/summary/types.ts
+++ b/frontends/web/src/routes/account/summary/types.ts
@@ -17,12 +17,12 @@
 import type { TChartDisplay } from '@/contexts/AppContext';
 
 export type TChartFiltersProps = {
-  display: TChartDisplay
+  display: TChartDisplay;
   disableFilters: boolean;
   disableWeeklyFilters: boolean;
   onDisplayWeek: () => void;
   onDisplayMonth: () => void;
   onDisplayYear: () => void;
   onDisplayAll: () => void;
-}
+};
 
diff --git a/frontends/web/src/routes/account/utils.test.ts b/frontends/web/src/routes/account/utils.test.ts
index 7dc093d5fd..c3b2df9812 100644
--- a/frontends/web/src/routes/account/utils.test.ts
+++ b/frontends/web/src/routes/account/utils.test.ts
@@ -15,15 +15,15 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import { CoinCode, CoinUnit, IAccount } from '@/api/account';
+import { CoinCode, CoinUnit, TAccount } from '@/api/account';
 import { getAccountsByKeystore } from './utils';
 
 
 const createAccount = ({
   keystore,
   ...props
-}: Partial<Omit<IAccount, 'keystore'>> & {
-  keystore: Partial<IAccount['keystore']> | undefined
+}: Partial<Omit<TAccount, 'keystore'>> & {
+  keystore: Partial<TAccount['keystore']> | undefined;
 }) => {
   return {
     active: true,
@@ -56,13 +56,13 @@ describe('utils/getAccountsByKeystore', () => {
   });
 
   it('should return a new empty array', () => {
-    const accounts: IAccount[] = [];
+    const accounts: TAccount[] = [];
     const result = getAccountsByKeystore(accounts);
     expect(accounts).not.toBe(result);
   });
 
   it('should return one keystore entry with 2 accounts', () => {
-    const accounts: IAccount[] = [
+    const accounts: TAccount[] = [
       {
         active: true,
         blockExplorerTxPrefix: 'https://mempool.space/testnet/tx/',
@@ -111,7 +111,7 @@ describe('utils/getAccountsByKeystore', () => {
 
   it('should return two keystores with their respective accounts', () => {
 
-    const accounts: IAccount[] = [
+    const accounts: TAccount[] = [
       createAccount({ code: 'a1', name: 'A1', keystore: { name: 'W1', rootFingerprint: 'w1' } }),
       createAccount({ code: 'a2', name: 'A2', keystore: { name: 'W1', rootFingerprint: 'w1' } }),
       createAccount({ code: 'b1', name: 'B1', keystore: { name: 'W2', rootFingerprint: 'w2' } }),
diff --git a/frontends/web/src/routes/account/utils.ts b/frontends/web/src/routes/account/utils.ts
index 0cd8d76857..8cf31a33c9 100644
--- a/frontends/web/src/routes/account/utils.ts
+++ b/frontends/web/src/routes/account/utils.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import type { AccountCode, CoinCode, ScriptType, IAccount, CoinUnit, TKeystore } from '@/api/account';
+import type { AccountCode, CoinCode, ScriptType, TAccount, CoinUnit, TKeystore } from '@/api/account';
 
 export const findAccount = (
-  accounts: IAccount[],
+  accounts: TAccount[],
   accountCode: AccountCode
-): IAccount | undefined => {
+): TAccount | undefined => {
   return accounts.find(({ code }) => accountCode === code);
 };
 
@@ -104,11 +104,11 @@ export const customFeeUnit = (coinCode: CoinCode): string => {
 
 export type TAccountsByKeystore = {
   keystore: TKeystore;
-  accounts: IAccount[];
+  accounts: TAccount[];
 };
 
 // Returns the accounts grouped by the keystore fingerprint.
-export const getAccountsByKeystore = (accounts: IAccount[]): TAccountsByKeystore[] => {
+export const getAccountsByKeystore = (accounts: TAccount[]): TAccountsByKeystore[] => {
   return Object.values(accounts.reduce((acc, account) => {
     const key = account.keystore.rootFingerprint;
     if (!acc[key]) {
@@ -125,8 +125,8 @@ export const getAccountsByKeystore = (accounts: IAccount[]): TAccountsByKeystore
 type TKeystoreName = {
   keystore: {
     name: string;
-  }
-}
+  };
+};
 
 // Returns true if more than one keystore has the given name.
 export const isAmbiguousName = (
@@ -137,10 +137,10 @@ export const isAmbiguousName = (
 };
 
 export type TAccountCoinMap = {
-  [code in CoinCode]?: IAccount[];
+  [code in CoinCode]?: TAccount[];
 };
 
-export const getAccountsPerCoin = (accounts: IAccount[]): TAccountCoinMap => {
+export const getAccountsPerCoin = (accounts: TAccount[]): TAccountCoinMap => {
   return accounts.reduce<Partial<TAccountCoinMap>>((accountPerCoin, account) => {
     accountPerCoin[account.coinCode]
       ? accountPerCoin[account.coinCode]!.push(account)
diff --git a/frontends/web/src/routes/account/walletconnect/components/connect-form/connect-form.tsx b/frontends/web/src/routes/account/walletconnect/components/connect-form/connect-form.tsx
index be8ace6e5e..e8e83a882e 100644
--- a/frontends/web/src/routes/account/walletconnect/components/connect-form/connect-form.tsx
+++ b/frontends/web/src/routes/account/walletconnect/components/connect-form/connect-form.tsx
@@ -25,15 +25,15 @@ import { ScanQRVideo } from '@/routes/account/send/components/inputs/scan-qr-vid
 import styles from './connect-form.module.css';
 
 type TWCConnectFormProps = {
-    connectLoading: boolean;
-    uri: string;
-    onInputChange: (value: SetStateAction<string>) => void;
-    onSubmit: (uri: string) => void;
-}
+  connectLoading: boolean;
+  uri: string;
+  onInputChange: (value: SetStateAction<string>) => void;
+  onSubmit: (uri: string) => void;
+};
 
 type TMobileQRScannerProps = {
   onQRScanned: (uri: string) => void;
-}
+};
 
 const MobileQRScanner = ({ onQRScanned }: TMobileQRScannerProps) => {
   return (
diff --git a/frontends/web/src/routes/account/walletconnect/components/header/header.tsx b/frontends/web/src/routes/account/walletconnect/components/header/header.tsx
index a763c268ab..0d3c4609b0 100644
--- a/frontends/web/src/routes/account/walletconnect/components/header/header.tsx
+++ b/frontends/web/src/routes/account/walletconnect/components/header/header.tsx
@@ -22,7 +22,7 @@ import styles from './header.module.css';
 type TWalletConnectProps = {
   receiveAddress: string;
   accountName: string;
-}
+};
 
 export const WCHeader = ({ receiveAddress, accountName }: TWalletConnectProps) => {
   const displayedReceiveAddress = truncateAddress(receiveAddress);
diff --git a/frontends/web/src/routes/account/walletconnect/components/incoming-pairing/incoming-pairing.tsx b/frontends/web/src/routes/account/walletconnect/components/incoming-pairing/incoming-pairing.tsx
index 4bef44ef58..77f2371c5e 100644
--- a/frontends/web/src/routes/account/walletconnect/components/incoming-pairing/incoming-pairing.tsx
+++ b/frontends/web/src/routes/account/walletconnect/components/incoming-pairing/incoming-pairing.tsx
@@ -25,12 +25,12 @@ import { SUPPORTED_CHAINS } from '@/utils/walletconnect';
 import styles from './incoming-pairing.module.css';
 
 type TIncomingPairingProps = {
-    currentProposal: SignClientTypes.EventArguments['session_proposal'];
-    pairingMetadata: CoreTypes.Metadata;
-    receiveAddress: string;
-    onReject: () => void;
-    onApprove: () => void;
-}
+  currentProposal: SignClientTypes.EventArguments['session_proposal'];
+  pairingMetadata: CoreTypes.Metadata;
+  receiveAddress: string;
+  onReject: () => void;
+  onApprove: () => void;
+};
 
 const PairingContainer = ({ pairingMetadata }: {pairingMetadata: TIncomingPairingProps['pairingMetadata']}) => {
   const { name, description, url, icons } = pairingMetadata;
diff --git a/frontends/web/src/routes/account/walletconnect/components/session-card/session-card.tsx b/frontends/web/src/routes/account/walletconnect/components/session-card/session-card.tsx
index 4cebc40a18..7942dccba9 100644
--- a/frontends/web/src/routes/account/walletconnect/components/session-card/session-card.tsx
+++ b/frontends/web/src/routes/account/walletconnect/components/session-card/session-card.tsx
@@ -23,18 +23,18 @@ import { truncateAddress } from '@/utils/walletconnect';
 import styles from './session-card.module.css';
 
 type TTextDataProps = {
-    accountName: string;
-    receiveAddress: string;
-    dAppName: string;
-    dAppUrl: string;
-    iconUrl?: string;
-}
+  accountName: string;
+  receiveAddress: string;
+  dAppName: string;
+  dAppUrl: string;
+  iconUrl?: string;
+};
 
 type TWCSessionCardProps = {
   metadata: CoreTypes.Metadata;
   onDisconnect: () => void;
   receiveAddress: string;
-}
+};
 
 const TextData = ({ accountName, receiveAddress, dAppName, dAppUrl, iconUrl }: TTextDataProps) => {
   return (
diff --git a/frontends/web/src/routes/account/walletconnect/components/success-pairing/success-pairing.tsx b/frontends/web/src/routes/account/walletconnect/components/success-pairing/success-pairing.tsx
index 88ae4db06d..9d6b5bd907 100644
--- a/frontends/web/src/routes/account/walletconnect/components/success-pairing/success-pairing.tsx
+++ b/frontends/web/src/routes/account/walletconnect/components/success-pairing/success-pairing.tsx
@@ -23,8 +23,8 @@ import { AnimatedChecked } from '@/components/icon';
 import styles from './success-pairing.module.css';
 
 type TProps = {
-    accountCode: accountAPI.AccountCode;
-}
+  accountCode: accountAPI.AccountCode;
+};
 
 export const WCSuccessPairing = ({ accountCode }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/account/walletconnect/connect.tsx b/frontends/web/src/routes/account/walletconnect/connect.tsx
index 6b7be9e445..cc3f288c39 100644
--- a/frontends/web/src/routes/account/walletconnect/connect.tsx
+++ b/frontends/web/src/routes/account/walletconnect/connect.tsx
@@ -32,7 +32,7 @@ import { WCSuccessPairing } from './components/success-pairing/success-pairing';
 
 type TProps = {
   code: accountApi.AccountCode;
-  accounts: accountApi.IAccount[]
+  accounts: accountApi.TAccount[];
 };
 
 export const ConnectScreenWalletConnect = ({
diff --git a/frontends/web/src/routes/account/walletconnect/dashboard.tsx b/frontends/web/src/routes/account/walletconnect/dashboard.tsx
index 665ba01bcc..29d6d9ff61 100644
--- a/frontends/web/src/routes/account/walletconnect/dashboard.tsx
+++ b/frontends/web/src/routes/account/walletconnect/dashboard.tsx
@@ -22,7 +22,7 @@ import { SessionTypes } from '@walletconnect/types';
 import { getSdkError } from '@walletconnect/utils';
 import { WCWeb3WalletContext } from '@/contexts/WCWeb3WalletContext';
 import { getAddressFromEIPString, truncateAddress } from '@/utils/walletconnect';
-import { AccountCode, IAccount, getReceiveAddressList } from '@/api/account';
+import { AccountCode, TAccount, getReceiveAddressList } from '@/api/account';
 import { GuideWrapper, GuidedContent, Header, Main } from '@/components/layout';
 import { View, ViewContent } from '@/components/view/view';
 import { WCSessionCard } from './components/session-card/session-card';
@@ -33,9 +33,9 @@ import { ContentWrapper } from '@/components/contentwrapper/contentwrapper';
 import styles from './dashboard.module.css';
 
 type TProps = {
-  accounts: IAccount[];
+  accounts: TAccount[];
   code: AccountCode;
-}
+};
 
 export const DashboardWalletConnect = ({ code, accounts }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/accounts/all-accounts.tsx b/frontends/web/src/routes/accounts/all-accounts.tsx
index fdd0e9d699..060189b7ab 100644
--- a/frontends/web/src/routes/accounts/all-accounts.tsx
+++ b/frontends/web/src/routes/accounts/all-accounts.tsx
@@ -33,11 +33,11 @@ import { ConnectedKeystore } from '@/components/keystore/connected-keystore';
 import styles from './all-accounts.module.css';
 
 type AllAccountsProps = {
-  accounts?: accountApi.IAccount[];
+  accounts?: accountApi.TAccount[];
 };
 
 type TAccountItemProp = {
-  account: accountApi.IAccount;
+  account: accountApi.TAccount;
 };
 
 const AccountItem = ({ account }: TAccountItemProp) => {
diff --git a/frontends/web/src/routes/accounts/select-receive.tsx b/frontends/web/src/routes/accounts/select-receive.tsx
index 63906605f9..0ba2cb9a8e 100644
--- a/frontends/web/src/routes/accounts/select-receive.tsx
+++ b/frontends/web/src/routes/accounts/select-receive.tsx
@@ -17,15 +17,15 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { Header } from '@/components/layout';
 import { isBitcoinOnly } from '@/routes/account/utils';
 import { View, ViewContent } from '@/components/view/view';
 import { GroupedAccountSelector } from '@/components/groupedaccountselector/groupedaccountselector';
 
 type TReceiveAccountsSelector = {
-    activeAccounts: IAccount[]
-}
+  activeAccounts: TAccount[];
+};
 export const ReceiveAccountsSelector = ({ activeAccounts }: TReceiveAccountsSelector) => {
   const navigate = useNavigate();
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/bitsurance/account.tsx b/frontends/web/src/routes/bitsurance/account.tsx
index ca8d0eb0fd..731015c216 100644
--- a/frontends/web/src/routes/bitsurance/account.tsx
+++ b/frontends/web/src/routes/bitsurance/account.tsx
@@ -17,7 +17,7 @@
 import { useState, useEffect, useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { BitsuranceGuide } from './guide';
 import { GroupedAccountSelector } from '@/components/groupedaccountselector/groupedaccountselector';
 import { GuidedContent, GuideWrapper, Header, Main } from '@/components/layout';
@@ -28,15 +28,15 @@ import { alertUser } from '@/components/alert/Alert';
 import { connectKeystore } from '@/api/keystores';
 
 type TProps = {
-    accounts: IAccount[];
-    code: string;
-}
+  accounts: TAccount[];
+  code: string;
+};
 
 export const BitsuranceAccount = ({ code, accounts }: TProps) => {
   const navigate = useNavigate();
   const [selected, setSelected] = useState<string>(code);
   const [disabled, setDisabled] = useState<boolean>(false);
-  const [btcAccounts, setBtcAccounts] = useState<IAccount[]>();
+  const [btcAccounts, setBtcAccounts] = useState<TAccount[]>();
 
   const { t } = useTranslation();
 
@@ -71,7 +71,7 @@ export const BitsuranceAccount = ({ code, accounts }: TProps) => {
   // if there is only one account available let's automatically redirect to the widget
   useEffect(() => {
     if (btcAccounts !== undefined && btcAccounts.length === 1) {
-      const account = btcAccounts[0] as IAccount;
+      const account = btcAccounts[0] as TAccount;
       connectKeystore(account.keystore.rootFingerprint).then(connectResult => {
         if (!connectResult.success) {
           return;
diff --git a/frontends/web/src/routes/bitsurance/bitsurance.tsx b/frontends/web/src/routes/bitsurance/bitsurance.tsx
index bdb11fb2b9..4bc23e1155 100644
--- a/frontends/web/src/routes/bitsurance/bitsurance.tsx
+++ b/frontends/web/src/routes/bitsurance/bitsurance.tsx
@@ -17,7 +17,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { bitsuranceLookup } from '@/api/bitsurance';
 import { alertUser } from '@/components/alert/Alert';
 import { A } from '@/components/anchor/anchor';
@@ -31,14 +31,14 @@ import { i18n } from '@/i18n/i18n';
 import style from './bitsurance.module.css';
 
 type TProps = {
-    accounts: IAccount[];
-}
+  accounts: TAccount[];
+};
 
 export const Bitsurance = ({ accounts }: TProps) => {
   const navigate = useNavigate();
   const { t } = useTranslation();
   const { isDarkMode } = useDarkmode();
-  const [insuredAccounts, setInsuredAccounts] = useState<IAccount[]>([]);
+  const [insuredAccounts, setInsuredAccounts] = useState<TAccount[]>([]);
   const [redirecting, setRedirecting] = useState(true);
   const [scanDone, setScanDone] = useState(false);
   const [scanLoading, setScanLoading] = useState(false);
diff --git a/frontends/web/src/routes/bitsurance/dashboard.tsx b/frontends/web/src/routes/bitsurance/dashboard.tsx
index 3d850abe02..e8c59662cd 100644
--- a/frontends/web/src/routes/bitsurance/dashboard.tsx
+++ b/frontends/web/src/routes/bitsurance/dashboard.tsx
@@ -17,7 +17,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { AccountCode, IAccount, getBalance } from '@/api/account';
+import { AccountCode, TAccount, getBalance } from '@/api/account';
 import { TAccountDetails, TDetailStatus, bitsuranceLookup } from '@/api/bitsurance';
 import { useMountedRef } from '@/hooks/mount';
 import { TAccountsByKeystore, getAccountsByKeystore, isAmbiguousName } from '@/routes/account/utils';
@@ -36,16 +36,16 @@ import { BitsuranceGuide } from './guide';
 import style from './dashboard.module.css';
 
 type TProps = {
-    accounts: IAccount[];
-}
+  accounts: TAccount[];
+};
 
 type TAccountStatusIconProps = {
   status: TDetailStatus;
-}
+};
 
 type TInsurancesByCode = {
   [accountCode: AccountCode]: TAccountDetails;
-}
+};
 
 const AccountStatusIcon = ({ status }: TAccountStatusIconProps) => {
   switch (status) {
diff --git a/frontends/web/src/routes/bitsurance/widget.tsx b/frontends/web/src/routes/bitsurance/widget.tsx
index c656a093e1..30ca323acf 100644
--- a/frontends/web/src/routes/bitsurance/widget.tsx
+++ b/frontends/web/src/routes/bitsurance/widget.tsx
@@ -33,7 +33,7 @@ import { convertScriptType } from '@/utils/request-addess';
 import style from './widget.module.css';
 
 type TProps = {
-    code: string;
+  code: string;
 };
 
 export const BitsuranceWidget = ({ code }: TProps) => {
diff --git a/frontends/web/src/routes/device/bitbox01/backups.tsx b/frontends/web/src/routes/device/bitbox01/backups.tsx
index 59bab16a22..e442028515 100644
--- a/frontends/web/src/routes/device/bitbox01/backups.tsx
+++ b/frontends/web/src/routes/device/bitbox01/backups.tsx
@@ -29,23 +29,23 @@ import Check from './check';
 import Create from './create';
 import { Restore } from './restore';
 
-interface BackupsProps {
-    deviceID: string;
-    showCreate?: boolean;
-    showRestore?: boolean;
-    requireConfirmation?: boolean;
-    onRestore?: () => void;
-    children: ReactNode;
-}
+type BackupsProps = {
+  deviceID: string;
+  showCreate?: boolean;
+  showRestore?: boolean;
+  requireConfirmation?: boolean;
+  onRestore?: () => void;
+  children: ReactNode;
+};
 
 type Props = BackupsProps & TranslateProps;
 
-interface State {
-    backupList: Backup[];
-    selectedBackup?: string;
-    sdCardInserted: boolean | null;
-    lock?: boolean;
-}
+type State = {
+  backupList: Backup[];
+  selectedBackup?: string;
+  sdCardInserted: boolean | null;
+  lock?: boolean;
+};
 
 class Backups extends Component<Props, State> {
   private scrollableContainer = createRef<HTMLDivElement>();
diff --git a/frontends/web/src/routes/device/bitbox01/restore.tsx b/frontends/web/src/routes/device/bitbox01/restore.tsx
index 14bc560f30..e58d28c5f7 100644
--- a/frontends/web/src/routes/device/bitbox01/restore.tsx
+++ b/frontends/web/src/routes/device/bitbox01/restore.tsx
@@ -27,22 +27,22 @@ import { Spinner } from '../../../components/spinner/Spinner';
 import { WaitDialog } from '../../../components/wait-dialog/wait-dialog';
 import style from '../components/backups.module.css';
 
-interface RestoreProps {
-    selectedBackup?: string;
-    requireConfirmation: boolean;
-    deviceID: string;
-    onRestore: () => void;
-}
+type RestoreProps = {
+  selectedBackup?: string;
+  requireConfirmation: boolean;
+  deviceID: string;
+  onRestore: () => void;
+};
 
 type Props = RestoreProps & TranslateProps;
 
-interface State {
-    isConfirming: boolean;
-    activeDialog: boolean;
-    isLoading: boolean;
-    understand: boolean;
-    password?: string | null;
-}
+type State = {
+  isConfirming: boolean;
+  activeDialog: boolean;
+  isLoading: boolean;
+  understand: boolean;
+  password?: string | null;
+};
 
 class Restore extends Component<Props, State> {
   public readonly state: State = {
diff --git a/frontends/web/src/routes/device/bitbox01/setup/initialize.tsx b/frontends/web/src/routes/device/bitbox01/setup/initialize.tsx
index 8100805a55..9f51b16ae0 100644
--- a/frontends/web/src/routes/device/bitbox01/setup/initialize.tsx
+++ b/frontends/web/src/routes/device/bitbox01/setup/initialize.tsx
@@ -33,20 +33,20 @@ const stateEnum = Object.freeze({
   ERROR: 'error',
 });
 
-interface InitializeProps {
-    goBack: () => void;
-    deviceID: string;
-}
+type InitializeProps = {
+  goBack: () => void;
+  deviceID: string;
+};
 
 type Props = InitializeProps & TranslateProps;
 
-interface State {
-    showInfo: boolean;
-    password: string | null;
-    status: string;
-    errorCode: string | null;
-    errorMessage: string;
-}
+type State = {
+  showInfo: boolean;
+  password: string | null;
+  status: string;
+  errorCode: string | null;
+  errorMessage: string;
+};
 
 class Initialize extends Component<Props, State> {
   constructor(props: Props) {
diff --git a/frontends/web/src/routes/device/bitbox01/setup/security-information.tsx b/frontends/web/src/routes/device/bitbox01/setup/security-information.tsx
index 6c44684c4b..fc771137fb 100644
--- a/frontends/web/src/routes/device/bitbox01/setup/security-information.tsx
+++ b/frontends/web/src/routes/device/bitbox01/setup/security-information.tsx
@@ -29,13 +29,13 @@ type SecurityInformationProps = {
   goBack: () => void;
   goal: string | null;
   children: ReactNode;
-}
+};
 
 type Props = SecurityInformationProps & TranslateProps;
 
 type State = {
   showInfo: boolean;
-}
+};
 
 class SecurityInformation extends Component<Props, State> {
   constructor(props: Props) {
diff --git a/frontends/web/src/routes/device/bitbox02/backups.tsx b/frontends/web/src/routes/device/bitbox02/backups.tsx
index ed0c274641..fc6ade9b1a 100644
--- a/frontends/web/src/routes/device/bitbox02/backups.tsx
+++ b/frontends/web/src/routes/device/bitbox02/backups.tsx
@@ -30,14 +30,14 @@ import { HorizontallyCenteredSpinner } from '@/components/spinner/SpinnerAnimati
 import backupStyle from '@/routes/device/components/backups.module.css';
 
 type TProps = {
-    deviceID: string;
-    showRestore?: boolean;
-    showCreate?: boolean;
-    showRadio: boolean;
-    onSelectBackup?: (backup: Backup) => void;
-    onRestoreBackup?: (success: boolean) => void;
-    children?: ReactNode;
-}
+  deviceID: string;
+  showRestore?: boolean;
+  showCreate?: boolean;
+  showRadio: boolean;
+  onSelectBackup?: (backup: Backup) => void;
+  onRestoreBackup?: (success: boolean) => void;
+  children?: ReactNode;
+};
 
 export const BackupsV2 = ({
   deviceID,
diff --git a/frontends/web/src/routes/device/bitbox02/bip85.tsx b/frontends/web/src/routes/device/bitbox02/bip85.tsx
index f4b9c2fcdf..c4cdbda991 100644
--- a/frontends/web/src/routes/device/bitbox02/bip85.tsx
+++ b/frontends/web/src/routes/device/bitbox02/bip85.tsx
@@ -34,7 +34,7 @@ type Status = 'info-what' | 'info-how' | 'info-recover' | 'info-security' | 'pro
 
 type TProps = {
   deviceID: string;
-}
+};
 
 export const Bip85 = ({
   deviceID,
diff --git a/frontends/web/src/routes/device/bitbox02/bitbox02.tsx b/frontends/web/src/routes/device/bitbox02/bitbox02.tsx
index 1ddc3b3a5b..635a47997b 100644
--- a/frontends/web/src/routes/device/bitbox02/bitbox02.tsx
+++ b/frontends/web/src/routes/device/bitbox02/bitbox02.tsx
@@ -24,7 +24,7 @@ type TProps = {
   deviceID: string;
   devices: TDevices;
   hasAccounts: boolean;
-}
+};
 
 export const BitBox02 = ({ deviceID, devices, hasAccounts }: TProps) => {
   const status = useSync(
diff --git a/frontends/web/src/routes/device/bitbox02/checkbackup.tsx b/frontends/web/src/routes/device/bitbox02/checkbackup.tsx
index 7c91961d6a..dbbfddbf6a 100644
--- a/frontends/web/src/routes/device/bitbox02/checkbackup.tsx
+++ b/frontends/web/src/routes/device/bitbox02/checkbackup.tsx
@@ -24,10 +24,10 @@ import { Button } from '@/components/forms';
 import { useTranslation } from 'react-i18next';
 
 type TProps = {
-    deviceID: string;
-    backups: Backup[];
-    disabled: boolean;
-}
+  deviceID: string;
+  backups: Backup[];
+  disabled: boolean;
+};
 
 export const Check = ({ deviceID, backups, disabled }: TProps) => {
   const [activeDialog, setActiveDialog] = useState(false);
diff --git a/frontends/web/src/routes/device/bitbox02/createbackup.tsx b/frontends/web/src/routes/device/bitbox02/createbackup.tsx
index f1e4712afa..6d62c46441 100644
--- a/frontends/web/src/routes/device/bitbox02/createbackup.tsx
+++ b/frontends/web/src/routes/device/bitbox02/createbackup.tsx
@@ -24,8 +24,8 @@ import { WaitDialog } from '@/components/wait-dialog/wait-dialog';
 import { useTranslation } from 'react-i18next';
 
 type TProps = {
-    deviceID: string;
-}
+  deviceID: string;
+};
 
 export const Create = ({ deviceID }: TProps) => {
   const [creatingBackup, setCreatingBackup] = useState(false);
diff --git a/frontends/web/src/routes/device/bitbox02/passphrase.tsx b/frontends/web/src/routes/device/bitbox02/passphrase.tsx
index 06649809af..07e4e81ffe 100644
--- a/frontends/web/src/routes/device/bitbox02/passphrase.tsx
+++ b/frontends/web/src/routes/device/bitbox02/passphrase.tsx
@@ -34,8 +34,8 @@ const FINAL_INFO_STEP = 5;
 const CONTENT_MIN_HEIGHT = '38em';
 
 type TProps = {
-    deviceID: string;
-}
+  deviceID: string;
+};
 
 type TStatus = 'info' | 'progress' | 'success';
 
@@ -157,7 +157,7 @@ export const Passphrase = ({ deviceID }: TProps) => {
 type TInfoProps = {
   handleAbort: () => void;
   setPassphrase: (enabled: boolean) => void;
-}
+};
 
 const EnableInfo = ({ handleAbort, setPassphrase }: TInfoProps) => {
   const { t } = useTranslation();
@@ -181,7 +181,7 @@ const EnableInfo = ({ handleAbort, setPassphrase }: TInfoProps) => {
     setInfoStep((infoStep) => infoStep + 1);
   };
 
-  type TStepData = { titleKey: string; messageKey: string; buttonTextKey: string; }[]
+  type TStepData = { titleKey: string; messageKey: string; buttonTextKey: string }[];
 
   const stepData: TStepData = [
     { titleKey: t('passphrase.intro.title'), messageKey: t('passphrase.intro.message'), buttonTextKey: t('passphrase.what.button') },
diff --git a/frontends/web/src/routes/device/bitbox02/recovery-words.tsx b/frontends/web/src/routes/device/bitbox02/recovery-words.tsx
index 1c8a6d40ca..f51cf0a087 100644
--- a/frontends/web/src/routes/device/bitbox02/recovery-words.tsx
+++ b/frontends/web/src/routes/device/bitbox02/recovery-words.tsx
@@ -28,7 +28,7 @@ import { Message } from '@/components/message/message';
 
 type TProps = {
   deviceID: string;
-}
+};
 
 type TStatus = 'info' | 'progress' | 'success';
 
diff --git a/frontends/web/src/routes/device/bitbox02/sdcardcheck.tsx b/frontends/web/src/routes/device/bitbox02/sdcardcheck.tsx
index 76791c0ec3..16e78216c3 100644
--- a/frontends/web/src/routes/device/bitbox02/sdcardcheck.tsx
+++ b/frontends/web/src/routes/device/bitbox02/sdcardcheck.tsx
@@ -26,7 +26,7 @@ import { HorizontallyCenteredSpinner } from '@/components/spinner/SpinnerAnimati
 type TProps = {
   deviceID: string;
   children: ReactNode;
-}
+};
 
 const SDCardCheck = ({ deviceID, children }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/device/bitbox02/setup/checklist.module.css b/frontends/web/src/routes/device/bitbox02/setup/checklist.module.css
index 14eafcb699..220d88ef5a 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/checklist.module.css
+++ b/frontends/web/src/routes/device/bitbox02/setup/checklist.module.css
@@ -1,9 +1,3 @@
-/* TODO: ideally fontsize of those labels would just use the default from View component */
-.wizardCheckbox label {
-  font-size: var(--size-wizard-text) !important;
-  line-height: 1.4;
-}
-
 .wizardCheckbox label::before {
   top: 2px !important;
 }
diff --git a/frontends/web/src/routes/device/bitbox02/setup/checklist.tsx b/frontends/web/src/routes/device/bitbox02/setup/checklist.tsx
index 5defcc5b50..0a75f9113d 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/checklist.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/checklist.tsx
@@ -22,7 +22,7 @@ import style from './checklist.module.css';
 
 type Props = {
   onContinue: () => void;
-}
+};
 
 export const ChecklistWalletCreate = ({ onContinue, }: Props) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/device/bitbox02/setup/choose.tsx b/frontends/web/src/routes/device/bitbox02/setup/choose.tsx
index 276b406bef..11e84e7b9b 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/choose.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/choose.tsx
@@ -37,7 +37,7 @@ type Props = {
     options?: TWalletCreateOptions,
   ) => void;
   versionInfo: VersionInfo;
-}
+};
 
 export const SetupOptions = ({
   onSelectSetup,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/name.module.css b/frontends/web/src/routes/device/bitbox02/setup/name.module.css
index 903a5c90b7..4b98850bc3 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/name.module.css
+++ b/frontends/web/src/routes/device/bitbox02/setup/name.module.css
@@ -1,8 +1,3 @@
-/* TODO: ideally fontsize of those labels would just use the default from View component */
-.wizardLabel label {
-  font-size: var(--size-wizard-text) !important;
-}
-
 .inputError input,
 .inputError input:focus {
   border-color: var(--color-danger);
@@ -11,7 +6,7 @@
 .errorMessage {
   color: var(--color-danger);
   display: block;
-  font-size: var(--size-medium);
+  font-size: var(--size-default);
   padding-top: var(--space-quarter);
 }
 
diff --git a/frontends/web/src/routes/device/bitbox02/setup/name.tsx b/frontends/web/src/routes/device/bitbox02/setup/name.tsx
index 5915c143a0..067e891e57 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/name.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/name.tsx
@@ -27,11 +27,11 @@ import style from './name.module.css';
 type TProps = {
   onDeviceName: (name: string) => void;
   onBack: () => void;
-}
+};
 
 type TSetDeviceNameProps = TProps & {
   missingSDCardWarning?: boolean;
-}
+};
 
 export const SetDeviceName = ({
   onDeviceName,
@@ -97,9 +97,9 @@ export const SetDeviceName = ({
 };
 
 type TDeviceNameErrorMessageProps = {
-  error: TDeviceNameError
-  invalidChars?: string
-}
+  error: TDeviceNameError;
+  invalidChars?: string;
+};
 
 export const DeviceNameErrorMessage = ({ error, invalidChars }: TDeviceNameErrorMessageProps) => {
   const { t } = useTranslation();
@@ -119,7 +119,7 @@ export const DeviceNameErrorMessage = ({ error, invalidChars }: TDeviceNameError
 
 type TPropsWithSDCard = TProps & {
   deviceID: string;
-}
+};
 
 export const SetDeviceNameWithSDCard = ({
   deviceID,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/pairing.tsx b/frontends/web/src/routes/device/bitbox02/setup/pairing.tsx
index c6369edb9a..2b45ad1f61 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/pairing.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/pairing.tsx
@@ -26,7 +26,7 @@ type Props = {
   attestation: boolean | null | undefined;
   deviceID: string;
   pairingFailed: boolean;
-}
+};
 
 export const Pairing = ({
   attestation,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/password.tsx b/frontends/web/src/routes/device/bitbox02/setup/password.tsx
index 3446db8b4e..90fe016182 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/password.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/password.tsx
@@ -24,7 +24,7 @@ import { convertDateToLocaleString } from '@/utils/date';
 
 type Props = {
   errorText: string | undefined;
-}
+};
 
 export const SetPassword = ({ errorText }: Props) => {
   const { t } = useTranslation();
@@ -52,7 +52,7 @@ export const SetPassword = ({ errorText }: Props) => {
 
 type PropsWithBackup = {
   forBackup?: Backup;
-}
+};
 
 export const SetPasswordWithBackup = ({
   forBackup,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/restore.tsx b/frontends/web/src/routes/device/bitbox02/setup/restore.tsx
index 4779de010e..eaac7ddc6b 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/restore.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/restore.tsx
@@ -25,7 +25,7 @@ type Props = {
   onSelectBackup: (backup: Backup) => void;
   onRestoreBackup: (success: boolean) => void;
   onBack: () => void;
-}
+};
 
 export const RestoreFromSDCardBackup = ({
   deviceID,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/success.tsx b/frontends/web/src/routes/device/bitbox02/setup/success.tsx
index 8c9495d115..8680ffd064 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/success.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/success.tsx
@@ -24,7 +24,7 @@ type TProps = {
 
 type TCreateProps = TProps & {
   backupType: 'sdcard' | 'mnemonic';
-}
+};
 
 export const CreateWalletSuccess = ({
   backupType,
diff --git a/frontends/web/src/routes/device/bitbox02/setup/wait.tsx b/frontends/web/src/routes/device/bitbox02/setup/wait.tsx
index 2f1cbbfa8e..023b125144 100644
--- a/frontends/web/src/routes/device/bitbox02/setup/wait.tsx
+++ b/frontends/web/src/routes/device/bitbox02/setup/wait.tsx
@@ -22,7 +22,7 @@ import { UseDisableBackButton } from '@/hooks/backbutton';
 type Props = {
   title: string;
   text?: string;
-}
+};
 
 export const Wait = ({ title, text }: Props) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/device/bitbox02/unlock.tsx b/frontends/web/src/routes/device/bitbox02/unlock.tsx
index 1165a91720..7bd71d49f7 100644
--- a/frontends/web/src/routes/device/bitbox02/unlock.tsx
+++ b/frontends/web/src/routes/device/bitbox02/unlock.tsx
@@ -21,7 +21,7 @@ import { PasswordEntry } from './components/password-entry/password-entry';
 
 type Props = {
   attestation: boolean | null | undefined;
-}
+};
 
 export const Unlock = ({ attestation }: Props) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/device/bitbox02/wizard.tsx b/frontends/web/src/routes/device/bitbox02/wizard.tsx
index efc8160e29..3215dab080 100644
--- a/frontends/web/src/routes/device/bitbox02/wizard.tsx
+++ b/frontends/web/src/routes/device/bitbox02/wizard.tsx
@@ -30,7 +30,7 @@ import { CreateWalletSuccess, RestoreFromMnemonicSuccess, RestoreFromSDCardSucce
 
 type TProps = {
   deviceID: string;
-}
+};
 
 export const Wizard = ({ deviceID }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/device/components/skipfortesting.tsx b/frontends/web/src/routes/device/components/skipfortesting.tsx
index 22f2c3f5f6..f32f8737eb 100644
--- a/frontends/web/src/routes/device/components/skipfortesting.tsx
+++ b/frontends/web/src/routes/device/components/skipfortesting.tsx
@@ -26,7 +26,7 @@ import { Dialog, DialogButtons } from '@/components/dialog/dialog';
 type TProps = {
   children?: ReactNode;
   className?: string;
-}
+};
 
 export const SkipForTesting = ({
   children,
diff --git a/frontends/web/src/routes/device/deviceswitch.tsx b/frontends/web/src/routes/device/deviceswitch.tsx
index c979dac7fa..e21237f61c 100644
--- a/frontends/web/src/routes/device/deviceswitch.tsx
+++ b/frontends/web/src/routes/device/deviceswitch.tsx
@@ -23,8 +23,8 @@ import { Waiting } from './waiting';
 type TProps = {
   devices: TDevices;
   deviceID: string | null;
-  hasAccounts: boolean,
-}
+  hasAccounts: boolean;
+};
 
 const DeviceSwitch = ({ deviceID, devices, hasAccounts }: TProps) => {
   const deviceIDs = Object.keys(devices);
diff --git a/frontends/web/src/routes/device/manage-backups/manage-backups.tsx b/frontends/web/src/routes/device/manage-backups/manage-backups.tsx
index e3ed1d2488..5ad0abf524 100644
--- a/frontends/web/src/routes/device/manage-backups/manage-backups.tsx
+++ b/frontends/web/src/routes/device/manage-backups/manage-backups.tsx
@@ -28,8 +28,8 @@ import { SDCardCheck } from '@/routes/device/bitbox02/sdcardcheck';
 
 type TProps = {
   deviceID: string | null;
-  devices: TDevices
-}
+  devices: TDevices;
+};
 
 export const ManageBackups = ({
   deviceID,
diff --git a/frontends/web/src/routes/device/upgrade-firmware-required.tsx b/frontends/web/src/routes/device/upgrade-firmware-required.tsx
index 46d819990c..1ceb62a79b 100644
--- a/frontends/web/src/routes/device/upgrade-firmware-required.tsx
+++ b/frontends/web/src/routes/device/upgrade-firmware-required.tsx
@@ -23,7 +23,7 @@ import { FirmwareSetting } from '@/routes/settings/components/device-settings/fi
 type TProps = {
   deviceID: string;
   versionInfo: VersionInfo;
-}
+};
 
 export const FirmwareUpgradeRequired = ({
   deviceID,
diff --git a/frontends/web/src/routes/market/bitrefill.tsx b/frontends/web/src/routes/market/bitrefill.tsx
index f58555c09e..6358bc4384 100644
--- a/frontends/web/src/routes/market/bitrefill.tsx
+++ b/frontends/web/src/routes/market/bitrefill.tsx
@@ -18,7 +18,7 @@ import { useState, useEffect, useRef, useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Header } from '@/components/layout';
 import { Spinner } from '@/components/spinner/Spinner';
-import { AccountCode, IAccount, proposeTx, sendTx, TTxInput, TTxProposalResult } from '@/api/account';
+import { AccountCode, TAccount, proposeTx, sendTx, TTxInput, TTxProposalResult } from '@/api/account';
 import { findAccount, isBitcoinOnly } from '@/routes/account/utils';
 import { useDarkmode } from '@/hooks/darkmode';
 import { getConfig } from '@/utils/config';
@@ -45,7 +45,7 @@ const coinMapping: Readonly<Record<string, string>> = {
 };
 
 type TProps = {
-  accounts: IAccount[];
+  accounts: TAccount[];
   code: AccountCode;
   region: string;
 };
diff --git a/frontends/web/src/routes/market/btcdirect.tsx b/frontends/web/src/routes/market/btcdirect.tsx
index 72a255210f..dcfe717d32 100644
--- a/frontends/web/src/routes/market/btcdirect.tsx
+++ b/frontends/web/src/routes/market/btcdirect.tsx
@@ -20,7 +20,7 @@ import { useTranslation } from 'react-i18next';
 import { getBTCDirectInfo, TMarketAction } from '@/api/market';
 import { parseExternalBtcAmount } from '@/api/coins';
 import { AppContext } from '@/contexts/AppContext';
-import { AccountCode, IAccount, proposeTx, sendTx, TTxInput } from '@/api/account';
+import { AccountCode, TAccount, proposeTx, sendTx, TTxInput } from '@/api/account';
 import { useLoad } from '@/hooks/api';
 import { useDarkmode } from '@/hooks/darkmode';
 import { UseDisableBackButton } from '@/hooks/backbutton';
@@ -44,10 +44,10 @@ const localeMapping: Readonly<Record<string, string>> = {
 };
 
 type TProps = {
-  accounts: IAccount[];
+  accounts: TAccount[];
   action: TMarketAction;
   code: AccountCode;
-}
+};
 
 export const BTCDirect = ({
   accounts,
diff --git a/frontends/web/src/routes/market/components/countryselect.tsx b/frontends/web/src/routes/market/components/countryselect.tsx
index 91883c9e45..1ced295306 100644
--- a/frontends/web/src/routes/market/components/countryselect.tsx
+++ b/frontends/web/src/routes/market/components/countryselect.tsx
@@ -24,13 +24,13 @@ import styles from './countryselect.module.css';
 export type TOption = {
   label: string;
   value: string;
-}
+};
 
 type TProps = {
   onChangeRegion: (newValue: SingleValue<TOption>) => void;
   regions: TOption[];
   selectedRegion: string;
-}
+};
 
 const SelectedRegionIcon = ({ regionCode }: { regionCode: string }) => {
   const { isDarkMode } = useDarkmode();
diff --git a/frontends/web/src/routes/market/components/deals.module.css b/frontends/web/src/routes/market/components/deals.module.css
new file mode 100644
index 0000000000..0b042b5d54
--- /dev/null
+++ b/frontends/web/src/routes/market/components/deals.module.css
@@ -0,0 +1,53 @@
+.innerRadioButtonsContainer {
+    min-height: 110px;
+}
+
+.noExchangeText {
+    color: var(--color-gray-alt);
+    line-height: 22px;
+    margin: 0;
+    text-align: center;
+    margin-top: calc((var(--space-eight) + var(--space-half)));
+}
+
+.exchangeProvidersContainer {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+}
+
+.actionableItemContainer {
+    position: relative;
+}
+
+.infoContainer {
+    margin-top: var(--space-default);
+    position: relative;
+}
+
+.link {
+  color: var(--color-default);
+}
+
+.textIcon {
+    height: 1em;
+    margin-right: 0.5em;
+    vertical-align: text-bottom;
+}
+
+.buttonsContainer {
+    display: flex;
+    margin-top: var(--space-default);
+    justify-content: center;
+}
+
+.buttonBack {
+    margin-right: auto;
+    margin-bottom: var(--space-default);
+}
+
+@media screen and (max-width: 400px) {
+    .buttonBack {
+        width: 100%;
+    }
+}
\ No newline at end of file
diff --git a/frontends/web/src/routes/market/components/deals.tsx b/frontends/web/src/routes/market/components/deals.tsx
index 7ccbb5b21f..dc1bb9d7e9 100644
--- a/frontends/web/src/routes/market/components/deals.tsx
+++ b/frontends/web/src/routes/market/components/deals.tsx
@@ -30,7 +30,7 @@ import { InfoButton } from '@/components/infobutton/infobutton';
 import { getConfig } from '@/utils/config';
 import { ActionableItem } from '@/components/actionable-item/actionable-item';
 import { VendorDeals } from '@/routes/market/components/vendor-deals';
-import style from '../market.module.css';
+import style from './deals.module.css';
 
 type TProps = {
   marketDealsResponse: marketAPI.TMarketDealsResponse | undefined;
@@ -39,7 +39,7 @@ type TProps = {
   showBackButton: boolean;
   action: marketAPI.TMarketAction;
   setInfo: (info: TInfoContentProps) => void;
-}
+};
 
 export const Deals = ({
   marketDealsResponse,
diff --git a/frontends/web/src/routes/market/components/infocontent.tsx b/frontends/web/src/routes/market/components/infocontent.tsx
index 3fe4c492a6..e1cd709d61 100644
--- a/frontends/web/src/routes/market/components/infocontent.tsx
+++ b/frontends/web/src/routes/market/components/infocontent.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import type { IAccount } from '@/api/account';
+import type { TAccount } from '@/api/account';
 import type { TMarketAction, TVendorName, TPaymentMethod } from '@/api/market';
 import { i18n } from '@/i18n/i18n';
 import { A } from '@/components/anchor/anchor';
@@ -94,7 +94,7 @@ const MoonPayInfo = ({ cardFee, bankTransferFee }: TMoonPayInfoProps) => {
 };
 
 type TPocketInfoProps = {
-  bankTransferFee?: number
+  bankTransferFee?: number;
 };
 
 const PocketInfo = ({ bankTransferFee }: TPocketInfoProps) => {
@@ -120,11 +120,11 @@ const PocketInfo = ({ bankTransferFee }: TPocketInfoProps) => {
       <br />
       <p><b>{t('buy.exchange.infoContent.pocket.verification.title')}</b></p>
       <br />
-      <p>{t('buy.exchange.infoContent.pocket.verification.info')}</p>
+      <p>{t('exchange.pocket.terms.kyc.info')}</p>
       <br />
       <p>
-        <A href="https://pocketbitcoin.com/faq/are-there-any-limits-with-pocket">
-          {t('buy.exchange.infoContent.pocket.verification.link')}
+        <A href="https://pocketbitcoin.com/faq">
+          {t('exchange.pocket.terms.kyc.link')}
         </A>
       </p>
       <br />
@@ -149,7 +149,7 @@ const PocketInfo = ({ bankTransferFee }: TPocketInfoProps) => {
 };
 
 type TBTCDirectOTCInfoProps = {
-  accounts?: IAccount[];
+  accounts?: TAccount[];
 };
 
 const BTCDirectOTCInfo = ({ accounts }: TBTCDirectOTCInfoProps) => {
@@ -279,7 +279,7 @@ export type TPaymentFee = {
 };
 
 export type TInfoContentProps = {
-  accounts?: IAccount[];
+  accounts?: TAccount[];
   action: TMarketAction;
   paymentFees: TPaymentFee;
   vendorName: TVendorNameOrRegion;
diff --git a/frontends/web/src/routes/market/components/markettab.tsx b/frontends/web/src/routes/market/components/markettab.tsx
index 8da873ac57..ef5339b354 100644
--- a/frontends/web/src/routes/market/components/markettab.tsx
+++ b/frontends/web/src/routes/market/components/markettab.tsx
@@ -22,7 +22,7 @@ import { TMarketAction } from '@/api/market';
 type TProps = {
   onChangeTab: (tab: TMarketAction) => void;
   activeTab: TMarketAction;
-}
+};
 
 
 export const MarketTab = ({
diff --git a/frontends/web/src/routes/market/components/vendor-deals.tsx b/frontends/web/src/routes/market/components/vendor-deals.tsx
index 266398b707..bef29fb63b 100644
--- a/frontends/web/src/routes/market/components/vendor-deals.tsx
+++ b/frontends/web/src/routes/market/components/vendor-deals.tsx
@@ -25,7 +25,7 @@ import style from './vendor-deals.module.css';
 type Props = {
   deals: TMarketDeal[];
   vendorName: TMarketDeals['vendorName'];
-}
+};
 
 type TDealProps = {
   deal: TMarketDeal;
diff --git a/frontends/web/src/routes/market/guide.tsx b/frontends/web/src/routes/market/guide.tsx
index edb5442799..685afac9c4 100644
--- a/frontends/web/src/routes/market/guide.tsx
+++ b/frontends/web/src/routes/market/guide.tsx
@@ -23,7 +23,7 @@ import { getBTCDirectPrivacyLink } from '@/components/terms/btcdirect-otc-terms'
 type BuyGuideProps = {
   vendor?: TVendorName;
   translationContext: 'bitcoin' | 'crypto';
-}
+};
 
 const usePrivacyLink = (vendor?: TVendorName) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/market/info.tsx b/frontends/web/src/routes/market/info.tsx
index 8e3642abb9..e1a239fd4a 100644
--- a/frontends/web/src/routes/market/info.tsx
+++ b/frontends/web/src/routes/market/info.tsx
@@ -29,15 +29,15 @@ import { MarketGuide } from './guide';
 import { connectKeystore } from '@/api/keystores';
 
 type TProps = {
-    accounts: accountApi.IAccount[];
-    code: accountApi.AccountCode;
-}
+  accounts: accountApi.TAccount[];
+  code: accountApi.AccountCode;
+};
 
 export const MarketInfo = ({ code, accounts }: TProps) => {
   const navigate = useNavigate();
   const [selected, setSelected] = useState<string>(code);
   const [disabled, setDisabled] = useState<boolean>(false);
-  const [supportedAccounts, setSupportedAccounts] = useState<accountApi.IAccount[]>();
+  const [supportedAccounts, setSupportedAccounts] = useState<accountApi.TAccount[]>();
 
   const { t } = useTranslation();
 
diff --git a/frontends/web/src/routes/market/market.module.css b/frontends/web/src/routes/market/market.module.css
index 22d50f65f5..958d64ec66 100644
--- a/frontends/web/src/routes/market/market.module.css
+++ b/frontends/web/src/routes/market/market.module.css
@@ -1,59 +1,13 @@
-.actionableItemContainer {
-    position: relative;
-}
-
-.buttonBack {
-    margin-right: auto;
-    margin-bottom: var(--space-default);
-}
-
-.buttonsContainer {
-    display: flex;
-    margin-top: var(--space-default);
-    justify-content: center;
-}
-
-.container {
-    margin-top: calc(var(--space-default) * 1.5);
-}
-
-.exchangeProvidersContainer {
-    display: flex;
-    flex-direction: column;
-    gap: 5px;
+.exchangeContainer,
+.exchangeContainer p {
+    --size-default: 14px;
 }
 
 .exchangeContainer {
-    display: flex;
-    flex-direction: column;
-    min-height: 300px;
-}
-
-.exchangeContainer:global(.content) {
-    flex-grow: 0;
-    flex-shrink: 0;
-    margin: auto;
+    padding-left: var(--space-half);
     padding-right: 40px;
 }
 
-.header {
-    position: relative;
-    z-index: 2200;
-}
-
-.selectContainer {
-    position: relative;
-    margin-bottom: var(--spacing-default);
-}
-
-.selectContainer > div {
-    position: relative;
-}
-
-.selectContainer > div > div {
-    margin: 0;
-}
-
 .label {
     color: var(--color-gray-alt);
     line-height: 22px;
@@ -61,12 +15,14 @@
     margin-bottom: var(--space-eight);
 }
 
-.noExchangeText {
-    color: var(--color-gray-alt);
-    line-height: 22px;
+.selectContainer {
+    position: relative;
+    margin-bottom: var(--spacing-default);
+}
+
+/* removes space between select box and actual dropdown */
+.selectContainer :global(.react-select__menu) {
     margin: 0;
-    text-align: center;
-    margin-top: calc((var(--space-eight) + var(--space-half)));
 }
 
 .radioButtonsContainer {
@@ -74,36 +30,3 @@
     min-height: 400px;
     margin-top: var(--spacing-half);
 }
-
-.innerRadioButtonsContainer {
-    min-height: 110px;
-}
-
-.title {
-    font-size: 2rem;
-    font-weight: 400;
-    margin-top: 0;
-    margin-bottom: var(--space-default);
-    text-align: center;
-}
-
-.infoContainer {
-    margin-top: var(--space-default);
-    position: relative;
-}
-
-.link {
-  color: var(--color-default);
-}
-
-.textIcon {
-    height: 1em;
-    margin-right: 0.5em;
-    vertical-align: text-bottom;
-}
-
-@media screen and (max-width: 400px) {
-    .buttonBack {
-        width: 100%;
-    }
-}
\ No newline at end of file
diff --git a/frontends/web/src/routes/market/market.tsx b/frontends/web/src/routes/market/market.tsx
index beeab58852..7361f8e9e8 100644
--- a/frontends/web/src/routes/market/market.tsx
+++ b/frontends/web/src/routes/market/market.tsx
@@ -21,8 +21,9 @@ import { useTranslation } from 'react-i18next';
 import { SingleValue } from 'react-select';
 import { i18n } from '@/i18n/i18n';
 import * as marketAPI from '@/api/market';
-import { AccountCode, IAccount } from '@/api/account';
-import { Header } from '@/components/layout';
+import { AccountCode, TAccount } from '@/api/account';
+import { GuidedContent, GuideWrapper, Header, Main } from '@/components/layout';
+import { View, ViewContent } from '@/components/view/view';
 import { MarketGuide } from './guide';
 import { isBitcoinOnly } from '@/routes/account/utils';
 import { useLoad } from '@/hooks/api';
@@ -40,9 +41,9 @@ import { InfoContent, TInfoContentProps } from './components/infocontent';
 import style from './market.module.css';
 
 type TProps = {
-  accounts: IAccount[];
+  accounts: TAccount[];
   code: AccountCode;
-}
+};
 
 export const Market = ({
   accounts,
@@ -53,7 +54,7 @@ export const Market = ({
   const [selectedRegion, setSelectedRegion] = useState('');
   const [regions, setRegions] = useState<TOption[]>([]);
   const [info, setInfo] = useState<TInfoContentProps>();
-  const [supportedAccounts, setSupportedAccounts] = useState<IAccount[]>([]);
+  const [supportedAccounts, setSupportedAccounts] = useState<TAccount[]>([]);
   const [activeTab, setActiveTab] = useState<marketAPI.TMarketAction>('buy');
 
   const regionCodes = useLoad(marketAPI.getMarketRegionCodes);
@@ -146,68 +147,76 @@ export const Market = ({
     }
   };
 
+  const translationContext = hasOnlyBTCAccounts ? 'bitcoin' : 'crypto';
+
   return (
-    <div className="contentWithGuide">
-      <div className="container">
-        <Dialog
-          medium
-          title={info && info.vendorName !== 'region' ? getVendorFormattedName(info.vendorName) : t('buy.exchange.region')}
-          onClose={() => setInfo(undefined)}
-          open={!!info}
-        >
-          {info && (
-            <InfoContent
-              action={info.action}
-              accounts={accounts}
-              vendorName={info.vendorName}
-              paymentFees={info.paymentFees}
-            />
-          )}
-        </Dialog>
-        <div className="innerContainer scrollableContainer">
-          <Header title={<h2>{ activeTab === 'spend' ? (
-            t('generic.spend', { context: hasOnlyBTCAccounts ? 'bitcoin' : 'crypto' })
-          ) : (
-            title
-          )}</h2>}/>
-          <div className={[style.exchangeContainer, 'content', 'narrow', 'isVerticallyCentered'].join(' ')}>
-            <p className={style.label}>{t('buy.exchange.region')}</p>
-            {regions.length ? (
-              <>
-                <div className={style.selectContainer}>
-                  <CountrySelect
-                    onChangeRegion={handleChangeRegion}
-                    regions={regions}
-                    selectedRegion={selectedRegion}
-                  />
-                  <InfoButton onClick={() => setInfo({
-                    action: activeTab,
-                    vendorName: 'region',
-                    paymentFees: {}
-                  })} />
-                </div>
-                <MarketTab
-                  onChangeTab={(tab) => {
-                    setActiveTab(tab);
-                  }}
-                  activeTab={activeTab}
-                />
-                <div className={style.radioButtonsContainer}>
-                  <Deals
-                    marketDealsResponse={getDealReponse(activeTab)}
-                    btcDirectOTCSupported={btcDirectOTCSupported}
-                    goToVendor={goToVendor}
-                    showBackButton={supportedAccounts.length > 1}
-                    action={activeTab}
-                    setInfo={setInfo}
-                  />
-                </div>
-              </>
-            ) : <Spinner />}
-          </div>
-        </div>
-      </div>
-      <MarketGuide translationContext={hasOnlyBTCAccounts ? 'bitcoin' : 'crypto'} />
-    </div>
+    <Main>
+      <GuideWrapper>
+        <GuidedContent>
+          <Dialog
+            medium
+            title={info && info.vendorName !== 'region' ? getVendorFormattedName(info.vendorName) : t('buy.exchange.region')}
+            onClose={() => setInfo(undefined)}
+            open={!!info}
+          >
+            {info && (
+              <InfoContent
+                action={info.action}
+                accounts={accounts}
+                vendorName={info.vendorName}
+                paymentFees={info.paymentFees}
+              />
+            )}
+          </Dialog>
+          <Header title={
+            <h2>
+              {activeTab === 'spend' ? (
+                t('generic.spend', { context: translationContext })
+              ) : title}
+            </h2>
+          } />
+          <View width="550px" verticallyCentered fitContent fullscreen={false}>
+            <ViewContent fullWidth>
+              <div className={style.exchangeContainer}>
+                <p className={style.label}>
+                  {t('buy.exchange.region')}
+                </p>
+                {regions.length ? (
+                  <>
+                    <div className={style.selectContainer}>
+                      <CountrySelect
+                        onChangeRegion={handleChangeRegion}
+                        regions={regions}
+                        selectedRegion={selectedRegion}
+                      />
+                      <InfoButton onClick={() => setInfo({
+                        action: activeTab,
+                        vendorName: 'region',
+                        paymentFees: {}
+                      })} />
+                    </div>
+                    <MarketTab
+                      onChangeTab={setActiveTab}
+                      activeTab={activeTab}
+                    />
+                    <div className={style.radioButtonsContainer}>
+                      <Deals
+                        marketDealsResponse={getDealReponse(activeTab)}
+                        btcDirectOTCSupported={btcDirectOTCSupported}
+                        goToVendor={goToVendor}
+                        showBackButton={supportedAccounts.length > 1}
+                        action={activeTab}
+                        setInfo={setInfo}
+                      />
+                    </div>
+                  </>
+                ) : <Spinner />}
+              </div>
+            </ViewContent>
+          </View>
+        </GuidedContent>
+        <MarketGuide translationContext={translationContext} />
+      </GuideWrapper>
+    </Main>
   );
 };
diff --git a/frontends/web/src/routes/market/moonpay.tsx b/frontends/web/src/routes/market/moonpay.tsx
index 74457bb845..da0e62eb01 100644
--- a/frontends/web/src/routes/market/moonpay.tsx
+++ b/frontends/web/src/routes/market/moonpay.tsx
@@ -20,7 +20,7 @@ import { useTranslation } from 'react-i18next';
 import { useLoad } from '@/hooks/api';
 import { useDarkmode } from '@/hooks/darkmode';
 import { UseDisableBackButton } from '@/hooks/backbutton';
-import { AccountCode, IAccount } from '@/api/account';
+import { AccountCode, TAccount } from '@/api/account';
 import { getConfig } from '@/utils/config';
 import { getMoonpayBuyInfo } from '@/api/market';
 import { MarketGuide } from './guide';
@@ -31,9 +31,9 @@ import { MoonpayTerms } from '@/components/terms/moonpay-terms';
 import style from './iframe.module.css';
 
 type TProps = {
-    accounts: IAccount[];
-    code: AccountCode;
-}
+  accounts: TAccount[];
+  code: AccountCode;
+};
 
 export const Moonpay = ({ accounts, code }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/market/pocket.tsx b/frontends/web/src/routes/market/pocket.tsx
index 030909a8b5..aa28a6cd06 100644
--- a/frontends/web/src/routes/market/pocket.tsx
+++ b/frontends/web/src/routes/market/pocket.tsx
@@ -38,7 +38,7 @@ import style from './iframe.module.css';
 type TProps = {
   action: TMarketAction;
   code: AccountCode;
-}
+};
 
 export const Pocket = ({
   action,
diff --git a/frontends/web/src/routes/market/utils.ts b/frontends/web/src/routes/market/utils.ts
index 18b8ce78fc..872ebce64b 100644
--- a/frontends/web/src/routes/market/utils.ts
+++ b/frontends/web/src/routes/market/utils.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { getMarketVendors, TVendorName } from '@/api/market';
 
 /**
@@ -40,12 +40,12 @@ export const getVendorFormattedName = (
 /**
  * Filters a given accounts list, keeping only the accounts supported by at least one vendor.
  */
-export const getVendorSupportedAccounts = async (accounts: IAccount[]): Promise<IAccount[]> => {
+export const getVendorSupportedAccounts = async (accounts: TAccount[]): Promise<TAccount[]> => {
   const accountsWithFalsyValue = await Promise.all(
     accounts.map(async (account) => {
       const supported = await getMarketVendors(account.code)();
       return supported.vendors.length ? account : false;
     })
   );
-  return accountsWithFalsyValue.filter(result => result) as IAccount[];
+  return accountsWithFalsyValue.filter(result => result) as TAccount[];
 };
diff --git a/frontends/web/src/routes/router.tsx b/frontends/web/src/routes/router.tsx
index 1d2966034e..78099407b9 100644
--- a/frontends/web/src/routes/router.tsx
+++ b/frontends/web/src/routes/router.tsx
@@ -16,7 +16,7 @@
 
 import React, { ReactChild } from 'react';
 import { Route, Routes, useParams } from 'react-router-dom';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { TDevices } from '@/api/devices';
 import { AddAccount } from './account/add/add';
 import { Moonpay } from './market/moonpay';
@@ -54,15 +54,15 @@ import { AllAccounts } from '@/routes/accounts/all-accounts';
 import { More } from '@/routes/settings/more';
 
 type TAppRouterProps = {
-    devices: TDevices;
-    accounts: IAccount[];
-    activeAccounts: IAccount[];
-    devicesKey: ((input: string) => string)
-}
+  devices: TDevices;
+  accounts: TAccount[];
+  activeAccounts: TAccount[];
+  devicesKey: ((input: string) => string);
+};
 
 type TInjectParamsProps = {
   children: ReactChild;
-}
+};
 
 const InjectParams = ({ children }: TInjectParamsProps) => {
   const params = useParams();
diff --git a/frontends/web/src/routes/settings/advanced-settings.tsx b/frontends/web/src/routes/settings/advanced-settings.tsx
index adfe588080..bd2dc6fdf8 100644
--- a/frontends/web/src/routes/settings/advanced-settings.tsx
+++ b/frontends/web/src/routes/settings/advanced-settings.tsx
@@ -40,25 +40,25 @@ import { GlobalBanners } from '@/components/banners';
 export type TProxyConfig = {
   proxyAddress: string;
   useProxy: boolean;
-}
+};
 
 export type TFrontendConfig = {
   expertFee?: boolean;
   coinControl?: boolean;
-}
+};
 
 export type TBackendConfig = {
-  proxy?: TProxyConfig
+  proxy?: TProxyConfig;
   authentication?: boolean;
   startInTestnet?: boolean;
   gapLimitReceive?: number;
   gapLimitChange?: number;
-}
+};
 
 export type TConfig = {
-  backend?: TBackendConfig
-  frontend?: TFrontendConfig
-}
+  backend?: TBackendConfig;
+  frontend?: TFrontendConfig;
+};
 
 export const AdvancedSettings = ({ devices, hasAccounts }: TPagePropsWithSettingsTabs) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/bb02-settings.tsx b/frontends/web/src/routes/settings/bb02-settings.tsx
index f31dd108d8..ec871f3af7 100644
--- a/frontends/web/src/routes/settings/bb02-settings.tsx
+++ b/frontends/web/src/routes/settings/bb02-settings.tsx
@@ -47,7 +47,7 @@ import styles from './bb02-settings.module.css';
 
 type TProps = {
   deviceID: string;
-}
+};
 
 type TWrapperProps = TProps & TPagePropsWithSettingsTabs;
 
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/custom-gap-limit-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/custom-gap-limit-setting.tsx
index 823c6ae438..77801509a1 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/custom-gap-limit-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/custom-gap-limit-setting.tsx
@@ -26,7 +26,7 @@ import { Message } from '@/components/message/message';
 type TProps = {
   backendConfig?: TBackendConfig;
   onChangeConfig: (config: TConfig) => void;
-}
+};
 
 export const CustomGapLimitSettings = ({ backendConfig, onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/enable-auth-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/enable-auth-setting.tsx
index d231865be5..7a28b7d8f6 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/enable-auth-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/enable-auth-setting.tsx
@@ -26,7 +26,7 @@ import { runningInAndroid, runningInIOS } from '@/utils/env';
 type TProps = {
   backendConfig?: TBackendConfig;
   onChangeConfig: Dispatch<TConfig>;
-}
+};
 
 export const EnableAuthSetting = ({ backendConfig, onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/enable-coin-control-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/enable-coin-control-setting.tsx
index 451dc10363..ec6bfb7ab4 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/enable-coin-control-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/enable-coin-control-setting.tsx
@@ -24,7 +24,7 @@ import { setConfig } from '@/utils/config';
 type TProps = {
   frontendConfig?: TFrontendConfig;
   onChangeConfig: Dispatch<TConfig>;
-}
+};
 
 export const EnableCoinControlSetting = ({ frontendConfig, onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/enable-custom-fees-toggle-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/enable-custom-fees-toggle-setting.tsx
index ed9ef90604..bfe8b01c96 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/enable-custom-fees-toggle-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/enable-custom-fees-toggle-setting.tsx
@@ -24,7 +24,7 @@ import { setConfig } from '@/utils/config';
 type TProps = {
   frontendConfig?: TFrontendConfig;
   onChangeConfig: Dispatch<TConfig>;
-}
+};
 
 export const EnableCustomFeesToggleSetting = ({ frontendConfig, onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/enable-tor-proxy-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/enable-tor-proxy-setting.tsx
index 20ff56adee..2801175584 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/enable-tor-proxy-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/enable-tor-proxy-setting.tsx
@@ -26,7 +26,7 @@ import styles from './enable-tor-proxy-setting.module.css';
 type TProps = {
   proxyConfig?: TProxyConfig;
   onChangeConfig: Dispatch<any>;
-}
+};
 
 export const EnableTorProxySetting = ({ proxyConfig, onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/restart-in-testnet-setting.tsx b/frontends/web/src/routes/settings/components/advanced-settings/restart-in-testnet-setting.tsx
index 9bc073c9dc..3122613046 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/restart-in-testnet-setting.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/restart-in-testnet-setting.tsx
@@ -27,7 +27,7 @@ import { UseBackButton } from '@/hooks/backbutton';
 
 type TProps = {
   onChangeConfig: Dispatch<TConfig>;
-}
+};
 
 export const RestartInTestnetSetting = ({ onChangeConfig }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/advanced-settings/tor-proxy-dialog.tsx b/frontends/web/src/routes/settings/components/advanced-settings/tor-proxy-dialog.tsx
index 41c529bb8d..209d552f7c 100644
--- a/frontends/web/src/routes/settings/components/advanced-settings/tor-proxy-dialog.tsx
+++ b/frontends/web/src/routes/settings/components/advanced-settings/tor-proxy-dialog.tsx
@@ -30,7 +30,7 @@ type TProps = {
   onCloseDialog: () => void;
   onChangeConfig: (config: any) => void;
   handleShowRestartMessage: Dispatch<boolean>;
-}
+};
 
 export const TorProxyDialog = ({ open, proxyConfig, onCloseDialog, onChangeConfig, handleShowRestartMessage }: TProps) => {
   const [proxyAddress, setProxyAddress] = useState<string>();
diff --git a/frontends/web/src/routes/settings/components/appearance/activecurrenciesdropdown.tsx b/frontends/web/src/routes/settings/components/appearance/activecurrenciesdropdown.tsx
index 02d87306f1..4db2bc13e4 100644
--- a/frontends/web/src/routes/settings/components/appearance/activecurrenciesdropdown.tsx
+++ b/frontends/web/src/routes/settings/components/appearance/activecurrenciesdropdown.tsx
@@ -25,9 +25,9 @@ import activeCurrenciesDropdownStyle from './activecurrenciesdropdown.module.css
 import settingsDropdownStyles from './settingsdropdown.module.css';
 
 type SelectOption = {
-    label: string;
-    value: Fiat;
-}
+  label: string;
+  value: Fiat;
+};
 
 type TSelectProps = {
   options: SelectOption[];
diff --git a/frontends/web/src/routes/settings/components/device-settings/attestation-check-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/attestation-check-setting.tsx
index d6863edf84..d8100038f4 100644
--- a/frontends/web/src/routes/settings/components/device-settings/attestation-check-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/attestation-check-setting.tsx
@@ -23,7 +23,7 @@ import { StyledSkeleton } from '@/routes/settings/bb02-settings';
 
 type TProps = {
   deviceID: string;
-}
+};
 
 const AttestationCheckSetting = ({ deviceID }: TProps) => {
   const [attestation, setAttestation] = useState<boolean | null>(null);
diff --git a/frontends/web/src/routes/settings/components/device-settings/bip85-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/bip85-setting.tsx
index 3de05bb633..0a9f11d471 100644
--- a/frontends/web/src/routes/settings/components/device-settings/bip85-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/bip85-setting.tsx
@@ -22,7 +22,7 @@ import { WarningOLD } from '@/components/icon';
 type TProps = {
   deviceID: string;
   canBIP85: boolean;
-}
+};
 
 export const Bip85Setting = ({ canBIP85, deviceID }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/settings/components/device-settings/bluetooth-firmware-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/bluetooth-firmware-setting.tsx
index dfb1e8a6b9..e564c9dec1 100644
--- a/frontends/web/src/routes/settings/components/device-settings/bluetooth-firmware-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/bluetooth-firmware-setting.tsx
@@ -20,7 +20,7 @@ import { SettingsItem } from '@/routes/settings/components/settingsItem/settings
 
 export type TProps = {
   firmwareVersion: string;
-}
+};
 
 export const BluetoothFirmwareSetting = ({ firmwareVersion }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/bluetooth-toggle-enabled-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/bluetooth-toggle-enabled-setting.tsx
index 3d1054f9e3..aaa9d2b988 100644
--- a/frontends/web/src/routes/settings/components/device-settings/bluetooth-toggle-enabled-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/bluetooth-toggle-enabled-setting.tsx
@@ -25,12 +25,12 @@ import { StyledSkeleton } from '@/routes/settings/bb02-settings';
 
 type TBluetoothToggleEnabledSettingProps = {
   deviceID: string;
-}
+};
 
 type TToggleEnabledWaitDialogProps = {
   show: boolean;
   enabled: boolean;
-}
+};
 
 const ToggleEnabledWaitDialog = ({ show, enabled }: TToggleEnabledWaitDialogProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/device-name-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/device-name-setting.tsx
index 7035a8e8da..ce9a6f7f62 100644
--- a/frontends/web/src/routes/settings/components/device-settings/device-name-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/device-name-setting.tsx
@@ -29,7 +29,7 @@ import nameStyle from '@/routes/device/bitbox02/setup/name.module.css';
 type TDeviceNameSettingProps = {
   deviceName: string;
   deviceID: string;
-}
+};
 
 type TDialogProps = {
   open: boolean;
@@ -38,11 +38,11 @@ type TDialogProps = {
   onInputChange: (value: string) => void;
   name: string;
   handleUpdateName: () => void;
-}
+};
 
 type TWaitDialogProps = {
   inProgress: boolean;
-}
+};
 
 const DeviceNameSetting = ({ deviceName, deviceID }: TDeviceNameSettingProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/factory-reset-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/factory-reset-setting.tsx
index 7871feeadc..f5e0afc258 100644
--- a/frontends/web/src/routes/settings/components/device-settings/factory-reset-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/factory-reset-setting.tsx
@@ -27,7 +27,7 @@ import styles from './factory-reset-setting.module.css';
 
 type TProps = {
   deviceID: string;
-}
+};
 
 export const FactoryResetSetting = ({ deviceID }: TProps) => {
   const [understand, setUnderstand] = useState(false);
diff --git a/frontends/web/src/routes/settings/components/device-settings/firmware-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/firmware-setting.tsx
index a3e45819a1..455a342c9e 100644
--- a/frontends/web/src/routes/settings/components/device-settings/firmware-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/firmware-setting.tsx
@@ -24,18 +24,18 @@ import { Checked, RedDot } from '@/components/icon';
 import { SettingsItem } from '@/routes/settings/components/settingsItem/settingsItem';
 
 export type TProps = {
-    deviceID: string;
-    versionInfo: VersionInfo;
-    asButton?: boolean;
-}
+  deviceID: string;
+  versionInfo: VersionInfo;
+  asButton?: boolean;
+};
 
 export type TUpgradeDialogProps = {
-    open: boolean;
-    versionInfo: VersionInfo;
-    confirming: boolean;
-    onUpgradeFirmware: () => void;
-    onClose: () => void;
-}
+  open: boolean;
+  versionInfo: VersionInfo;
+  confirming: boolean;
+  onUpgradeFirmware: () => void;
+  onClose: () => void;
+};
 
 const FirmwareSetting = ({ deviceID, versionInfo, asButton = false }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/go-to-startup-settings.tsx b/frontends/web/src/routes/settings/components/device-settings/go-to-startup-settings.tsx
index c0952778b1..dae705d305 100644
--- a/frontends/web/src/routes/settings/components/device-settings/go-to-startup-settings.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/go-to-startup-settings.tsx
@@ -21,12 +21,12 @@ import { SettingsItem } from '@/routes/settings/components/settingsItem/settings
 import { WaitDialog } from '@/components/wait-dialog/wait-dialog';
 
 type TGoToStartupSettingsProps = {
-    deviceID: string;
-}
+  deviceID: string;
+};
 
 type TStartupSettingsWaitDialogProps = {
-    show: boolean;
-}
+  show: boolean;
+};
 
 const StartupSettingsWaitDialog = ({ show }: TStartupSettingsWaitDialogProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/manage-backup-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/manage-backup-setting.tsx
index 2104383ec6..902f9afc80 100644
--- a/frontends/web/src/routes/settings/components/device-settings/manage-backup-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/manage-backup-setting.tsx
@@ -20,7 +20,7 @@ import { SettingsItem } from '@/routes/settings/components/settingsItem/settings
 
 type TProps = {
   deviceID: string;
-}
+};
 
 const ManageBackupSetting = ({ deviceID }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/settings/components/device-settings/passphrase-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/passphrase-setting.tsx
index 6d25313715..d0e9d394b0 100644
--- a/frontends/web/src/routes/settings/components/device-settings/passphrase-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/passphrase-setting.tsx
@@ -19,9 +19,9 @@ import { useTranslation } from 'react-i18next';
 import { SettingsItem } from '@/routes/settings/components/settingsItem/settingsItem';
 
 type TProps = {
-    deviceID: string;
-    passphraseEnabled: boolean;
-}
+  deviceID: string;
+  passphraseEnabled: boolean;
+};
 
 const PassphraseSetting = ({ deviceID, passphraseEnabled }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/settings/components/device-settings/root-fingerprint-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/root-fingerprint-setting.tsx
index 5ca2c0e283..138b6dc99a 100644
--- a/frontends/web/src/routes/settings/components/device-settings/root-fingerprint-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/root-fingerprint-setting.tsx
@@ -18,8 +18,8 @@ import { useTranslation } from 'react-i18next';
 import { SettingsItem, SettingsValue } from '@/routes/settings/components/settingsItem/settingsItem';
 
 type TProps = {
-    rootFingerprint: string;
-}
+  rootFingerprint: string;
+};
 
 const RootFingerprintSetting = ({ rootFingerprint }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/secure-chip-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/secure-chip-setting.tsx
index b645a4e86b..a5932758c8 100644
--- a/frontends/web/src/routes/settings/components/device-settings/secure-chip-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/secure-chip-setting.tsx
@@ -18,8 +18,8 @@ import { useTranslation } from 'react-i18next';
 import { SettingsItem } from '@/routes/settings/components/settingsItem/settingsItem';
 
 type TProps = {
-    secureChipModel: string;
-}
+  secureChipModel: string;
+};
 
 const SecureChipSetting = ({ secureChipModel }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/device-settings/show-recovery-words-setting.tsx b/frontends/web/src/routes/settings/components/device-settings/show-recovery-words-setting.tsx
index 4e630c19d7..013fab793a 100644
--- a/frontends/web/src/routes/settings/components/device-settings/show-recovery-words-setting.tsx
+++ b/frontends/web/src/routes/settings/components/device-settings/show-recovery-words-setting.tsx
@@ -20,7 +20,7 @@ import { SettingsItem } from '@/routes/settings/components/settingsItem/settings
 
 type TProps = {
   deviceID: string;
-}
+};
 
 export const ShowRecoveryWordsSetting = ({ deviceID }: TProps) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/manage-accounts/dialogs/disableRememberWalletDialog.tsx b/frontends/web/src/routes/settings/components/manage-accounts/dialogs/disableRememberWalletDialog.tsx
index 263c3e8985..038ecd3235 100644
--- a/frontends/web/src/routes/settings/components/manage-accounts/dialogs/disableRememberWalletDialog.tsx
+++ b/frontends/web/src/routes/settings/components/manage-accounts/dialogs/disableRememberWalletDialog.tsx
@@ -6,7 +6,7 @@ type Props = {
   open: boolean;
   onClose: () => void;
   onConfirm: () => void;
-}
+};
 export const DisableRememberWalletDialog = ({ open, onClose, onConfirm }: Props) => {
   const { t } = useTranslation();
 
diff --git a/frontends/web/src/routes/settings/components/manage-accounts/dialogs/enableRememberWalletDialog.tsx b/frontends/web/src/routes/settings/components/manage-accounts/dialogs/enableRememberWalletDialog.tsx
index a43d1c51b8..bc6a6bdeb2 100644
--- a/frontends/web/src/routes/settings/components/manage-accounts/dialogs/enableRememberWalletDialog.tsx
+++ b/frontends/web/src/routes/settings/components/manage-accounts/dialogs/enableRememberWalletDialog.tsx
@@ -8,7 +8,7 @@ import { getConfig, setConfig } from '@/utils/config';
 type Props = {
   open: boolean;
   onClose: () => void;
-}
+};
 export const EnableRememberWalletDialog = ({ open, onClose }: Props) => {
   const { t } = useTranslation();
   const config = useLoad(getConfig);
diff --git a/frontends/web/src/routes/settings/components/manage-accounts/watchonlySetting.tsx b/frontends/web/src/routes/settings/components/manage-accounts/watchonlySetting.tsx
index 9984794d07..c5a09a0fa2 100644
--- a/frontends/web/src/routes/settings/components/manage-accounts/watchonlySetting.tsx
+++ b/frontends/web/src/routes/settings/components/manage-accounts/watchonlySetting.tsx
@@ -28,7 +28,7 @@ import style from './watchonlySettings.module.css';
 
 type Props = {
   keystore: accountAPI.TKeystore;
-}
+};
 
 export const WatchonlySetting = ({ keystore }: Props) => {
   const { t } = useTranslation();
diff --git a/frontends/web/src/routes/settings/components/mobile-header.tsx b/frontends/web/src/routes/settings/components/mobile-header.tsx
index a04121be99..dc8c6bcb37 100644
--- a/frontends/web/src/routes/settings/components/mobile-header.tsx
+++ b/frontends/web/src/routes/settings/components/mobile-header.tsx
@@ -22,7 +22,7 @@ type TProps = {
   title: string;
   withGuide?: boolean;
   onClick?: () => void;
-}
+};
 
 export const MobileHeader = ({ title, withGuide = false, onClick }: TProps) => {
   const navigate = useNavigate();
diff --git a/frontends/web/src/routes/settings/components/settingsItem/settingsItem.tsx b/frontends/web/src/routes/settings/components/settingsItem/settingsItem.tsx
index d091b7f044..72a22b4837 100644
--- a/frontends/web/src/routes/settings/components/settingsItem/settingsItem.tsx
+++ b/frontends/web/src/routes/settings/components/settingsItem/settingsItem.tsx
@@ -31,7 +31,7 @@ type TProps = {
   settingName: string | ReactNode;
   title?: string;
   canUpgrade?: boolean;
-}
+};
 
 export const SettingsItem = ({
   className = '',
@@ -119,7 +119,7 @@ export const SettingsItem = ({
 type TSettingsValueProps = {
   children: ReactNode;
   wrap?: boolean;
-}
+};
 
 export const SettingsValue = ({
   children,
diff --git a/frontends/web/src/routes/settings/components/tabs.tsx b/frontends/web/src/routes/settings/components/tabs.tsx
index cac4a1d428..f7eebc0e59 100644
--- a/frontends/web/src/routes/settings/components/tabs.tsx
+++ b/frontends/web/src/routes/settings/components/tabs.tsx
@@ -29,20 +29,20 @@ type TWithSettingsTabsProps = {
   devices: TDevices;
   hasAccounts: boolean;
   hideMobileMenu?: boolean;
-}
+};
 
 type TTab = {
   name: string;
   url: string;
   hideMobileMenu?: boolean;
   canUpgrade?: boolean;
-}
+};
 
 type TTabs = {
   devices: TDevices;
   hasAccounts: boolean;
   hideMobileMenu?: boolean;
-}
+};
 
 export const WithSettingsTabs = ({
   children,
@@ -106,7 +106,7 @@ export const Tab = ({
 type TTabWithVersionCheck = TTab & {
   deviceID: string;
   device: TPlatformName;
-}
+};
 
 const TabWithVersionCheck = ({ deviceID, device, ...props }: TTabWithVersionCheck) => {
   const isBitBox02 = device === 'bitbox02';
diff --git a/frontends/web/src/routes/settings/manage-account-guide.tsx b/frontends/web/src/routes/settings/manage-account-guide.tsx
index d916e12381..c43ce421f3 100644
--- a/frontends/web/src/routes/settings/manage-account-guide.tsx
+++ b/frontends/web/src/routes/settings/manage-account-guide.tsx
@@ -18,12 +18,12 @@ import { useTranslation } from 'react-i18next';
 import { i18n } from '@/i18n/i18n';
 import { Entry } from '@/components/guide/entry';
 import { Guide } from '@/components/guide/guide';
-import { IAccount } from '@/api/account';
+import { TAccount } from '@/api/account';
 import { isBitcoinOnly } from '@/routes/account/utils';
 
 type TAccountGuide = {
-  accounts: IAccount[]
-}
+  accounts: TAccount[];
+};
 
 const getCoinsLink = () => {
   switch (i18n.resolvedLanguage) {
diff --git a/frontends/web/src/routes/settings/manage-accounts.tsx b/frontends/web/src/routes/settings/manage-accounts.tsx
index cd32c8ec5c..d6ffbe8b7e 100644
--- a/frontends/web/src/routes/settings/manage-accounts.tsx
+++ b/frontends/web/src/routes/settings/manage-accounts.tsx
@@ -39,15 +39,15 @@ import { GlobalBanners } from '@/components/banners';
 import { ConnectedKeystore } from '@/components/keystore/connected-keystore';
 import style from './manage-accounts.module.css';
 
-interface ManageAccountsProps {
-  accounts: accountAPI.IAccount[];
-}
+type ManageAccountsProps = {
+  accounts: accountAPI.TAccount[];
+};
 
 type Props = ManageAccountsProps & TPagePropsWithSettingsTabs;
 
 type TShowTokens = {
   readonly [key in string]: boolean;
-}
+};
 
 export const ManageAccounts = ({ accounts, devices, hasAccounts }: Props) => {
 
@@ -56,7 +56,7 @@ export const ManageAccounts = ({ accounts, devices, hasAccounts }: Props) => {
   const { t } = useTranslation();
   const [editErrorMessage, setEditErrorMessage] = useState<string | undefined>(undefined);
   const [showTokens, setShowTokens] = useState<TShowTokens>({});
-  const [currentlyEditedAccount, setCurrentlyEditedAccount] = useState<accountAPI.IAccount | undefined>(undefined);
+  const [currentlyEditedAccount, setCurrentlyEditedAccount] = useState<accountAPI.TAccount | undefined>(undefined);
 
   const erc20Tokens: Readonly<accountAPI.Terc20Token[]> = [
     { code: 'eth-erc20-usdt', name: 'Tether USD', unit: 'USDT' },
@@ -70,7 +70,10 @@ export const ManageAccounts = ({ accounts, devices, hasAccounts }: Props) => {
     { code: 'eth-erc20-dai0x6b17', name: 'Dai', unit: 'DAI' },
   ];
 
-  const renderTokens = (ethAccountCode: accountAPI.AccountCode, activeTokens?: accountAPI.IActiveToken[]) => {
+  const renderTokens = (
+    ethAccountCode: accountAPI.AccountCode,
+    activeTokens?: accountAPI.TActiveToken[],
+  ) => {
     return erc20Tokens.map(token => {
       const activeToken = (activeTokens || []).find(t => t.tokenCode === token.code);
       const active = activeToken !== undefined;
@@ -158,7 +161,7 @@ export const ManageAccounts = ({ accounts, devices, hasAccounts }: Props) => {
       });
   };
 
-  const renderAccounts = (accounts: accountAPI.IAccount[]) => {
+  const renderAccounts = (accounts: accountAPI.TAccount[]) => {
     return accounts.filter(account => !account.isToken).map(account => {
       const active = account.active;
       const tokensVisible = showTokens[account.code];
diff --git a/frontends/web/src/routes/settings/more.tsx b/frontends/web/src/routes/settings/more.tsx
index e4d2630d7a..f427ee3f94 100644
--- a/frontends/web/src/routes/settings/more.tsx
+++ b/frontends/web/src/routes/settings/more.tsx
@@ -34,7 +34,7 @@ import styles from './more.module.css';
 
 type Props = {
   devices: TDevices;
-}
+};
 
 export const More = ({ devices }: Props) => {
   const navigate = useNavigate();
@@ -42,7 +42,7 @@ export const More = ({ devices }: Props) => {
   useOnlyVisitableOnMobile('/settings/general');
   const deviceID = Object.keys(devices)[0];
   const isBitBox02 = deviceID && devices[deviceID] === 'bitbox02';
-  const versionInfo = useLoad(isBitBox02 ? () => getVersion(deviceID) : null, [deviceID]);
+  const versionInfo = useLoad(isBitBox02 ? () => getVersion(deviceID) : null, [deviceID, isBitBox02]);
   const canUpgrade = versionInfo ? versionInfo.canUpgrade : false;
 
   return (
diff --git a/frontends/web/src/style/variables.css b/frontends/web/src/style/variables.css
index 46e07d42dc..175842019e 100644
--- a/frontends/web/src/style/variables.css
+++ b/frontends/web/src/style/variables.css
@@ -48,21 +48,14 @@
     --color-error-border: rgba(227, 6, 19, .33);
 
     /* font sizes */
-    --size-extra-large: 2.2rem;
     --size-large: 2rem;
-    --size-large-mobile: 1.4rem;
+    --size-header: 24px;
     --size-subheader: 18px;
-    --size-medium: var(--size-default);
     --size-default: 14px;
     --size-small: 12px;
     --size-xsmall: 11px;
-    --size-label: var(--size-small);
-    --size-button: var(--size-default);
     --size-title: 32px;
 
-    /* wizard */
-    --size-wizard-text: 16px;
-
     /* spacing */
     --spacing-large: 2rem;
     --spacing-default: 1rem;
@@ -94,7 +87,6 @@
 
     /* header */
     --header-height: 70px;
-    --header-default-font-size: 24px;
 
     /* content */
     --content-width: 1080px;
@@ -208,11 +200,9 @@
 
 @media (max-width: 768px) {
     :root {
-        --header-default-font-size: 20px;
+        --size-header: 20px;
         --size-subheader: 16px;
         --size-title: 16px;
-
-        --size-wizard-text: 14px;
         --size-default: 16px;
     }
 }
diff --git a/frontends/web/src/utils/event.ts b/frontends/web/src/utils/event.ts
index 53384c36c7..e091408ab5 100644
--- a/frontends/web/src/utils/event.ts
+++ b/frontends/web/src/utils/event.ts
@@ -26,11 +26,11 @@ export type { TEvent, TUnsubscribe };
 export type Observer = (event: TEvent) => void;
 
 /**
- * This interface describes how the subscriptions are stored.
+ * This type describes how the subscriptions are stored.
  */
-interface Subscriptions {
-    [subject: string]: Observer[]; // TypeScript does not allow the type alias Subject there.
-}
+type Subscriptions = {
+  [subject: string]: Observer[]; // TypeScript does not allow the type alias Subject there.
+};
 
 /**
  * Stores the subscriptions as an object-based hash map.
diff --git a/frontends/web/src/utils/markup.tsx b/frontends/web/src/utils/markup.tsx
index 5b8559fd03..6f3f8c3aab 100644
--- a/frontends/web/src/utils/markup.tsx
+++ b/frontends/web/src/utils/markup.tsx
@@ -18,9 +18,9 @@
 import React, { Fragment, createElement } from 'react';
 
 type TMarkupProps = {
-    tagName: keyof JSX.IntrinsicElements;
-    markup: string;
-    key?: string;
+  tagName: keyof JSX.IntrinsicElements;
+  markup: string;
+  key?: string;
 } & React.HTMLAttributes<HTMLElement>;
 
 const captureStrongElement = /^(.*)<strong>(.*)<\/strong>(.*)$/m;
diff --git a/frontends/web/src/utils/transport-common.ts b/frontends/web/src/utils/transport-common.ts
index 9e370431ea..a88698c475 100644
--- a/frontends/web/src/utils/transport-common.ts
+++ b/frontends/web/src/utils/transport-common.ts
@@ -42,7 +42,7 @@ export type TEventLegacy = {
   readonly deviceID?: string;
   readonly meta?: any;
   readonly type: string;
-}
+};
 
 export type TPayload = TEventLegacy | TEvent;
 
@@ -50,8 +50,8 @@ export type TMsgCallback = (payload: TPayload) => void;
 
 export type TQueryPromiseMap = {
   [key: number]: {
-    resolve: (value: unknown) => void,
-    reject: (value: unknown) => void,
+    resolve: (value: unknown) => void;
+    reject: (value: unknown) => void;
   };
 };
 
diff --git a/frontends/web/src/utils/types.ts b/frontends/web/src/utils/types.ts
index ba07fda0af..c8916978fd 100644
--- a/frontends/web/src/utils/types.ts
+++ b/frontends/web/src/utils/types.ts
@@ -30,7 +30,7 @@ export type NonEmptyArray<T> = [T, ...T[]];
  * As it turns out, you need TypeScript 3 to enforce this constraint.
  * At the moment, we are using version 2.9.2 (yarn run tsc -version).
  */
-export type ObjectButNotFunction = object & { prototype?: never; };
+export type ObjectButNotFunction = object & { prototype?: never };
 
-export type TDeviceNameError = undefined | 'tooShort' | 'tooLong' | 'invalidChars'
+export type TDeviceNameError = undefined | 'tooShort' | 'tooLong' | 'invalidChars';
 export type TMessageTypes = 'success' | 'info' | 'warning' | 'error';
\ No newline at end of file
diff --git a/frontends/web/src/utils/walletconnect-eth-sign-handlers.ts b/frontends/web/src/utils/walletconnect-eth-sign-handlers.ts
index dfe3b40d8e..ae95753467 100644
--- a/frontends/web/src/utils/walletconnect-eth-sign-handlers.ts
+++ b/frontends/web/src/utils/walletconnect-eth-sign-handlers.ts
@@ -6,11 +6,11 @@ import { alertUser } from '@/components/alert/Alert';
 
 type TWCParams = {
   request: {
-    method: string,
-    params: any[]
+    method: string;
+    params: any[];
   };
   chainId: string;
-}
+};
 
 export type TEthSignHandlerParams = {
   topic: string;
@@ -27,14 +27,14 @@ export type TRequestDialogContent = {
   signingData: string; // data / message coming from dapp
   currentSession: SessionTypes.Struct;
   method: string;
-}
+};
 
 export type TLaunchSignDialog = {
-  topic: string,
-  id: number,
+  topic: string;
+  id: number;
   apiCaller: () => Promise<any>;
-  dialogContent: TRequestDialogContent
-}
+  dialogContent: TRequestDialogContent;
+};
 
 const fetchAccountNameAndAddress = async (address: string) => {
   const accountDetail = await getEthAccountCodeAndNameByAddress(address);
diff --git a/frontends/web/src/utils/walletconnect.ts b/frontends/web/src/utils/walletconnect.ts
index 4cf04896bb..fb452db3d9 100644
--- a/frontends/web/src/utils/walletconnect.ts
+++ b/frontends/web/src/utils/walletconnect.ts
@@ -18,8 +18,8 @@ import { IWalletKit } from '@reown/walletkit';
 import { ArbitrumLogo, OptimismLogo, BaseLogo, ETHLogo } from '@/components/icon';
 
 type TSupportedChainDetail = {
-  [key: string]: { name: string; icon: ReactNode; }
-}
+  [key: string]: { name: string; icon: ReactNode };
+};
 
 export const SUPPORTED_CHAINS: TSupportedChainDetail = {
   'eip155:1': {
diff --git a/frontends/web/tests/base.test.ts b/frontends/web/tests/base.test.ts
index 9962d2e3ae..b65a4dcb72 100644
--- a/frontends/web/tests/base.test.ts
+++ b/frontends/web/tests/base.test.ts
@@ -15,20 +15,26 @@
 */
 
 import { test } from './helpers/fixtures';
-import { startServeWallet, waitForServewallet } from './helpers/servewallet';
+import { ServeWallet } from './helpers/servewallet';
 import { expect } from '@playwright/test';
 
+let servewallet: ServeWallet;
+
 test('App main page loads', async ({ page, host, frontendPort, servewalletPort }) => {
 
-    await test.step('Start servewallet', async () => {
-        startServeWallet();
-        await waitForServewallet(page, servewalletPort, frontendPort, host);
-    });
+  await test.step('Start servewallet', async () => {
+    servewallet = new ServeWallet(page, servewalletPort, frontendPort, host);
+    await servewallet.start();
+  });
+
 
+  await test.step('Navigate to the app', async () => {
+    await page.goto(`http://${host}:${frontendPort}`);
+    const body = page.locator('body');
+    await expect(body).toContainText('Please connect your BitBox and tap the side to continue.');
+  });
+});
 
-    await test.step('Navigate to the app', async () => {
-        await page.goto(`http://${host}:${frontendPort}`);
-        const body = page.locator('body');
-        await expect(body).toContainText('Please connect your BitBox and tap the side to continue.');
-    });
+test.afterAll(() => {
+  servewallet.stop();
 });
diff --git a/frontends/web/tests/gapSettings.test.ts b/frontends/web/tests/gapSettings.test.ts
new file mode 100644
index 0000000000..89d1c81cad
--- /dev/null
+++ b/frontends/web/tests/gapSettings.test.ts
@@ -0,0 +1,89 @@
+/**
+*  Copyright 2025 Shift Crypto AG
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*       http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+
+
+import { test } from './helpers/fixtures';
+import { ServeWallet } from './helpers/servewallet';
+import { expect } from '@playwright/test';
+import { clickButtonWithText } from './helpers/dom';
+import { deleteAccountsFile } from './helpers/fs';
+
+let servewallet: ServeWallet;
+
+test('Gap limits are correctly saved', async ({ page, host, frontendPort, servewalletPort }) => {
+
+  await test.step('Start servewallet', async () => {
+    servewallet = new ServeWallet(page, servewalletPort, frontendPort, host);
+    await servewallet.start();
+  });
+
+
+  await test.step('Navigate to the app', async () => {
+    await page.goto(`http://${host}:${frontendPort}`);
+    const body = page.locator('body');
+    await expect(body).toContainText('Please connect your BitBox and tap the side to continue.');
+  });
+
+  await test.step('Type into gap limit inputs', async () => {
+    await page.getByRole('link', { name: 'Settings' }).click();
+    await page.getByRole('link', { name: 'Advanced settings' }).click();
+    await page.getByRole('button', { name: 'Custom gap limit settings' }).click();
+
+    const recvInput = page.locator('#gapLimitReceive');
+    await recvInput.clear();
+    await recvInput.click();
+    await page.keyboard.press('5');
+    await expect(page.locator('label[for="gapLimitReceive"]')).toHaveText(
+      'Gap limit for receive addresses:The gap limit must be at least 20.'
+    );
+    await page.waitForTimeout(1000);
+    await expect(recvInput).toBeFocused();
+    await page.keyboard.press('0');
+    await expect(recvInput).toBeFocused();
+
+
+    const changeInput = page.locator('#gapLimitChange');
+    await changeInput.clear();
+    await changeInput.click();
+    await page.keyboard.press('1');
+    await expect(page.locator('label[for="gapLimitChange"]')).toHaveText(
+      'Gap limit for change addresses:The gap limit must be at least 6.'
+    );
+    await page.waitForTimeout(1000);
+    await expect(changeInput).toBeFocused();
+    await page.keyboard.press('0');
+    await expect(changeInput).toBeFocused();
+
+    await clickButtonWithText(page, 'Confirm');
+  });
+
+  await test.step('Verify gap limit inputs are correctly saved', async () => {
+    await page.getByRole('button', { name: 'Custom gap limit settings' }).click();
+    const recvInput = page.locator('#gapLimitReceive');
+    await expect(recvInput).toHaveValue('50');
+    const changeInput = page.locator('#gapLimitChange');
+    await expect(changeInput).toHaveValue('10');
+  });
+});
+
+test.beforeEach(() => {
+  deleteAccountsFile();
+});
+
+test.afterAll(() => {
+  servewallet.stop();
+});
diff --git a/frontends/web/tests/helpers/dom.ts b/frontends/web/tests/helpers/dom.ts
new file mode 100644
index 0000000000..531e12b400
--- /dev/null
+++ b/frontends/web/tests/helpers/dom.ts
@@ -0,0 +1,103 @@
+/**
+ *  Copyright 2025 Shift Crypto AG
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import { Page, Locator, expect } from '@playwright/test';
+
+/**
+ * Returns a locator for elements matching a given attribute key/value pair.
+ *
+ * @param page - Playwright page
+ * @param attrKey - The attribute key to select (e.g., "data-label")
+ * @param attrValue - The value of the attribute to match
+ * @returns Locator for matching elements
+ */
+export function getFieldsByAttribute(page: Page, attrKey: string, attrValue: string): Locator {
+  return page.locator(`[${attrKey}="${attrValue}"]`);
+}
+
+/**
+ * Finds elements by attribute key/value and asserts the expected count.
+ *
+ * @param page - Playwright page
+ * @param attrKey - The attribute key to select
+ * @param attrValue - The value of the attribute to match
+ * @param expectedCount - Expected number of elements
+ */
+export async function assertFieldsCount(
+  page: Page,
+  attrKey: string,
+  attrValue: string,
+  expectedCount: number
+) {
+  const locator = getFieldsByAttribute(page, attrKey, attrValue);
+  await expect(locator).toHaveCount(expectedCount);
+}
+
+/**
+ * Click a button by its visible text.
+ * Works for "Continue", "Create wallet", "Get started", etc.
+ */
+export async function clickButtonWithText(page: Page, text: string) {
+  const button = page.locator('button', { hasText: text });
+  await button.click();
+}
+
+/**
+ * Type a string into the currently focused input.
+ */
+export async function typeIntoFocusedInput(page: Page, text: string) {
+  await page.keyboard.type(text);
+}
+
+/**
+ * Click all agreement labels (for="agreement1" … for="agreement5").
+ */
+export async function clickAllAgreements(page: Page, max = 5, timeout = 5000) {
+  for (let i = 1; i <= max; i++) {
+    const label = page.locator(`label[for="agreement${i}"]`);
+    await label.waitFor({ state: 'visible', timeout }); // wait until it's visible
+    await label.click();
+  }
+}
+
+
+
+
+/**
+ * Returns a locator for an <a> element with the specified href.
+ * @param page - Playwright page
+ * @param href - Value of the href attribute to match
+ */
+export function getLinkByHref(page: Page, href: string): Locator {
+  return page.locator(`a[href="${href}"]`);
+}
+
+
+/**
+ * Returns a locator for elements whose class contains a given substring.
+ *
+ * @param page - Playwright page
+ * @param classSubstring - Substring to match in the class attribute
+ * @param tag - Optional tag name to match (default: 'div')
+ */
+export function getElementByClassSubstring(
+  page: Page,
+  classSubstring: string,
+  tag: string = 'div'
+): Locator {
+  return page.locator(`${tag}[class*="${classSubstring}"]`);
+}
+
diff --git a/frontends/web/tests/helpers/fixtures.ts b/frontends/web/tests/helpers/fixtures.ts
index 637296235e..413898e0df 100644
--- a/frontends/web/tests/helpers/fixtures.ts
+++ b/frontends/web/tests/helpers/fixtures.ts
@@ -22,8 +22,8 @@ export const test = baseTest.extend<{
   frontendPort: number;
   servewalletPort: number;
 }>({
-  host: [process.env.HOST || 'localhost', { scope: 'worker' }],
-  frontendPort: [parseInt(process.env.FRONTEND_PORT || '8080', 10), { scope: 'worker' }],
-  servewalletPort: [parseInt(process.env.SERVE_WALLET_PORT || '8082', 10), { scope: 'worker' }],
+  host: process.env.HOST || 'localhost',
+  frontendPort: parseInt(process.env.FRONTEND_PORT || '8080', 10),
+  servewalletPort: parseInt(process.env.SERVE_WALLET_PORT || '8082', 10),
 });
 
diff --git a/frontends/web/tests/helpers/fs.ts b/frontends/web/tests/helpers/fs.ts
new file mode 100644
index 0000000000..91d6978779
--- /dev/null
+++ b/frontends/web/tests/helpers/fs.ts
@@ -0,0 +1,37 @@
+/**
+ *  Copyright 2025 Shift Crypto AG
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+export function deleteAccountsFile() {
+  const filePath = path.join(process.cwd(), '../../appfolder.dev/accounts.json');
+  deleteFile(filePath);
+}
+
+
+export function deleteConfigFile() {
+  const filePath = path.join(process.cwd(), '../../appfolder.dev/config.json');
+  deleteFile(filePath);
+}
+
+function deleteFile(filePath: string) {
+  if (fs.existsSync(filePath)) {
+    fs.unlinkSync(filePath);
+  } else {
+    console.warn(`File ${filePath} does not exist, skipping removal.`);
+  }
+}
diff --git a/frontends/web/tests/helpers/servewallet.ts b/frontends/web/tests/helpers/servewallet.ts
index ce0d6a195c..1bf7d0ede9 100644
--- a/frontends/web/tests/helpers/servewallet.ts
+++ b/frontends/web/tests/helpers/servewallet.ts
@@ -14,19 +14,11 @@
 *  limitations under the License.
 */
 
-import { spawn } from 'child_process';
-import  * as net  from 'net';
+import { spawn, ChildProcess } from 'child_process';
+import * as net from 'net';
 import type { Page } from '@playwright/test';
 
-export async function startServeWallet() {
-    spawn(
-        'make',
-        ['-C', '../../', 'servewallet'],
-        { stdio: 'inherit' }
-    );
-};
-
-function connectOnce(host: string, port: number): Promise<void> {
+async function connectOnce(host: string, port: number): Promise<void> {
   return new Promise((resolve, reject) => {
     const socket = net.connect({ host, port }, () => {
       socket.end();
@@ -36,27 +28,116 @@ function connectOnce(host: string, port: number): Promise<void> {
   });
 }
 
+export interface ServeWalletOptions {
+  simulator?: boolean;
+  timeout?: number;
+  testnet?: boolean;
+}
 
-export async function waitForServewallet(
-  page: Page,
-  servewalletPort: number,
-  frontendPort: number,
-  host: string,
-  timeout = 90000,
-) {
-  const start = Date.now();
-
-  while (Date.now() - start < timeout) {
-    try {
-      await connectOnce(host, servewalletPort);
-      await page.goto(`http://${host}:${frontendPort}`);
-      const elapsed = Date.now() - start;
-      console.log(`Connected to servewallet on ${host}:${servewalletPort} after ${elapsed} ms`);
-      return;
-    } catch {
-      await new Promise(r => setTimeout(r, 200));
+export class ServeWallet {
+  private proc?: ChildProcess;
+  private readonly simulator: boolean;
+  private readonly page: Page;
+  private readonly servewalletPort: number;
+  private readonly frontendPort: number;
+  private readonly host: string;
+  private readonly timeout: number;
+  private readonly testnet: boolean;
+
+  constructor(
+    page: Page,
+    servewalletPort: number,
+    frontendPort: number,
+    host: string,
+    options: ServeWalletOptions = {}
+  ) {
+    const { simulator = false, timeout = 90000, testnet = true } = options;
+
+    if (!testnet && simulator) {
+      throw new Error('ServeWallet: mainnet simulator is not supported');
+    }
+
+    this.page = page;
+    this.servewalletPort = servewalletPort;
+    this.frontendPort = frontendPort;
+    this.host = host;
+    this.simulator = simulator;
+    this.timeout = timeout;
+    this.testnet = testnet;
+  }
+
+  async start(): Promise<void> {
+    let target: string;
+
+    if (this.testnet && !this.simulator) {
+      target = 'servewallet';
+    } else if (this.testnet && this.simulator) {
+      target = 'servewallet-simulator';
+    } else if (!this.testnet && !this.simulator) {
+      target = 'servewallet-mainnet';
+    } else {
+      // This should never happen because the constructor already guards against it
+      throw new Error('Invalid ServeWallet configuration');
+    }
+
+    this.proc = spawn('make', ['-C', '../../', target], {
+      stdio: 'inherit',
+      detached: true,
+    });
+
+    await this.waitUntilReady();
+  }
 
+  private async waitUntilReady(): Promise<void> {
+    const start = Date.now();
+    while (Date.now() - start < this.timeout) {
+      try {
+        await connectOnce(this.host, this.servewalletPort);
+        try {
+          await this.page.goto(`http://${this.host}:${this.frontendPort}`);
+          console.log(
+            `Servewallet ready on ${this.host}:${this.servewalletPort} after ${Date.now() - start} ms`
+          );
+          return;
+        } catch {
+          // page.goto failed, likely connection refused; retry
+        }
+      } catch {
+        // port not ready yet
+      }
+      await new Promise(r => setTimeout(r, 200));
     }
+    throw new Error(`Timeout exceeded waiting for servewallet on ${this.host}:${this.servewalletPort}`);
+  }
+
+  stop(): Promise<void> {
+    return new Promise((resolve) => {
+      if (!this.proc?.pid) {
+        console.log('ServeWallet process not running');
+        resolve();
+        return;
+      }
+
+      const pid = this.proc.pid;
+      console.log(`Stopping servewallet (pid=${pid})...`);
+
+      // Listen for exit event
+      this.proc.once('exit', () => {
+        console.log('Servewallet stopped');
+        resolve();
+      });
+
+      try {
+        process.kill(-pid, 'SIGTERM');
+      } catch (err) {
+        console.error('Failed to stop servewallet:', err);
+        resolve();
+      }
+    });
+  }
+
+  async restart(): Promise<void> {
+    await this.stop();
+    await this.start();
   }
-  throw new Error(`Timeout exceeded waiting for servewallet on ${host}:${servewalletPort}`);
 }
diff --git a/frontends/web/tests/helpers/simulator.ts b/frontends/web/tests/helpers/simulator.ts
new file mode 100644
index 0000000000..b7aae64b68
--- /dev/null
+++ b/frontends/web/tests/helpers/simulator.ts
@@ -0,0 +1,100 @@
+/**
+*  Copyright 2025 Shift Crypto AG
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*       http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+
+import { spawn, ChildProcessWithoutNullStreams } from 'child_process';
+import type { Page } from '@playwright/test';
+import { clickButtonWithText, typeIntoFocusedInput, clickAllAgreements } from './dom';
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * Cleans up fake memory files in /tmp starting with 'fake_memory'.
+ * This is useful to ensure a clean state before starting a simulator that uses fake memory.
+ */
+export function cleanFakeMemoryFiles() {
+  const fakeMemoryDir = '/tmp';
+  const fakeMemoryPrefix = 'fake_memory';
+  // Remove all files starting with fake_memory in /tmp
+  fs.readdirSync(fakeMemoryDir)
+    .filter((f) => f.startsWith(fakeMemoryPrefix))
+    .forEach((f) => {
+      try {
+        fs.unlinkSync(path.join(fakeMemoryDir, f));
+      } catch (err) {
+        if (err instanceof Error) {
+          console.warn(`Failed to remove ${f}: ${err.message}`);
+        } else {
+          console.warn(`Failed to remove ${f}: ${String(err)}`);
+        }
+      }
+    });
+}
+
+
+/**
+ * Spawns a simulator process and streams its output to the console.
+ *
+ *
+ * @param simulatorPath - Path to the simulator binary or script.
+ * @param useFakeMemory - If true, sets FAKE_MEMORY_FILEPATH to '/tmp/fake_memory'.
+ * @returns The spawned ChildProcess instance.
+ */
+export function startSimulator(
+  simulatorPath: string,
+  useFakeMemory = false
+): ChildProcessWithoutNullStreams {
+  const env = { ...process.env };
+  if (useFakeMemory) {
+    env.FAKE_MEMORY_FILEPATH = '/tmp/fake_memory';
+  }
+
+  const proc = spawn(simulatorPath, { stdio: 'pipe', env });
+
+  // Pipe output to logs (needed in CI)
+  proc.stdout?.on('data', (chunk) => process.stdout.write(chunk));
+  proc.stderr?.on('data', (chunk) => process.stderr.write(chunk));
+
+  proc.on('error', (err) => {
+    console.error('Simulator process error:', String(err));
+  });
+
+  proc.on('exit', (code, signal) => {
+    console.log(`Simulator exited: code=${String(code)}, signal=${String(signal)}`);
+  });
+
+  return proc;
+}
+
+/**
+ * Performs the wallet setup flow in order:
+ * 1. Click "Continue"
+ * 2. Click "Create wallet"
+ * 3. Type "simulator" into focused input
+ * 4. Click "Continue"
+ * 5. Click all checkboxes
+ * 6. Click "Continue"
+ * 7. Click "Get started"
+ */
+export async function completeWalletSetupFlow(page: Page) {
+  await clickButtonWithText(page, 'Continue');
+  await clickButtonWithText(page, 'Create wallet');
+  await typeIntoFocusedInput(page, 'simulator');
+  await clickButtonWithText(page, 'Continue');
+  await clickAllAgreements(page);
+  await clickButtonWithText(page, 'Continue');
+  await clickButtonWithText(page, 'Get started');
+}
diff --git a/frontends/web/tests/testnetRestart.test.ts b/frontends/web/tests/testnetRestart.test.ts
new file mode 100644
index 0000000000..ca4346b2f0
--- /dev/null
+++ b/frontends/web/tests/testnetRestart.test.ts
@@ -0,0 +1,111 @@
+/**
+ *  Copyright 2025 Shift Crypto AG
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+import { deleteConfigFile } from './helpers/fs';
+import { test } from './helpers/fixtures';
+import { ServeWallet } from './helpers/servewallet';
+import { expect } from '@playwright/test';
+import * as fs from 'fs';
+import * as path from 'path';
+
+let servewallet: ServeWallet;
+
+
+/**
+ * Test logic:
+ * - Start servewallet in mainnet mode
+ * - Enable testnet mode by clicking the toggle in settings
+ * - Kill servewallet
+ * - Restart servewallet in mainnet mode - the config has the priority so it should be in testnet mode.
+ * - Disable testnet mode by clicking the toggle in settings
+ * - Kill servewallet
+ * - Restart servewallet in mainnet mode - testnet mode should be disabled now.
+ */
+test('Testnet mode', async ({ page, host, frontendPort, servewalletPort }) => {
+
+  await test.step('Start servewallet', async () => {
+    servewallet = new ServeWallet(page, servewalletPort, frontendPort, host, { testnet: false });
+    await servewallet.start();
+  });
+
+  await test.step('Verify testnet is not enabled, and enable it', async () => {
+    await page.goto(`http://${host}:${frontendPort}`);
+    const body = page.locator('body');
+    await expect(body).not.toContainText('Testnet');
+
+    await page.getByRole('link', { name: 'Settings' }).click();
+    await page.getByRole('link', { name: 'Advanced settings' }).click();
+    await page.getByRole('button', { name: 'Start testnet mode' }).click();
+
+  });
+
+  // In Github CI, we have seen that sometimes the config.json file takes a bit
+  // to be updated, so we wait here until we see the change.
+  await test.step('wait for startInTestnet=true', async () => {
+    const configPath = path.join(process.cwd(), '../../appfolder.dev/config.json');
+    const timeoutMs = 5000; // max wait time
+    const intervalMs = 100; // check every 100ms
+
+    const start = Date.now();
+
+    while (Date.now() - start < timeoutMs) {
+      const content = fs.readFileSync(configPath, 'utf8');
+      const json = JSON.parse(content);
+
+      if (json.backend.startInTestnet === true) {
+        console.log('startInTestnet is now true!');
+        return;
+      }
+
+      await new Promise(r => setTimeout(r, intervalMs));
+    }
+
+    throw new Error('Timeout: startInTestnet did not become true within 5s');
+  });
+
+  await test.step('Restart servewallet', async () => {
+    await servewallet.restart();
+  });
+
+  await test.step('Verify testnet is enabled', async () => {
+    await page.goto(`http://${host}:${frontendPort}`);
+    const body = page.locator('body');
+    await expect(body).toContainText('Testnet');
+  });
+
+  await test.step('Disable testnet mode', async () => {
+    await page.getByRole('link', { name: 'Settings' }).click();
+    await page.getByRole('link', { name: 'Advanced settings' }).click();
+    await page.getByRole('button', { name: 'Exit testnet mode' }).click();
+  });
+
+  await test.step('Restart servewallet', async () => {
+    await servewallet.restart();
+  });
+
+  await test.step('Verify testnet is disabled', async () => {
+    await page.goto(`http://${host}:${frontendPort}`);
+    const body = page.locator('body');
+    await expect(body).not.toContainText('Testnet');
+  });
+});
+
+// Kill the simulator after each run and delete the config file to ensure a clean state.
+test.afterEach(() => {
+  servewallet.stop();
+  deleteConfigFile();
+});
diff --git a/frontends/web/tests/watch-only.test.ts b/frontends/web/tests/watch-only.test.ts
new file mode 100644
index 0000000000..76d93236c8
--- /dev/null
+++ b/frontends/web/tests/watch-only.test.ts
@@ -0,0 +1,159 @@
+/**
+ *  Copyright 2025 Shift Crypto AG
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+import { deleteAccountsFile } from './helpers/fs';
+import { test } from './helpers/fixtures';
+import { ServeWallet } from './helpers/servewallet';
+import { startSimulator, completeWalletSetupFlow, cleanFakeMemoryFiles } from './helpers/simulator';
+import { assertFieldsCount, clickButtonWithText } from './helpers/dom';
+import { ChildProcessWithoutNullStreams } from 'child_process';
+
+let servewallet: ServeWallet;
+let simulatorProc : ChildProcessWithoutNullStreams | undefined;
+
+/**
+ * Test scenario 1:
+ * - Unlock BB02 with no passphrase.
+ * - Wait for accounts to load
+ * - Disconnect BB02 (kill the simulator)
+ * - Check that accounts disappear
+ * - Restart app (kill and restart servewallet)
+ * - Check that accounts do not show up without simulator running.
+ */
+test('Test #1 - No passphrase and no watch-only', async ({ page, host, frontendPort, servewalletPort }) => {
+  await test.step('Start servewallet', async () => {
+    servewallet = new ServeWallet(page, servewalletPort, frontendPort, host, { simulator: true });
+    await servewallet.start();
+  });
+
+  await test.step('Start simulator', async () => {
+    const simulatorPath = process.env.SIMULATOR_PATH;
+    if (!simulatorPath) {
+      throw new Error('SIMULATOR_PATH environment variable not set');
+    }
+
+    simulatorProc = startSimulator(simulatorPath, true);
+    console.log('Simulator started');
+  });
+
+  await test.step('Initialize wallet', async () => {
+    await completeWalletSetupFlow(page);
+  });
+
+  await test.step('Check that three accounts show up', async () => {
+    // Wait for the three accounts to show up
+    await assertFieldsCount(page, 'data-label', 'Account name', 3);
+  });
+
+  await test.step('Kill simulator', async () => {
+    simulatorProc?.kill('SIGTERM');
+    simulatorProc = undefined;
+  });
+
+  await test.step('Check that accounts disappear', async () => {
+    await assertFieldsCount(page, 'data-label', 'Account name', 0);
+  });
+
+  await test.step('Restart servewallet', async () => {
+    await servewallet.restart();
+  });
+
+  await test.step('Check that accounts do not show up without simulator', async () => {
+    await assertFieldsCount(page, 'data-label', 'Account name', 0);
+  });
+
+});
+
+/**
+ * Test scenario 2:
+ * - Unlock BB02 with no passphrase.
+ * - Wait for accounts to load
+ * - Enable "Remember wallet" (watch-only)
+ * - Disconnect BB02 (kill the simulator)
+ * - Check that watch-only accounts show up
+ * - Restart app (kill and restart servewallet)
+ * - Check that watch-only accounts still show up (with no simulator running)
+ */
+test('Test #2 - No passphrase - Watch-only account', async ({ page, host, frontendPort, servewalletPort }) => {
+  await test.step('Start servewallet', async () => {
+    servewallet = new ServeWallet(page, servewalletPort, frontendPort, host, { simulator: true });
+    await servewallet.start();
+  });
+
+  await test.step('Start simulator', async () => {
+    cleanFakeMemoryFiles();
+    const simulatorPath = process.env.SIMULATOR_PATH;
+    if (!simulatorPath) {
+      throw new Error('SIMULATOR_PATH environment variable not set');
+    }
+
+    simulatorProc = startSimulator(simulatorPath, true);
+
+    console.log('Simulator started');
+  });
+
+  await test.step('Initialize wallet', async () => {
+    await completeWalletSetupFlow(page);
+  });
+
+  await test.step('Check that three accounts show up', async () => {
+    await assertFieldsCount(page, 'data-label', 'Account name', 3);
+  });
+
+  await test.step('Enable watch-only account', async () => {
+    await page.getByRole('link', { name: 'Settings' }).click();
+    await page.getByRole('link', { name: 'Manage accounts' }).click();
+    await page.locator('label').filter({ hasText: 'Remember wallet' }).locator('label span').click();
+    await clickButtonWithText(page, 'OK');
+  });
+
+  await test.step('Kill simulator', async () => {
+    simulatorProc?.kill('SIGTERM');
+    simulatorProc = undefined;
+  });
+
+  await test.step('Check that watch-only accounts shows up', async () => {
+    await page.getByRole('link', { name: 'My portfolio' }).click();
+    await assertFieldsCount(page, 'data-label', 'Account name', 3);
+  });
+
+
+  await test.step('Restart servewallet', async () => {
+    await servewallet.restart();
+  });
+
+  await test.step('Check that accounts still show up', async () => {
+    await assertFieldsCount(page, 'data-label', 'Account name', 3);
+  });
+});
+
+
+// Ensure a clean state before running all tests.
+test.beforeAll(() => {
+  deleteAccountsFile();
+  cleanFakeMemoryFiles();
+});
+
+// Kill the simulator and stop the servewallet after each run.
+// This is equivalent to closing the app and unplugging the device.
+test.afterEach(() => {
+  if (simulatorProc) {
+    simulatorProc.kill('SIGTERM');
+    simulatorProc = undefined;
+  }
+  servewallet.stop();
+});
diff --git a/frontends/web/tsconfig.json b/frontends/web/tsconfig.json
index 7bee5407ff..4edce52cf8 100644
--- a/frontends/web/tsconfig.json
+++ b/frontends/web/tsconfig.json
@@ -31,6 +31,7 @@
     "types": ["node"]
   },
   "include": [
-    "src"
+    "src",
+    "tests",
   ]
 }
diff --git a/hardening.mk.inc b/hardening.mk.inc
index 70c275f060..4bb99ebc87 100644
--- a/hardening.mk.inc
+++ b/hardening.mk.inc
@@ -12,7 +12,7 @@ WDEP=-Wl,--nxcompat
 WASLR=-Wl,--dynamicbase
 WASLR_UNUSED=-Wl,--high-entropy-va
 WEXPORT=-Wl,--export-all-symbols
-WLIBS=-lwinmm -lhid -lsetupapi -lws2_32 -llibssp
+WLIBS=-lwinmm -lhid -lsetupapi -lws2_32
 
 GOLNXSECFLAGS=${CFORTIFY} ${CSTACK}
 GODARWINSECFLAGS=${CFORTIFY} ${CSTACK}
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 6cfcad5457..13ab935553 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -21,9 +21,12 @@ set -x
 export GORACE="halt_on_error=1"
 export GOTOOLCHAIN="local"
 
+APP_VERSION="$(cat APP_VERSION)"
+GO_LDFLAGS="-X github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo.versionString=${APP_VERSION}"
+
 # This script has to be called from the project root directory.
-go build -trimpath -mod=vendor ./...
-go test -race -mod=vendor ./... -count=1 -v
+go build -trimpath -mod=vendor -ldflags "${GO_LDFLAGS}" ./...
+go test -race -mod=vendor -ldflags "${GO_LDFLAGS}" ./... -count=1 -v
 golangci-lint --version
 golangci-lint config verify
 golangci-lint run
diff --git a/version.mk.inc b/version.mk.inc
new file mode 100644
index 0000000000..eb7f7cb80c
--- /dev/null
+++ b/version.mk.inc
@@ -0,0 +1,5 @@
+VERSION_MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+VERSION_MK_ROOT := $(dir $(VERSION_MK_PATH))
+
+APP_VERSION := $(strip $(shell cat "$(VERSION_MK_ROOT)APP_VERSION"))
+GO_VERSION_LDFLAGS := -X github.com/BitBoxSwiss/bitbox-wallet-app/backend/versioninfo.versionString=$(APP_VERSION)