--- old/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp	2016-05-06 14:36:51.069436600 +0300
+++ new/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp	2016-05-06 14:36:50.062379000 +0300
@@ -93,6 +93,8 @@
 
 void AwtTrayIcon::Dispose() {
     SendTrayMessage(NIM_DELETE);
+    // Destroy the icon to avoid leak of GDI objects
+    ::DestroyIcon(m_nid.hIcon);
     UnlinkObjects();
 
     if (--sm_instCount == 0) {