Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 82751)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 82752)
@@ -40,6 +40,5 @@
 	VBoxVRDP.cpp \
 	VBoxIPC.cpp \
-	VBoxHelpers.cpp \
-	VBoxTray.rc
+	VBoxHelpers.cpp
 VBoxTray_USES.win = vboximportchecker
 VBoxTray_VBOX_IMPORT_CHECKER.win.x86 = nt4 #nt350
@@ -93,13 +92,6 @@
 VBoxTray.cpp_DEPS = $(VBOX_SVN_REV_KMK)
 
-# The icon location is configurable.
-VBoxTray.rc_INCS = $(VBoxTray_0_OUTDIR)
-VBoxTray.rc_DEPS = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
-VBoxTray.rc_CLEAN = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
-
-# Icon include file.
-$$(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_DEFPATH)/Makefile.kmk | $$(dir $$@)
-	$(RM) -f $@
-	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
+# Version info / description + icon.
+$(call VBOX_SET_VER_INFO_EXE,VBoxTray,VirtualBox Guest Additions Tray Application,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))
 
 include $(FILE_KBUILD_SUB_FOOTER)
Index: unk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc	(revision 82751)
+++ 	(revision )
@@ -1,55 +1,0 @@
-/* $Id$ */
-/** @file
- * VBoxTray - Resource file containing version info and icon.
- */
-
-/*
- * Copyright (C) 2006-2019 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#include <windows.h>
-#include <VBox/version.h>
-#include "resource.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-VS_VERSION_INFO VERSIONINFO
-   FILEVERSION      VBOX_RC_FILE_VERSION
-   PRODUCTVERSION   VBOX_RC_FILE_VERSION
-   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
-   FILEFLAGS        VBOX_RC_FILE_FLAGS
-   FILEOS           VBOX_RC_FILE_OS
-   FILETYPE         VBOX_RC_TYPE_DLL
-   FILESUBTYPE      VFT2_UNKNOWN
-BEGIN
-   BLOCK "StringFileInfo"
-   BEGIN
-      BLOCK "040904b0"
-      BEGIN
-         VALUE "FileDescription",  "VirtualBox Guest Additions Tray Application\0"
-         VALUE "InternalName",     "VBoxTray\0"
-         VALUE "OriginalFilename", "VBoxTray.exe\0"
-         VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-         VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-         VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_GA_STR
-         VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
-         VBOX_RC_MORE_STRINGS
-      END
-   END
-   BLOCK "VarFileInfo"
-   BEGIN
-      VALUE "Translation", 0x409, 1200
-   END
-END
-
-#include "VBoxTray-icon.rc"
-