diff --git a/WindowMaker/Defaults/WMWindowAttributes.in b/WindowMaker/Defaults/WMWindowAttributes.in
index 89401899..91fb4a78 100644
--- a/WindowMaker/Defaults/WMWindowAttributes.in
+++ b/WindowMaker/Defaults/WMWindowAttributes.in
@@ -1,12 +1,12 @@
 {
-  Logo.WMDock = {Icon = GNUstepGlow.#extension#;};
-  Logo.WMPanel = {Icon = GNUstepGlow.xpm};
+  Logo.WMDock = {Icon = GNUstep3D.#extension#;};
+  Logo.WMPanel = {Icon = GNUstep3D.#extension#;};
   Logo.WMClip = {Icon = clip.#extension#;};
-  Dockit = {Icon = GNUstepGlow.#extension#;};
+  Dockit = {Icon = GNUstep3D.#extension#;};
   DockApp = {NoAppIcon = NO;};
   WMSoundServer = {Icon = sound.#extension#;};
-  XTerm = {Icon = GNUterm.#extension#;};
-  NXTerm = {Icon = GNUterm.#extension#;};
+  XTerm = {Icon = Terminal.#extension#;};
+  NXTerm = {Icon = Terminal.#extension#;};
   ScilabGraphic0.Xscilab = {KeepInsideScreen=YES;};
   ScilabGraphic1.Xscilab = {KeepInsideScreen=YES;};
   ScilabGraphic2.Xscilab = {KeepInsideScreen=YES;};