--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1754,7 +1754,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))
       {
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
@@ -36,6 +36,8 @@
 #define MIN_NXAGENT_HEIGHT 60
 #define NXAGENT_FRAME_WIDTH 2000
 
+#define HINT "NXAgent"
+
 #define nxagentSetPrintGeometry(screen) \
     nxagentPrintGeometryFlags = (1 << (screen));
     
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -204,6 +204,7 @@
 
   nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
 
+  return;
   if (!nxagentPixmapLogo)
   {
     return;
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1919,7 +1919,7 @@
   XlibPixmap IconPixmap;
   XlibPixmap IconShape;
 
-  snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME);
+  snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME);
 
   if ((icon_fp = fopen(default_path, "r")) == NULL)
   {