diff --git a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
index 1202bd19a3..ebe49c6b16 100644
--- a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
@@ -65,7 +65,7 @@ export default {
     <div v-show="active || isForm" v-if="!readOnly && !isLocked && isUIAllowed('xcDatatableEditable')" class="flex items-center">
       <component
         :is="iconMap.closeThick"
-        class="unlink-icon text-xs text-gray-500/50 group-hover:text-gray-500"
+        class="nc-icon unlink-icon text-xs text-gray-500/50 group-hover:text-gray-500"
         @click.stop="emit('unlink')"
       />
     </div>
diff --git a/tests/playwright/pages/Account/Users.ts b/tests/playwright/pages/Account/Users.ts
index 1618c98b6e..9b6bbdd854 100644
--- a/tests/playwright/pages/Account/Users.ts
+++ b/tests/playwright/pages/Account/Users.ts
@@ -36,7 +36,8 @@ export class AccountUsersPage extends BasePage {
     await this.inviteUserModal.locator(`button:has-text("Invite")`).click();
     await this.verifyToast({ message: 'Successfully added user' });
 
-    return await this.inviteUserModal.locator(`.ant-alert-message`).innerText();
+    // http://localhost:3000/#/signup/a5e7bf3a-cbb0-46bc-87f7-c2ae21796707
+    return (await this.inviteUserModal.locator(`.ant-alert-message`).innerText()).slice(0, 67);
   }
 
   prefixEmail(email: string) {
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 9c902566bc..7efb67d398 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -254,7 +254,7 @@ export class ColumnPageObject extends BasePage {
   }
 
   async delete({ title }: { title: string }) {
-    await this.getColumnHeader(title).locator('svg.ant-dropdown-trigger').click();
+    await this.getColumnHeader(title).locator('div.ant-dropdown-trigger').locator('.nc-ui-dt-dropdown').click();
     // await this.rootPage.locator('li[role="menuitem"]:has-text("Delete")').waitFor();
     await this.rootPage.locator('li[role="menuitem"]:has-text("Delete")').click();
 
diff --git a/tests/playwright/pages/Dashboard/Settings/Teams.ts b/tests/playwright/pages/Dashboard/Settings/Teams.ts
index 0bc59edaef..34bf61a5c3 100644
--- a/tests/playwright/pages/Dashboard/Settings/Teams.ts
+++ b/tests/playwright/pages/Dashboard/Settings/Teams.ts
@@ -44,7 +44,8 @@ export class TeamsPage extends BasePage {
     await this.inviteTeamModal.locator(`button:has-text("Invite")`).click();
     await this.verifyToast({ message: 'Successfully updated the user details' });
 
-    return await this.inviteTeamModal.locator(`.ant-alert-message`).innerText();
+    // http://localhost:3000/#/signup/a5e7bf3a-cbb0-46bc-87f7-c2ae21796707
+    return (await this.inviteTeamModal.locator(`.ant-alert-message`).innerText()).slice(0, 67);
   }
 
   async closeInvite() {
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 23f9b0d0b1..cc44be88c9 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -292,6 +292,7 @@ export class CellPageObject extends BasePage {
 
     // press escape to close the input
     await cell.press('Escape');
+    await cell.press('Escape');
 
     await cell.click({ button: 'right', clickCount: 1 });
     await expect(await this.rootPage.locator(`.nc-dropdown-grid-context-menu:visible`)).toHaveCount(
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
index 86b093cdef..a9286d0d65 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Actions/index.ts
@@ -18,10 +18,10 @@ export class ToolbarActionsPage extends BasePage {
 
   // todo: use enum
   async click(label: string) {
-    await this.get().locator(`span:has-text("${label}")`).click();
+    await this.get().locator(`span:has-text("${label}")`).first().click();
   }
 
   async clickDownloadSubmenu(label: string) {
-    await this.rootPage.locator(`div[class="nc-project-menu-item"]:has-text("${label}")`).click();
+    await this.rootPage.locator(`div[class="nc-project-menu-item"]:has-text("${label}")`).first().click();
   }
 }
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/ShareView.ts b/tests/playwright/pages/Dashboard/common/Toolbar/ShareView.ts
index d28de9a9c3..819990b2b7 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/ShareView.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/ShareView.ts
@@ -29,7 +29,8 @@ export class ToolbarShareViewPage extends BasePage {
   }
 
   async getShareLink() {
-    return await this.get().locator(`[data-testid="nc-modal-share-view__link"]`).innerText();
+    // http://localhost:3000/#/nc/view/35231cff-05c5-49ab-9045-f410db79ba5a
+    return (await this.get().locator(`[data-testid="nc-modal-share-view__link"]`).innerText()).slice(0, 68);
   }
 
   async close() {