--- 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,5 +1,6 @@
 [Desktop Entry]
 Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
 Comment=Monitor and manage OpenJDK applications
 Exec=_SDKBINDIR_/jconsole
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@
--- 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@ for @target_cpu@ Policy Tool (@OPENJDK_VER@)
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
 Comment=Manage OpenJDK policy files
 Exec=_JREBINDIR_/policytool
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-security-tools-PolicyTool
-Categories=Settings;Java;
+Categories=System;DesktopSettings;Security;
 Version=1.0