diff --git a/cypress/e2e/home.cy.ts b/cypress/e2e/home.cy.ts
index b7a805f4d6..9c79fbeb2b 100644
--- a/cypress/e2e/home.cy.ts
+++ b/cypress/e2e/home.cy.ts
@@ -1,7 +1,7 @@
 describe('The homepage should load', () => {
   it('should have options to open the wallet', () => {
     cy.visit('/')
-    cy.findByRole('button', { name: /Open wallet/i })
-    cy.findByRole('button', { name: /Create wallet/i })
+    cy.findByRole('link', { name: /Open wallet/i })
+    cy.findByRole('link', { name: /Create wallet/i })
   })
 })
diff --git a/cypress/e2e/open-wallet.cy.ts b/cypress/e2e/open-wallet.cy.ts
index 1ef7ed059d..5425b9b444 100644
--- a/cypress/e2e/open-wallet.cy.ts
+++ b/cypress/e2e/open-wallet.cy.ts
@@ -8,13 +8,13 @@ describe('Open wallet', () => {
   describe('Method selection', () => {
     it('Should be able to open from Mnemonic', () => {
       cy.visit('/open-wallet')
-      cy.findByRole('button', { name: /Mnemonic/ }).click()
+      cy.findByRole('link', { name: /Mnemonic/ }).click()
       cy.url().should('include', 'mnemonic')
     })
 
     it('Should be able to open from private key', () => {
       cy.visit('/open-wallet')
-      cy.findByRole('button', { name: /Private key/ }).click()
+      cy.findByRole('link', { name: /Private key/ }).click()
       cy.url().should('include', 'private-key')
     })
   })
@@ -52,8 +52,8 @@ describe('Open wallet', () => {
 
       // Should allow importing and reselecting the same accounts
       cy.findByRole('link', { name: /Home/ }).click()
-      cy.findByRole('button', { name: /Open wallet/ }).click()
-      cy.findByRole('button', { name: /Mnemonic/ }).click()
+      cy.findByRole('link', { name: /Open wallet/ }).click()
+      cy.findByRole('link', { name: /Mnemonic/ }).click()
       cy.url().should('include', '/open-wallet/mnemonic')
 
       cy.findByTestId('mnemonic').type(mnemonic, { delay: 1 })
@@ -97,8 +97,8 @@ describe('Open wallet', () => {
 
       // Should allow importing and reselecting the same account
       cy.findByRole('link', { name: /Home/ }).click()
-      cy.findByRole('button', { name: /Open wallet/ }).click()
-      cy.findByRole('button', { name: /Private key/ }).click()
+      cy.findByRole('link', { name: /Open wallet/ }).click()
+      cy.findByRole('link', { name: /Private key/ }).click()
       cy.url().should('include', '/open-wallet/private-key')
       cy.findByPlaceholderText('Enter your private key here').type(privateKey, { delay: 1 })
       cy.findByRole('button', { name: /Import my wallet/ }).click()
@@ -128,6 +128,6 @@ describe('Open wallet', () => {
   //   cy.get('button[aria-label="Close Wallet"]').click()
 
   //   // Back to homepage
-  //   cy.findByRole('button', { name: /Create wallet/i }).should('be.visible')
+  //   cy.findByRole('link', { name: /Create wallet/i }).should('be.visible')
   // })
 })
diff --git a/cypress/e2e/scenario-account-switcher.cy.ts b/cypress/e2e/scenario-account-switcher.cy.ts
index c9a90f772e..2e3f64169c 100644
--- a/cypress/e2e/scenario-account-switcher.cy.ts
+++ b/cypress/e2e/scenario-account-switcher.cy.ts
@@ -3,8 +3,8 @@ describe('Scenario : multiple accounts', () => {
     cy.visit('/')
 
     // Open account 1 through mnemonic
-    cy.findByRole('button', { name: /Open wallet/ }).click()
-    cy.findByRole('button', { name: /Mnemonic/ }).click()
+    cy.findByRole('link', { name: /Open wallet/ }).click()
+    cy.findByRole('link', { name: /Mnemonic/ }).click()
     cy.findByTestId('mnemonic').type(
       'abuse gown claw final toddler wedding sister parade useful typical spatial skate decrease bulk student manual cloth shove fat car little swamp tag ginger',
       { delay: 0 },
@@ -16,8 +16,8 @@ describe('Scenario : multiple accounts', () => {
     cy.findByTestId('nav-home').click()
 
     // Open account 2 through private
-    cy.findByRole('button', { name: /Open wallet/ }).click()
-    cy.findByRole('button', { name: /Private key/ }).click()
+    cy.findByRole('link', { name: /Open wallet/ }).click()
+    cy.findByRole('link', { name: /Private key/ }).click()
     cy.findByPlaceholderText('Enter your private key here').type(
       'X0jlpvskP1q8E6rHxWRJr7yTvpCuOPEKBGW8gtuVTxfnViTI0s2fBizgMxNzo75Q7w7MxdJXtOLeqDoFUGxxMg==',
       { delay: 0 },
diff --git a/cypress/e2e/scenario-transaction.cy.ts b/cypress/e2e/scenario-transaction.cy.ts
index 66f740a515..8563f504a7 100644
--- a/cypress/e2e/scenario-transaction.cy.ts
+++ b/cypress/e2e/scenario-transaction.cy.ts
@@ -24,8 +24,8 @@ describe('Scenario : from mnemonic', () => {
 
   it('Should open the account', () => {
     cy.visit('/')
-    cy.findByRole('button', { name: /Open wallet/ }).click()
-    cy.findByRole('button', { name: /Mnemonic/ }).click()
+    cy.findByRole('link', { name: /Open wallet/ }).click()
+    cy.findByRole('link', { name: /Mnemonic/ }).click()
     cy.findByTestId('mnemonic').type(
       'abuse gown claw final toddler wedding sister parade useful typical spatial skate decrease bulk student manual cloth shove fat car little swamp tag ginger',
       { delay: 1 },
@@ -84,8 +84,8 @@ describe('Scenario : from private key', () => {
 
   it('Should open the account', () => {
     cy.visit('/')
-    cy.findByRole('button', { name: /Open wallet/ }).click()
-    cy.findByRole('button', { name: /Private key/ }).click()
+    cy.findByRole('link', { name: /Open wallet/ }).click()
+    cy.findByRole('link', { name: /Private key/ }).click()
     cy.findByPlaceholderText('Enter your private key here').type(
       'X0jlpvskP1q8E6rHxWRJr7yTvpCuOPEKBGW8gtuVTxfnViTI0s2fBizgMxNzo75Q7w7MxdJXtOLeqDoFUGxxMg==',
       { delay: 1 },