From 2efbaed728370efdf0e340f5c6f4fc7e2dd16519 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 12:54:21 +0100
Subject: [PATCH] fix: give quick compose's Move to the main window an arrow
 going in, not the exit full screen arrows

---
 components/email/__tests__/composer-own-window.test.tsx | 9 +++++++++
 components/email/email-composer.tsx                     | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/email/__tests__/composer-own-window.test.tsx b/components/email/__tests__/composer-own-window.test.tsx
index 2731b6a23..d6d312db5 100644
--- a/components/email/__tests__/composer-own-window.test.tsx
+++ b/components/email/__tests__/composer-own-window.test.tsx
@@ -112,6 +112,15 @@ function target(shown = true): ComposerPopOut & { handed: ComposerDraftData[]; c
 
 const DRAFT: ComposerDraftData = { to: '', cc: '', bcc: '', subject: 'Old', body: '', showCc: false, showBcc: false, selectedIdentityId: null, subAddressTag: '', mode: 'compose', draftId: null };
 
+describe('"Move to the main window" in quick compose', () => {
+  it('shows an arrow going in, not the arrows of leaving full screen', () => {
+    mount({ popOut: vi.fn(() => target()), popOutToMainLabel: 'Move to the main window' });
+    const svg = screen.getByTestId('composer-back-to-main').querySelector('svg');
+    expect(svg?.getAttribute('class')).toContain('tabler-icon-login');
+    expect(svg?.getAttribute('class')).not.toContain('minimize');
+  });
+});
+
 describe('"Open in new window" on a composer', () => {
   it('is not there without the host offering it: browsers stay as they are', () => {
     mount({});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index fc292094a..bbcff311d 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -38,6 +38,7 @@ import {
   Minimize2,
   Trash2,
   ExternalLink,
+  LogIn,
   ReplyAll,
   Reply,
   Forward,
@@ -4682,7 +4683,8 @@ export function EmailComposer({
       title={popOutToMainLabel ?? tWindows('open_in_window')}
       data-testid={popOutToMainLabel ? "composer-back-to-main" : "composer-open-in-window"}
     >
-      {popOutToMainLabel ? <Minimize2 className={iconClassName} /> : <ExternalLink className={iconClassName} />}
+      {/* Into the main window: an arrow going in, not the inward arrows of leaving full screen. */}
+      {popOutToMainLabel ? <LogIn className={iconClassName} /> : <ExternalLink className={iconClassName} />}
     </button>
   );