diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-grid.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-grid.spec.ts
index 93595a47..6fe6e3c4 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-grid.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-grid.spec.ts
@@ -113,7 +113,7 @@ test.describe('Document grid item options', () => {
     await removeButton.click();
 
     await expect(
-      page.locator('h2').getByText(`Deleting the document "${docs[0].title}"`),
+      page.getByRole('heading', { name: 'Delete a doc' }),
     ).toBeVisible();
 
     await page
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
index ff2cee26..91c66b32 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
@@ -94,7 +94,13 @@ test.describe('Doc Header', () => {
       .click();
 
     await expect(
-      page.locator('h2').getByText(`Deleting the document "${randomDoc}"`),
+      page.getByRole('heading', { name: 'Delete a doc' }),
+    ).toBeVisible();
+
+    await expect(
+      page.getByText(
+        `Are you sure you want to delete the document "${randomDoc}"?`,
+      ),
     ).toBeVisible();
 
     await page
@@ -167,7 +173,7 @@ test.describe('Doc Header', () => {
     ).toBeVisible();
     await expect(invitationCard.getByLabel('doc-role-dropdown')).toBeVisible();
 
-    await invitationCard.getByRole('button', { name: 'more_vert' }).click();
+    await invitationCard.getByRole('button', { name: 'more_horiz' }).click();
 
     await expect(
       page.getByRole('button', {
@@ -183,9 +189,9 @@ test.describe('Doc Header', () => {
     ).toBeVisible();
     await expect(memberCard.getByLabel('doc-role-dropdown')).toBeVisible();
     await expect(
-      memberCard.getByRole('button', { name: 'more_vert' }),
+      memberCard.getByRole('button', { name: 'more_horiz' }),
     ).toBeVisible();
-    await memberCard.getByRole('button', { name: 'more_vert' }).click();
+    await memberCard.getByRole('button', { name: 'more_horiz' }).click();
 
     await expect(
       page.getByRole('button', {
@@ -245,14 +251,14 @@ test.describe('Doc Header', () => {
     ).toBeVisible();
     await expect(invitationCard.getByLabel('doc-role-text')).toBeVisible();
     await expect(
-      invitationCard.getByRole('button', { name: 'more_vert' }),
+      invitationCard.getByRole('button', { name: 'more_horiz' }),
     ).toBeHidden();
 
     const memberCard = shareModal.getByLabel('List members card');
     await expect(memberCard.getByText('test@accesses.test')).toBeVisible();
     await expect(memberCard.getByLabel('doc-role-text')).toBeVisible();
     await expect(
-      memberCard.getByRole('button', { name: 'more_vert' }),
+      memberCard.getByRole('button', { name: 'more_horiz' }),
     ).toBeHidden();
   });
 
@@ -307,14 +313,14 @@ test.describe('Doc Header', () => {
     ).toBeVisible();
     await expect(invitationCard.getByLabel('doc-role-text')).toBeVisible();
     await expect(
-      invitationCard.getByRole('button', { name: 'more_vert' }),
+      invitationCard.getByRole('button', { name: 'more_horiz' }),
     ).toBeHidden();
 
     const memberCard = shareModal.getByLabel('List members card');
     await expect(memberCard.getByText('test@accesses.test')).toBeVisible();
     await expect(memberCard.getByLabel('doc-role-text')).toBeVisible();
     await expect(
-      memberCard.getByRole('button', { name: 'more_vert' }),
+      memberCard.getByRole('button', { name: 'more_horiz' }),
     ).toBeHidden();
   });
 
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
index c316fc39..99fbf011 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
@@ -227,7 +227,7 @@ test.describe('Document create member', () => {
     await page.getByRole('button', { name: 'Reader' }).click();
 
     const moreActions = userInvitation.getByRole('button', {
-      name: 'more_vert',
+      name: 'more_horiz',
     });
     await moreActions.click();
 
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
index 51b6a3db..47c0a99b 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
@@ -182,18 +182,20 @@ test.describe('Document list members', () => {
 
     const emailMyself = `user@${browserName}.e2e`;
     const mySelf = list.getByTestId(`doc-share-member-row-${emailMyself}`);
-    const mySelfMoreActions = mySelf.getByRole('button', { name: 'more_vert' });
+    const mySelfMoreActions = mySelf.getByRole('button', {
+      name: 'more_horiz',
+    });
 
     const userOwnerEmail = await addNewMember(page, 0, 'Owner');
     const userOwner = list.getByTestId(
       `doc-share-member-row-${userOwnerEmail}`,
     );
     const userOwnerMoreActions = userOwner.getByRole('button', {
-      name: 'more_vert',
+      name: 'more_horiz',
     });
 
     await page.getByRole('button', { name: 'close' }).first().click();
-    await page.getByRole('button', { name: 'Share' }).click();
+    await page.getByRole('button', { name: 'Share' }).first().click();
 
     const userReaderEmail = await addNewMember(page, 0, 'Reader');
 
@@ -201,7 +203,7 @@ test.describe('Document list members', () => {
       `doc-share-member-row-${userReaderEmail}`,
     );
     const userReaderMoreActions = userReader.getByRole('button', {
-      name: 'more_vert',
+      name: 'more_horiz',
     });
 
     await expect(mySelf).toBeVisible();
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts
index 9b4d8788..aa25aab9 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts
@@ -31,11 +31,7 @@ test.describe('Doc Table Content', () => {
     await page.locator('.bn-block-outer').first().click();
     await editor.click();
     await page.locator('.bn-block-outer').last().click();
-
-    // Create space to fill the viewport
-    for (let i = 0; i < 2; i++) {
-      await page.keyboard.press('Enter');
-    }
+    await page.keyboard.press('Enter');
 
     await editor.locator('.bn-block-outer').last().fill('/');
     await page.getByText('Heading 2').click();
@@ -44,9 +40,7 @@ test.describe('Doc Table Content', () => {
     await page.locator('.bn-block-outer').last().click();
 
     // Create space to fill the viewport
-    for (let i = 0; i < 2; i++) {
-      await page.keyboard.press('Enter');
-    }
+    await page.keyboard.press('Enter');
 
     await editor.locator('.bn-block-outer').last().fill('/');
     await page.getByText('Heading 3').click();
@@ -55,7 +49,7 @@ test.describe('Doc Table Content', () => {
     expect(true).toBe(true);
 
     const summaryContainer = page.locator('#summaryContainer');
-    await summaryContainer.hover();
+    await summaryContainer.click();
 
     const level1 = summaryContainer.getByText('Level 1');
     const level2 = summaryContainer.getByText('Level 2');
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts
index f3236195..0702cf8b 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts
@@ -30,7 +30,11 @@ test.describe('Doc Version', () => {
     await expect(panel).toBeVisible();
     await expect(modal.getByText('No versions')).toBeVisible();
 
+    const editor = page.locator('.ProseMirror');
     await modal.getByRole('button', { name: 'close' }).click();
+    await editor.locator('.bn-block-outer').last().fill('/');
+    await page.getByText('Heading 1').click();
+
     await page.locator('.ProseMirror.bn-editor').click();
     await page.locator('.ProseMirror.bn-editor').last().fill('Hello World');
     await goToGridDoc(page, {
@@ -64,7 +68,6 @@ test.describe('Doc Version', () => {
 
     await expect(panel).toBeVisible();
     await expect(page.getByText('History', { exact: true })).toBeVisible();
-    await expect(page.getByRole('status')).toBeVisible();
     await expect(page.getByRole('status')).toBeHidden();
     const items = await panel.locator('.version-item').all();
     expect(items.length).toBe(1);
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
index c41ff81d..364d0e2f 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
@@ -172,7 +172,7 @@ test.describe('Doc Visibility: Restricted', () => {
     await page.goto(urlDoc);
 
     await verifyDocName(page, docTitle);
-    await expect(page.getByRole('button', { name: 'Share' })).toBeVisible();
+    await expect(page.getByLabel('Share button')).toBeVisible();
   });
 });