From 2fdc382f46baf7b94847d72661885dae406ab956 Mon Sep 17 00:00:00 2001
From: Camila Ayres <hello@camilasan.com>
Date: Wed, 11 Sep 2024 16:27:29 +0200
Subject: [PATCH] Fix dark/light mode for account menu.

Signed-off-by: Camila Ayres <hello@camilasan.com>
---
 src/gui/tray/UserLine.qml |  4 ++--
 src/gui/tray/Window.qml   | 11 ++++++-----
 theme/Style/Style.qml     |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index ea2d222b1574d..b37d4c3b250aa 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -48,7 +48,7 @@ AbstractButton {
 
         Image {
             id: accountAvatar
-            Layout.leftMargin: 7
+            Layout.leftMargin: Style.accountIconsMenuMargin
             verticalAlignment: Qt.AlignCenter
             cache: false
             source: model.avatar !== "" ? model.avatar : Theme.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"
@@ -148,7 +148,7 @@ AbstractButton {
 
             Image {
                 anchors.fill: parent
-                source: "image://svgimage-custom-color/more.svg/"
+                source: "image://svgimage-custom-color/more.svg/" + palette.windowText
                 fillMode: Image.PreserveAspectFit
             }
 
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index c7eb6732bb843..f5643995619df 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -324,11 +324,12 @@ ApplicationWindow {
                                 spacing: 0
 
                                 Image {
-                                    Layout.leftMargin: 12
-                                    verticalAlignment: Qt.AlignCenter
-                                    source: "image://svgimage-custom-color/add.svg"
-                                    sourceSize.width: Style.headerButtonIconSize
-                                    sourceSize.height: Style.headerButtonIconSize
+                                    Layout.leftMargin: Style.accountIconsMenuMargin
+                                    verticalAlignment: Qt.AlignVCenter
+                                    horizontalAlignment: Qt.AlignCenter
+                                    source: "image://svgimage-custom-color/add.svg/" + palette.windowText
+                                    sourceSize.width: Style.addButtonIconSize
+                                    sourceSize.height: Style.addButtonIconSize
                                 }
                                 EnforcedPlainTextLabel {
                                     Layout.leftMargin: 14
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 796e2b63a68a4..03eec1c8c1b0b 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -103,9 +103,12 @@ QtObject {
     property int addAccountButtonHeight: 50
 
     property int headerButtonIconSize: 32
+    property int addButtonIconSize: 26
     property int dismissButtonSize: 26
     property int minimumActivityItemHeight: 24
 
+    property int accountIconsMenuMargin: 7
+
     property int activityLabelBaseWidth: 240
 
     property int talkReplyTextFieldPreferredHeight: 34