diff --git a/src/frontend/tests/core/features/actionsMainPage-shard-1.spec.ts b/src/frontend/tests/core/features/actionsMainPage-shard-1.spec.ts
index 72894b1da7..9215390ef9 100644
--- a/src/frontend/tests/core/features/actionsMainPage-shard-1.spec.ts
+++ b/src/frontend/tests/core/features/actionsMainPage-shard-1.spec.ts
@@ -11,7 +11,7 @@ test(
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
@@ -44,7 +44,7 @@ test("search flows", { tag: ["@release", "@mainpage"] }, async ({ page }) => {
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
@@ -55,7 +55,7 @@ test("search flows", { tag: ["@release", "@mainpage"] }, async ({ page }) => {
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.getByRole("heading", { name: "Memory Chatbot" }).click();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
@@ -64,7 +64,7 @@ test("search flows", { tag: ["@release", "@mainpage"] }, async ({ page }) => {
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.getByRole("heading", { name: "Document Q&A" }).click();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
@@ -117,7 +117,7 @@ test(
       await page.getByTestId("icon-SaveAll").first().click();
       await page.keyboard.press("Escape");
 
-      await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+      await page.waitForSelector('[data-testid="sidebar-search-input"]', {
         timeout: 100000,
       });
 
diff --git a/src/frontend/tests/core/features/auto-login-off.spec.ts b/src/frontend/tests/core/features/auto-login-off.spec.ts
index 81c0b9450c..b7b959580a 100644
--- a/src/frontend/tests/core/features/auto-login-off.spec.ts
+++ b/src/frontend/tests/core/features/auto-login-off.spec.ts
@@ -147,12 +147,12 @@ test(
 
     await renameFlow(page, { flowName: randomFlowName });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
       state: "visible",
     });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 1500,
     });
 
@@ -217,7 +217,7 @@ test(
 
     await renameFlow(page, { flowName: secondRandomFlowName });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
diff --git a/src/frontend/tests/core/features/folders.spec.ts b/src/frontend/tests/core/features/folders.spec.ts
index dd0b492daa..2f154b5604 100644
--- a/src/frontend/tests/core/features/folders.spec.ts
+++ b/src/frontend/tests/core/features/folders.spec.ts
@@ -12,7 +12,7 @@ test(
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
@@ -135,7 +135,7 @@ test("change flow folder", async ({ page }) => {
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
diff --git a/src/frontend/tests/core/features/store-shard-2.spec.ts b/src/frontend/tests/core/features/store-shard-2.spec.ts
index 4e2f392718..61512a2be2 100644
--- a/src/frontend/tests/core/features/store-shard-2.spec.ts
+++ b/src/frontend/tests/core/features/store-shard-2.spec.ts
@@ -99,7 +99,7 @@ test("should share component with share button", async ({ page }) => {
   await page.waitForTimeout(1000);
   await page.getByText("Success! Your API Key has been saved.").isVisible();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
diff --git a/src/frontend/tests/core/features/user-progress-track.spec.ts b/src/frontend/tests/core/features/user-progress-track.spec.ts
index f4d5806807..c3e4ade65c 100644
--- a/src/frontend/tests/core/features/user-progress-track.spec.ts
+++ b/src/frontend/tests/core/features/user-progress-track.spec.ts
@@ -83,7 +83,7 @@ async function progressTrackTestFn(
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-  await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+  await page.waitForSelector('[data-testid="sidebar-search-input"]', {
     timeout: 100000,
   });
 
diff --git a/src/frontend/tests/extended/features/actionsMainPage-shard-0.spec.ts b/src/frontend/tests/extended/features/actionsMainPage-shard-0.spec.ts
index cd4dff018b..3b5d882ba8 100644
--- a/src/frontend/tests/extended/features/actionsMainPage-shard-0.spec.ts
+++ b/src/frontend/tests/extended/features/actionsMainPage-shard-0.spec.ts
@@ -22,7 +22,7 @@ test(
       await page.getByTestId("replace-button").click();
     }
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
@@ -102,7 +102,7 @@ test(
       await page.getByTestId("replace-button").click();
     }
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
diff --git a/src/frontend/tests/extended/features/auto-save-off.spec.ts b/src/frontend/tests/extended/features/auto-save-off.spec.ts
index b76f5671d8..37dc2a83c8 100644
--- a/src/frontend/tests/extended/features/auto-save-off.spec.ts
+++ b/src/frontend/tests/extended/features/auto-save-off.spec.ts
@@ -77,7 +77,7 @@ test(
       .first();
     await newFlowDiv.click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 5000,
     });
 
@@ -177,7 +177,7 @@ test(
       .first();
     await newFlow2.click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 5000,
     });
 
diff --git a/src/frontend/tests/extended/features/bulk-actions.spec.ts b/src/frontend/tests/extended/features/bulk-actions.spec.ts
index dad6fdc5d7..3cd95933cf 100644
--- a/src/frontend/tests/extended/features/bulk-actions.spec.ts
+++ b/src/frontend/tests/extended/features/bulk-actions.spec.ts
@@ -14,7 +14,7 @@ test(
     await adjustScreenView(page);
 
     // Go back to main page
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
     await page.getByTestId("icon-ChevronLeft").first().click();
@@ -23,7 +23,7 @@ test(
     await page.getByTestId("new-project-btn").click();
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Document Q&A" }).click();
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
     await page.getByTestId("icon-ChevronLeft").first().click();
@@ -32,7 +32,7 @@ test(
     await page.getByTestId("new-project-btn").click();
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Basic Prompting" }).click();
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
     await page.getByTestId("icon-ChevronLeft").first().click();
diff --git a/src/frontend/tests/extended/features/deleteComponents.spec.ts b/src/frontend/tests/extended/features/deleteComponents.spec.ts
index b8383fd1ce..9e13b0030e 100644
--- a/src/frontend/tests/extended/features/deleteComponents.spec.ts
+++ b/src/frontend/tests/extended/features/deleteComponents.spec.ts
@@ -31,7 +31,7 @@ test(
 
     await page.getByTestId("install-Basic RAG").click();
     await page.waitForTimeout(5000);
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
     await page.getByTestId("icon-ChevronLeft").first().click();
diff --git a/src/frontend/tests/extended/features/deleteFlows.spec.ts b/src/frontend/tests/extended/features/deleteFlows.spec.ts
index 9c5fe65cbb..c6d7884611 100644
--- a/src/frontend/tests/extended/features/deleteFlows.spec.ts
+++ b/src/frontend/tests/extended/features/deleteFlows.spec.ts
@@ -48,7 +48,7 @@ test(
     await waitForSuccessMessage(page);
 
     // Wait for navigation button
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       state: "visible",
       timeout: 30000,
     });
diff --git a/src/frontend/tests/extended/features/dragAndDrop.spec.ts b/src/frontend/tests/extended/features/dragAndDrop.spec.ts
index 623c829e35..3120587698 100644
--- a/src/frontend/tests/extended/features/dragAndDrop.spec.ts
+++ b/src/frontend/tests/extended/features/dragAndDrop.spec.ts
@@ -17,7 +17,7 @@ test(
       timeout: 100000,
     });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
@@ -71,7 +71,7 @@ test(
       timeout: 100000,
     });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
diff --git a/src/frontend/tests/extended/features/flowSettings.spec.ts b/src/frontend/tests/extended/features/flowSettings.spec.ts
index 2337ead0cf..d464ff90e2 100644
--- a/src/frontend/tests/extended/features/flowSettings.spec.ts
+++ b/src/frontend/tests/extended/features/flowSettings.spec.ts
@@ -45,7 +45,7 @@ test(
       .isVisible({ timeout: 3000 });
     await page.getByText("Changes saved successfully").last().click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 30000,
     });
 
diff --git a/src/frontend/tests/extended/features/mcp-server-starter-projects.spec.ts b/src/frontend/tests/extended/features/mcp-server-starter-projects.spec.ts
index 8a42667b62..0cbae2ec63 100644
--- a/src/frontend/tests/extended/features/mcp-server-starter-projects.spec.ts
+++ b/src/frontend/tests/extended/features/mcp-server-starter-projects.spec.ts
@@ -108,7 +108,7 @@ test(
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Basic Prompting" }).click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
diff --git a/src/frontend/tests/extended/features/store-shard-1.spec.ts b/src/frontend/tests/extended/features/store-shard-1.spec.ts
index cdd8951f2e..8ceaae4f4e 100644
--- a/src/frontend/tests/extended/features/store-shard-1.spec.ts
+++ b/src/frontend/tests/extended/features/store-shard-1.spec.ts
@@ -70,7 +70,7 @@ test.skip(
     await page.getByTestId("install-Basic RAG").click();
     await page.waitForTimeout(1000);
     await page.getByText("Component Installed Successfully").isVisible();
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
     await page.getByTestId("icon-ChevronLeft").first().click();
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-13.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-13.spec.ts
index 2a8ac13881..3061ecef68 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-13.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-13.spec.ts
@@ -37,7 +37,7 @@ test(
       timeout: 3000,
     });
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 100000,
     });
 
diff --git a/src/frontend/tests/utils/rename-flow.ts b/src/frontend/tests/utils/rename-flow.ts
index 8d25df35bf..b64275c58d 100644
--- a/src/frontend/tests/utils/rename-flow.ts
+++ b/src/frontend/tests/utils/rename-flow.ts
@@ -36,7 +36,7 @@ export const renameFlow = async (
       .isVisible({ timeout: 3000 });
     await page.getByText("Changes saved successfully").last().click();
 
-    await page.waitForSelector('[data-testid="icon-ChevronLeft"]', {
+    await page.waitForSelector('[data-testid="sidebar-search-input"]', {
       timeout: 30000,
     });
   } else {