diff --git a/packages/insomnia-smoke-test/tests/critical/bundling.test.ts b/packages/insomnia-smoke-test/tests/critical/bundling.test.ts
index 23e55bcf248c..60a0298e7aca 100644
--- a/packages/insomnia-smoke-test/tests/critical/bundling.test.ts
+++ b/packages/insomnia-smoke-test/tests/critical/bundling.test.ts
@@ -8,11 +8,11 @@ test('can use node-libcurl, httpsnippet, hidden browser window', async ({ app, p
   const responseBody = page.locator('[data-testid="CodeEditor"]:visible', {
     has: page.locator('.CodeMirror-activeline'),
   });
-  await page.getByRole('button', { name: 'Create in project' }).click();
+
   const text = await loadFixture('smoke-test-collection.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -42,8 +42,7 @@ test('can use external modules in scripts ', async ({ app, page }) => {
 
   // import collection
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-  await page.getByRole('button', { name: 'Create in project' }).click();
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/critical/certificates.test.ts b/packages/insomnia-smoke-test/tests/critical/certificates.test.ts
index a7acacad673a..ab37852ed634 100644
--- a/packages/insomnia-smoke-test/tests/critical/certificates.test.ts
+++ b/packages/insomnia-smoke-test/tests/critical/certificates.test.ts
@@ -7,8 +7,7 @@ test('can send request with custom ca root certificate', async ({ app, page }) =
   const text = await loadFixture('smoke-test-collection.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts b/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
index 706447c86202..08cd555a234e 100644
--- a/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/after-response-script-features.test.ts
@@ -10,8 +10,7 @@ test.describe('after-response script features tests', async () => {
         const text = await loadFixture('after-response-collection.yaml');
         await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-        await page.getByRole('button', { name: 'Create in project' }).click();
-        await page.getByRole('menuitemradio', { name: 'Import' }).click();
+        await page.getByLabel('Import').click();
         await page.locator('[data-test-id="import-from-clipboard"]').click();
         await page.getByRole('button', { name: 'Scan' }).click();
         await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/app.test.ts b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
index dfb130f3b0fb..3043984675ab 100644
--- a/packages/insomnia-smoke-test/tests/smoke/app.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/app.test.ts
@@ -11,8 +11,7 @@ test('can send requests', async ({ app, page }) => {
   const text = await loadFixture('smoke-test-collection.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -84,12 +83,10 @@ test('can send requests', async ({ app, page }) => {
 // This feature is unsafe to place beside other tests, cancelling a request can cause network code to block
 // related to https://linear.app/insomnia/issue/INS-973
 test('can cancel requests', async ({ app, page }) => {
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   const text = await loadFixture('smoke-test-collection.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/command-palette.test.ts b/packages/insomnia-smoke-test/tests/smoke/command-palette.test.ts
index 4bc5faa27f99..cc03ed58dc71 100644
--- a/packages/insomnia-smoke-test/tests/smoke/command-palette.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/command-palette.test.ts
@@ -10,8 +10,7 @@ test('Command palette - can switch between requests and workspaces', async ({ ap
   const text = await loadFixture('smoke-test-collection.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -20,8 +19,7 @@ test('Command palette - can switch between requests and workspaces', async ({ ap
   const swaggerDoc = await loadFixture('swagger2.yaml');
   await app.evaluate(async ({ clipboard }, swaggerDoc) => clipboard.writeText(swaggerDoc), swaggerDoc);
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/cookie-editor-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/cookie-editor-interactions.test.ts
index 41bd1308f695..37fb9aa18cfa 100644
--- a/packages/insomnia-smoke-test/tests/smoke/cookie-editor-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/cookie-editor-interactions.test.ts
@@ -4,10 +4,9 @@ import { test } from '../../playwright/test';
 test.describe('Cookie editor', async () => {
 
   test.beforeEach(async ({ app, page }) => {
-    await page.getByRole('button', { name: 'Create in project' }).click();
     const text = await loadFixture('simple.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
index 5055506fa878..0c5be48efba8 100644
--- a/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/dashboard-interactions.test.ts
@@ -19,6 +19,7 @@ test.describe('Dashboard', async () => {
       await expect(page.locator('.app')).toContainText('This is an empty project, to get started create your first resource:');
 
       // Rename Project
+      await page.getByRole('row', { name: 'My Project' }).focus();
       await page.getByRole('row', { name: 'My Project' }).getByRole('button', { name: 'Project Actions' }).click();
       await page.getByRole('menuitemradio', { name: 'Settings' }).click();
       await page.getByPlaceholder('My Project').click();
@@ -33,6 +34,7 @@ test.describe('Dashboard', async () => {
       await expect(page.locator('.app')).toContainText('My Project123');
 
       // Delete project
+      await page.getByRole('row', { name: 'My Project' }).focus();
       await page.getByRole('row', { name: 'My Project' }).getByRole('button', { name: 'Project Actions' }).click();
       await page.getByRole('menuitemradio', { name: 'Delete' }).click();
       await page.getByRole('button', { name: 'Delete' }).click();
@@ -52,10 +54,9 @@ test.describe('Dashboard', async () => {
       await expect(page.locator('.app')).not.toContainText('Git Sync');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
 
-      await page.getByRole('button', { name: 'Create in project' }).click();
       const text = await loadFixture('multiple-workspaces.yaml');
       await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-      await page.getByRole('menuitemradio', { name: 'Import' }).click();
+      await page.getByLabel('Import').click();
       await page.locator('[data-test-id="import-from-clipboard"]').click();
       await page.getByRole('button', { name: 'Scan' }).click();
       await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/debug-sidebar-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/debug-sidebar-interactions.test.ts
index af6db88acf4f..7b580d996c77 100644
--- a/packages/insomnia-smoke-test/tests/smoke/debug-sidebar-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/debug-sidebar-interactions.test.ts
@@ -6,10 +6,9 @@ import { test } from '../../playwright/test';
 test.describe('Debug-Sidebar', async () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
   test.beforeEach(async ({ app, page }) => {
-    await page.getByRole('button', { name: 'Create in project' }).click();
     const text = await loadFixture('simple.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
index 5f037e85f7a3..efe9b150ae20 100644
--- a/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/design-interactions.test.ts
@@ -8,10 +8,9 @@ test.describe('Design interactions', async () => {
 
   test('Unit Test interactions', async ({ app, page }) => {
     // Setup
-    await page.getByRole('button', { name: 'Create in project' }).click();
     const text = await loadFixture('unit-test.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
index d8a1558a5d7a..20761685ad68 100644
--- a/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/environment-editor-interactions.test.ts
@@ -4,10 +4,9 @@ import { test } from '../../playwright/test';
 test.describe('Environment Editor', async () => {
 
   test.beforeEach(async ({ app, page }) => {
-    await page.getByRole('button', { name: 'Create in project' }).click();
     const text = await loadFixture('environments.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/graphql.test.ts b/packages/insomnia-smoke-test/tests/smoke/graphql.test.ts
index a532e9ae2ad6..ac22df1db104 100644
--- a/packages/insomnia-smoke-test/tests/smoke/graphql.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/graphql.test.ts
@@ -6,14 +6,12 @@ import { test } from '../../playwright/test';
 test('can render schema and send GraphQL requests', async ({ app, page }) => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   // Copy the collection with the graphql query to clipboard
   const text = await loadFixture('graphql.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
   // Import from clipboard
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -57,14 +55,12 @@ test('can render schema and send GraphQL requests', async ({ app, page }) => {
 test('can render schema and send GraphQL requests with object variables', async ({ app, page }) => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   // Copy the collection with the graphql query to clipboard
   const text = await loadFixture('graphql.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
   // Import from clipboard
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -99,14 +95,12 @@ test('can render schema and send GraphQL requests with object variables', async
 test('can render numeric environment', async ({ app, page }) => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   // Copy the collection with the graphql query to clipboard
   const text = await loadFixture('graphql.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
   // Import from clipboard
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -141,11 +135,9 @@ test('can render numeric environment', async ({ app, page }) => {
 test('can send GraphQL requests after editing and prettifying query', async ({ app, page }) => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   const text = await loadFixture('graphql.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/grpc-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/grpc-interactions.test.ts
index 6e4933d814c7..9ec885fe78f9 100644
--- a/packages/insomnia-smoke-test/tests/smoke/grpc-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/grpc-interactions.test.ts
@@ -11,12 +11,10 @@ test.describe('gRPC interactions', () => {
   let streamMessage: Locator;
 
   test.beforeEach(async ({ app, page }) => {
-    await page.getByRole('button', { name: 'Create in project' }).click();
-
     const text = await loadFixture('grpc.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/grpc.test.ts b/packages/insomnia-smoke-test/tests/smoke/grpc.test.ts
index 326cae048203..7d5fd0fa442c 100644
--- a/packages/insomnia-smoke-test/tests/smoke/grpc.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/grpc.test.ts
@@ -10,12 +10,10 @@ test('can send gRPC requests with reflection', async ({ app, page }) => {
     has: page.locator('.CodeMirror-activeline'),
   });
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   const text = await loadFixture('grpc.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/oauth.test.ts b/packages/insomnia-smoke-test/tests/smoke/oauth.test.ts
index 2193b2eea328..a2d11557a42a 100644
--- a/packages/insomnia-smoke-test/tests/smoke/oauth.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/oauth.test.ts
@@ -17,12 +17,11 @@ test('can make oauth2 requests', async ({ app, page }) => {
   });
 
   const projectView = page.locator('#wrapper');
-  await projectView.getByRole('button', { name: 'Create in project' }).click();
 
   const text = await loadFixture('oauth.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
index f16db11b3015..ad818dc81d5e 100644
--- a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
@@ -13,8 +13,7 @@ test.describe('pre-request features tests', async () => {
         const text = await loadFixture('pre-request-collection.yaml');
         await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-        await page.getByRole('button', { name: 'Create in project' }).click();
-        await page.getByRole('menuitemradio', { name: 'Import' }).click();
+        await page.getByLabel('Import').click();
         await page.locator('[data-test-id="import-from-clipboard"]').click();
         await page.getByRole('button', { name: 'Scan' }).click();
         await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -450,8 +449,7 @@ test.describe('unhappy paths', async () => {
         const text = await loadFixture('pre-request-collection.yaml');
         await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-        await page.getByRole('button', { name: 'Create in project' }).click();
-        await page.getByRole('menuitemradio', { name: 'Import' }).click();
+        await page.getByLabel('Import').click();
         await page.locator('[data-test-id="import-from-clipboard"]').click();
         await page.getByRole('button', { name: 'Scan' }).click();
         await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
index b644c146acff..7ae6309f701b 100644
--- a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-window.test.ts
@@ -10,8 +10,7 @@ test.describe('test hidden window handling', async () => {
     const text = await loadFixture('pre-request-collection.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-    await page.getByRole('button', { name: 'Create in project' }).click();
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -37,8 +36,7 @@ test.describe('test hidden window handling', async () => {
     const text = await loadFixture('pre-request-collection.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-    await page.getByRole('button', { name: 'Create in project' }).click();
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
@@ -79,8 +77,7 @@ test.describe('test hidden window handling', async () => {
     const text = await loadFixture('pre-request-collection.yaml');
     await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-    await page.getByRole('button', { name: 'Create in project' }).click();
-    await page.getByRole('menuitemradio', { name: 'Import' }).click();
+    await page.getByLabel('Import').click();
     await page.locator('[data-test-id="import-from-clipboard"]').click();
     await page.getByRole('button', { name: 'Scan' }).click();
     await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/preferences-interactions.test.ts b/packages/insomnia-smoke-test/tests/smoke/preferences-interactions.test.ts
index f8ff133083dd..1c73eec0b432 100644
--- a/packages/insomnia-smoke-test/tests/smoke/preferences-interactions.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/preferences-interactions.test.ts
@@ -17,10 +17,9 @@ test('Preferences through keyboard shortcut', async ({ page }) => {
 
 // Quick reproduction for Kong/insomnia#5664 and INS-2267
 test('Check filter responses by environment preference', async ({ app, page }) => {
-  await page.getByRole('button', { name: 'Create in project' }).click();
   const text = await loadFixture('simple.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia-smoke-test/tests/smoke/websocket.test.ts b/packages/insomnia-smoke-test/tests/smoke/websocket.test.ts
index 2bff78b5fac5..7dc6f54f9ac5 100644
--- a/packages/insomnia-smoke-test/tests/smoke/websocket.test.ts
+++ b/packages/insomnia-smoke-test/tests/smoke/websocket.test.ts
@@ -10,12 +10,10 @@ test('can make websocket connection', async ({ app, page }) => {
     has: page.locator('.CodeMirror-activeline'),
   });
 
-  await page.getByRole('button', { name: 'Create in project' }).click();
-
   const text = await loadFixture('websockets.yaml');
   await app.evaluate(async ({ clipboard }, text) => clipboard.writeText(text), text);
 
-  await page.getByRole('menuitemradio', { name: 'Import' }).click();
+  await page.getByLabel('Import').click();
   await page.locator('[data-test-id="import-from-clipboard"]').click();
   await page.getByRole('button', { name: 'Scan' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
diff --git a/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx
index ebea2249eeb6..c9ec78a527fe 100644
--- a/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx
+++ b/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx
@@ -33,6 +33,7 @@ interface Props {
   project: Project;
   organizationId: string;
   storage: 'cloud_only' | 'local_only' | 'cloud_plus_local';
+  hasUncommittedOrUnpushedChanges?: boolean;
 }
 
 interface ProjectActionItem {
@@ -42,7 +43,7 @@ interface ProjectActionItem {
   action: (projectId: string, projectName: string) => void;
 }
 
-export const ProjectDropdown: FC<Props> = ({ project, organizationId, storage }) => {
+export const ProjectDropdown: FC<Props> = ({ project, organizationId, storage, hasUncommittedOrUnpushedChanges }) => {
   const [isProjectSettingsModalOpen, setIsProjectSettingsModalOpen] =
     useState(false);
   const deleteProjectFetcher = useFetcher();
@@ -128,10 +129,15 @@ export const ProjectDropdown: FC<Props> = ({ project, organizationId, storage })
           </Tooltip>
         </TooltipTrigger>
       }
+      {hasUncommittedOrUnpushedChanges && (
+        <div className='aspect-square h-6 flex items-center justify-center'>
+          <Icon icon="circle" className='group-focus:hidden group-hover:hidden w-2 h-2' color="var(--color-warning)" />
+        </div>
+      )}
       <MenuTrigger>
         <Button
           aria-label="Project Actions"
-          className="opacity-0 items-center hover:opacity-100 focus:opacity-100 data-[pressed]:opacity-100 flex group-focus:opacity-100 group-hover:opacity-100 justify-center h-6 aspect-square aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
+          className="opacity-0 hidden items-center hover:opacity-100 focus:opacity-100 data-[pressed]:opacity-100 group-focus:flex group-hover:flex group-focus:opacity-100 group-hover:opacity-100 justify-center h-6 aspect-square aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
         >
           <Icon icon="caret-down" />
         </Button>
diff --git a/packages/insomnia/src/ui/routes/auth.authorize.tsx b/packages/insomnia/src/ui/routes/auth.authorize.tsx
index eacadc4f2c56..9898de6cbe76 100644
--- a/packages/insomnia/src/ui/routes/auth.authorize.tsx
+++ b/packages/insomnia/src/ui/routes/auth.authorize.tsx
@@ -1,12 +1,11 @@
 import React, { Fragment } from 'react';
-import { Heading } from 'react-aria-components';
+import { Button, Heading } from 'react-aria-components';
 import { type ActionFunction, redirect, useFetcher, useFetchers, useNavigate } from 'react-router-dom';
 
 import { invariant } from '../../utils/invariant';
 import { SegmentEvent } from '../analytics';
 import { getLoginUrl, submitAuthCode } from '../auth-session-provider';
 import { Icon } from '../components/icon';
-import { Button } from '../components/themed-button';
 
 export const action: ActionFunction = async ({
   request,
@@ -141,11 +140,8 @@ const Authorize = () => {
       )}
       <div className='flex justify-center w-full'>
         <Button
-          variant="text"
-          style={{
-            gap: 'var(--padding-xs)',
-          }}
-          onClick={() => {
+          className="flex items-center gap-2"
+          onPress={() => {
             navigate('/auth/login');
           }}
         >
diff --git a/packages/insomnia/src/ui/routes/project.tsx b/packages/insomnia/src/ui/routes/project.tsx
index 3abe7a5e83da..f473fdb91332 100644
--- a/packages/insomnia/src/ui/routes/project.tsx
+++ b/packages/insomnia/src/ui/routes/project.tsx
@@ -943,14 +943,6 @@ const ProjectRoute: FC = () => {
         action: createNewGlobalEnvironment,
       },
       {
-      id: 'import',
-      name: 'Import',
-      icon: 'file-import',
-      action: () => {
-        setImportModalType('file');
-      },
-    },
-    {
       id: 'git-clone',
       name: 'Git Clone',
       icon: 'code-fork',
@@ -1153,16 +1145,15 @@ const ProjectRoute: FC = () => {
                             icon={
                               isRemoteProject(item) ? 'globe-americas' : 'laptop'
                             }
-                            className={item.hasUncommittedOrUnpushedChanges ? 'text-[--color-warning]' : ''}
                           />
-                          <span className="truncate">{item.name}</span>
+                          <span className={'truncate'}>{item.name}</span>
                           <span className="flex-1" />
                           {item.presence.length > 0 && <AvatarGroup
                             size="small"
                             maxAvatars={3}
                             items={item.presence}
                           />}
-                          {item._id !== SCRATCHPAD_PROJECT_ID && <ProjectDropdown organizationId={organizationId} project={item} storage={storage} />}
+                          {item._id !== SCRATCHPAD_PROJECT_ID && <ProjectDropdown hasUncommittedOrUnpushedChanges={item.hasUncommittedOrUnpushedChanges} organizationId={organizationId} project={item} storage={storage} />}
                         </div>
                       </GridListItem>
                     );
@@ -1370,6 +1361,17 @@ const ProjectRoute: FC = () => {
                       </Menu>
                     </Popover>
                   </MenuTrigger>
+
+                  <Button
+                    onPress={() => {
+                      setImportModalType('file');
+                    }}
+                    aria-label="Import"
+                    className="flex items-center justify-center px-4 gap-2 h-full bg-[--hl-xxs] aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
+                  >
+                    <Icon icon="file-import" /> Import
+                  </Button>
+
                 </div>
 
                 <div className='flex-1 overflow-y-auto'>
@@ -1417,6 +1419,9 @@ const ProjectRoute: FC = () => {
                               </div>
                               <span>{item.label}</span>
                             </div>
+                            {/* {(item.hasUncommittedChanges || item.hasUnpushedChanges) && <div className='flex items-center justify-center'>
+                              <Icon icon="circle" className='group-focus:hidden group-hover:hidden w-2 h-2' color="var(--color-warning)" />
+                            </div>} */}
                             <span className="flex-1" />
                             {item.presence.length > 0 && (
                               <AvatarGroup
@@ -1485,8 +1490,7 @@ const ProjectRoute: FC = () => {
                               </div>
                             )}
                             {(item.hasUncommittedChanges || item.hasUnpushedChanges) && (
-                              <div className="text-sm text-[--color-warning] flex items-center gap-2">
-                                <div className='rounded-full bg-[--color-warning] w-3 h-3 flex-shrink-0' />
+                              <div className="text-sm text-[rgba(var(--color-warning-rgb),0.8)] flex items-center gap-2">
                                 <span>
                                   {item.hasUncommittedChanges ? 'Uncommitted changes' : 'Unpushed changes'}
                                 </span>