From f59b664a5584bceece168d5b54e2002cfedbe29b Mon Sep 17 00:00:00 2001
From: Danilo Leal <daniloleal09@gmail.com>
Date: Wed, 15 Oct 2025 17:59:29 -0300
Subject: [PATCH] Remove chevron to the side of the avatar when logged in

---
 crates/title_bar/src/title_bar.rs | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index be3ee9c4415465..f38fd7ed59ec56 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -189,10 +189,18 @@ impl Render for TitleBar {
         let status = &*status.borrow();
         let user = self.user_store.read(cx).current_user();
 
+        let signed_in = user.is_some();
+
         children.push(
             h_flex()
+                .map(|this| {
+                    if signed_in {
+                        this.pr_1p5()
+                    } else {
+                        this.pr_1()
+                    }
+                })
                 .gap_1()
-                .pr_1()
                 .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
                 .children(self.render_call_controls(window, cx))
                 .children(self.render_connection_status(status, cx))
@@ -755,24 +763,13 @@ impl TitleBar {
             .map(|this| {
                 if is_signed_in {
                     this.trigger_with_tooltip(
-                        ButtonLike::new("user-menu")
-                            .child(
-                                h_flex()
-                                    .gap_0p5()
-                                    .children(
-                                        TitleBarSettings::get_global(cx)
-                                            .show_user_picture
-                                            .then(|| user_avatar.clone())
-                                            .flatten()
-                                            .map(|avatar| Avatar::new(avatar)),
-                                    )
-                                    .child(
-                                        Icon::new(IconName::ChevronDown)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                            .style(ButtonStyle::Subtle),
+                        ButtonLike::new("user-menu").children(
+                            TitleBarSettings::get_global(cx)
+                                .show_user_picture
+                                .then(|| user_avatar.clone())
+                                .flatten()
+                                .map(|avatar| Avatar::new(avatar)),
+                        ),
                         Tooltip::text("Toggle User Menu"),
                     )
                 } else {