diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index a98cb284..6c88f4ff 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1726,7 +1726,7 @@ createPanel(Panel *p)
     char *tmp;
     Bool ok = True;
 
-    panel->fprefix = wstrconcat(wusergnusteppath(), "/Library/WindowMaker/WPrefs");
+    panel->fprefix = wstrconcat(wusergnusteppath(), "/Library/WindowMaker");
 
     if (access(panel->fprefix, F_OK)!=0) {
         if (mkdir(panel->fprefix, 0755) < 0) {
diff --git a/src/icon.c b/src/icon.c
index cd6c90ae..8f88961c 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -496,7 +496,7 @@ getnameforicon(WWindow *wwin)
     prefix = wusergnusteppath();
     len = strlen(prefix)+64+strlen(suffix);
     path = wmalloc(len+1);
-    snprintf(path, len, "%s/Library/WindowMaker/CachedPixmaps", prefix);
+    snprintf(path, len, "%s/Library/WindowMaker", prefix);
 
     if (access(path, F_OK)!=0) {
         if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR)) {
@@ -506,7 +506,7 @@ getnameforicon(WWindow *wwin)
             return NULL;
         }
     }
-    strcat(path, "/WindowMaker");
+    strcat(path, "/CachedPixmaps");
     if (access(path, F_OK)!=0) {
         if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR)!=0) {
             wsyserror(_("could not create directory %s"), path);