From 1cf771d3b10201d403bbc73995589e43bb395fa1 Mon Sep 17 00:00:00 2001
From: Rello <Rello@users.noreply.github.com>
Date: Wed, 14 Jan 2026 13:35:44 +0700
Subject: [PATCH] fix: adjust tray spacing and account highlight

---
 src/gui/tray/CurrentAccountHeaderButton.qml | 15 ++++++++++++++-
 src/gui/tray/MainWindow.qml                 | 16 ++++++++--------
 theme/Style/Style.qml                       |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml
index 322dbaf0d1c2f..a38efba7df816 100644
--- a/src/gui/tray/CurrentAccountHeaderButton.qml
+++ b/src/gui/tray/CurrentAccountHeaderButton.qml
@@ -71,8 +71,21 @@ Button {
             id: userLineInstantiator
             model: UserModel
             delegate: MenuItem {
+                id: userLineMenuItem
                 implicitHeight: instantiatedUserLine.height
-                UserLine {
+                padding: 0
+                leftPadding: 0
+                rightPadding: 0
+                topPadding: 0
+                bottomPadding: 0
+                indicator: null
+
+                background: Rectangle {
+                    color: (userLineMenuItem.highlighted || userLineMenuItem.down) ? Style.ncBlue : "transparent"
+                    radius: 0
+                }
+
+                contentItem: UserLine {
                     id: instantiatedUserLine
                     width: Math.min(accountMenu.widestMenuItemWidth, accountMenu.maximumWidthAllowed)
 
diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index c70bdf34ac5bf..a290ad2807d5d 100644
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -134,7 +134,7 @@ ApplicationWindow {
             radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
             border.width: Style.trayWindowBorderWidth
             border.color: palette.dark
-            color: Style.colorWithoutTransparency(palette.base)
+            color: Style.colorWithoutTransparency(palette.dark)
         }
 
         property int userIndex: 0
@@ -176,12 +176,12 @@ ApplicationWindow {
         visible: false
         clip: true
 
-        background: Rectangle {
-            radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
-            border.width: Style.trayWindowBorderWidth
-            border.color: palette.dark
-            color: Style.colorWithoutTransparency(palette.base)
-        }
+        background: Rectangle {
+            radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
+            border.width: Style.trayWindowBorderWidth
+            border.color: palette.dark
+            color: Style.colorWithoutTransparency(palette.dark)
+        }
 
         property var folderAccountState: ({})
         property string fileLocalPath: ""
@@ -239,7 +239,7 @@ ApplicationWindow {
         clip: true
 
         radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
-        color: Style.colorWithoutTransparency(palette.base)
+        color: Style.colorWithoutTransparency(palette.dark)
 
         Accessible.role: Accessible.Grouping
         Accessible.name: qsTr("Main content")
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 98856f8c8e126..c698aa9bd01b8 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -47,7 +47,7 @@ QtObject {
     property int halfTrayWindowRadius: 5
     property int trayWindowBorderWidth: variableSize(1)
     property int trayWindowHeaderHeight: variableSize(50)
-    property int trayHorizontalMargin: 10
+    property int trayHorizontalMargin: 8
     property int trayModalWidth: 380
     property int trayModalHeight: 490
     property int trayListItemIconSize: accountAvatarSize