diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml
index d126c6c4c..3d16aa350 100644
--- a/src/gui/tray/HeaderButton.qml
+++ b/src/gui/tray/HeaderButton.qml
@@ -32,7 +32,6 @@ Button {
 
     icon.width: Style.headerButtonIconSize
     icon.height: Style.headerButtonIconSize
-    icon.color: palette.brightText
 
     Layout.alignment: Qt.AlignRight
     Layout.preferredWidth:  Style.trayWindowHeaderHeight
@@ -42,4 +41,20 @@ Button {
         color: root.hovered || root.visualFocus ? Style.currentUserHeaderTextColor : "transparent"
         opacity: 0.2
     }
+
+    contentItem: Item {
+        anchors.fill: parent
+        
+        Image {
+            id: internalImage
+            anchors.centerIn: parent
+            width: root.icon.width
+            height: root.icon.height
+            source: root.icon.source
+            sourceSize {
+                width: root.icon.width
+                height: root.icon.height
+            }
+        }
+    }
 }
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index f14b054f8..034ca13b5 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -640,7 +640,7 @@ ApplicationWindow {
                     id: trayWindowTalkButton
 
                     visible: UserModel.currentUser && UserModel.currentUser.serverHasTalk
-                    icon.source: "qrc:///client/theme/white/talk-app.svg"
+                    icon.source: "image://svgimage-custom-color/talk-app.svg" + "/" + Style.currentUserHeaderTextColor
                     icon.color: Style.currentUserHeaderTextColor
                     onClicked: UserModel.openCurrentAccountTalk()
 
@@ -656,8 +656,7 @@ ApplicationWindow {
 
                 HeaderButton {
                     id: trayWindowAppsButton
-                    icon.source: "qrc:///client/theme/white/more-apps.svg"
-                    icon.color: Style.currentUserHeaderTextColor
+                    icon.source: "image://svgimage-custom-color/more-apps.svg" + "/" + Style.currentUserHeaderTextColor
 
                     onClicked: {
                         if(appsMenuListView.count <= 0) {