Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Screen.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Screen.c	2009-09-09 11:32:13.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Screen.c	2010-03-18 17:51:34.442437544 -0300
@@ -1703,7 +1703,20 @@
       #ifdef TEST
       fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
                   nxagentDefaultWindows[pScreen->myNum]);
+      
+      fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n",
+                  nxagentDefaultWindows[pScreen->myNum]);      
       #endif
+      
+      XClassHint hint;
+      hint.res_name=malloc(strlen(HINT)+1);
+      hint.res_class=malloc(strlen(HINT)+1);
+      strcpy(hint.res_name,HINT);
+      strcpy(hint.res_class,HINT);
+      XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint);
+      free(hint.res_name);
+      free(hint.res_class);
+      
 
       if (nxagentOption(Fullscreen))
       {
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Screen.h
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Screen.h	2009-03-03 08:31:42.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Screen.h	2010-03-18 17:51:34.442437544 -0300
@@ -36,6 +36,8 @@
 #define MIN_NXAGENT_HEIGHT 60
 #define NXAGENT_FRAME_WIDTH 2000
 
+#define HINT "NXAgent"
+
 #define nxagentSetPrintGeometry(screen) \
     nxagentPrintGeometryFlags = (1 << (screen));
     
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Display.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Display.c	2009-09-15 10:48:17.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Display.c	2010-03-18 17:51:34.442437544 -0300
@@ -1861,7 +1861,7 @@
   strncpy(default_path, "", 255);
 
   strcat(icon_filename, NXAGENT_ICON_NAME);
-  strcat(default_path,"/usr/NX/share/images/");
+  strcat(default_path,"/usr/share/pixmaps/");
   strcat(default_path,icon_filename);
 
   if ((icon_fp = fopen(default_path, "r")) == NULL)
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Splash.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Splash.c	2007-05-30 11:29:29.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Splash.c	2010-03-18 17:51:34.452470174 -0300
@@ -204,6 +204,7 @@
 
   nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
 
+  return;
   if (!nxagentPixmapLogo)
   {
     return;