--- icedtea-3.0.1/jconsole.desktop.in	2016-04-24 08:37:01.989304092 +0200
+++ icedtea-3.0.1/jconsole.desktop.in	2016-04-27 09:46:17.592085490 +0200
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
 Comment=Monitor and manage OpenJDK applications
 Exec=_BINDIR_/jconsole
 Icon=java
 Terminal=false
 Type=Application
 StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
 Version=1.0
--- icedtea-3.0.1/policytool.desktop.in	2016-04-24 08:37:02.001303877 +0200
+++ icedtea-3.0.1/policytool.desktop.in	2016-04-27 09:45:32.061111551 +0200
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Name=OpenJDK @JAVA_VER@ Policy Tool
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
 Comment=Manage OpenJDK policy files
 Exec=_BINDIR_/policytool
 Icon=java
 Terminal=false
 Type=Application
 StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=System;DesktopSettings;Security;
 Version=1.0