diff --git a/apps/remix-ide-e2e/src/tests/etherscan_api.ts b/apps/remix-ide-e2e/src/tests/etherscan_api.ts
index 33009f2101..8d89ac37e4 100644
--- a/apps/remix-ide-e2e/src/tests/etherscan_api.ts
+++ b/apps/remix-ide-e2e/src/tests/etherscan_api.ts
@@ -40,7 +40,7 @@ module.exports = {
       .clickLaunchIcon('etherscan') // start etherscan verification
       // @ts-ignore
       .frame(0)
-      .click('[data-id="home"]')
+      .click('[data-id="verticalIconsHomeIcon"]')
       .setValue('select[name="contractName"]', 'Owner')
       .setValue('*[name="contractAddress"]', '0x9981c9d00103da481c3c65b22a79582a3e3ff50b')
       .click('[data-id="verify-contract"]')
diff --git a/apps/remix-ide-e2e/src/tests/gist.test.ts b/apps/remix-ide-e2e/src/tests/gist.test.ts
index f0a17f03ff..ce13a0d79d 100644
--- a/apps/remix-ide-e2e/src/tests/gist.test.ts
+++ b/apps/remix-ide-e2e/src/tests/gist.test.ts
@@ -73,7 +73,7 @@ module.exports = {
     browser.clickLaunchIcon('home')
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .clickLaunchIcon('filePanel')
-      .click('div[title="home"]')
+      .click('div[data-id="verticalIconsHomeIcon"]')
       .waitForElementVisible('button[data-id="landingPageImportFromGistButton"]')
       .pause(1000)
       .scrollAndClick('button[data-id="landingPageImportFromGistButton"]')
diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 96f2027dcc..e47accec38 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -45,7 +45,7 @@ module.exports = {
     browser
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .clickLaunchIcon('filePanel')
-      .click('div[title="home"]')
+      .click('div[data-id="verticalIconsHomeIcon"]')
       .waitForElementVisible('button[data-id="landingPageImportFromGitHubButton"]').pause(1000)
       .click('button[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
@@ -67,7 +67,7 @@ module.exports = {
   },
   'Import JSON From GitHub For Valid URL #group2': function (browser: NightwatchBrowser) {
     browser
-      .click('div[title="home"]')
+      .click('div[data-id="verticalIconsHomeIcon"]')
       .click('button[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]').pause(1000)
       .execute(() => {
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
index 26640d8038..9b37679fa0 100644
--- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
+++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
@@ -99,7 +99,7 @@ export const TabsUI = (props: TabsUIProps) => {
           ref={el => { tabsRef.current[index] = el }}
           className={classNameTab}
           data-id={index === currentIndexRef.current ? 'tab-active' : ''}
-          data-path={tab.title}
+          data-path={tab.name}
         >
           {tab.icon ? (<img className="my-1 mr-1 iconImage" style={{ filter: invert }} src={tab.icon} />) : (<i className={classNameImg}></i>)}
           <span  className={`title-tabs ${getFileDecorationClasses(tab)}`}>{tab.title}</span>