diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 0b36734c..9ebf7982 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -713,7 +713,7 @@ renderMenu(_Panel *panel, proplist_t texture, int width, int iheight)
     switch (panel->menuStyle) {
      case MSTYLE_NORMAL:
 	tmp = renderTexture(scr, texture, width, iheight, NULL, RBEV_RAISED2);
-	    
+
 	pix = XCreatePixmap(dpy, tmp, width, iheight*4, WMScreenDepth(scr));
 	for (i = 0; i < 4; i++) {
 	    XCopyArea(dpy, tmp, pix, gc, 0, 0, width, iheight, 0, iheight*i);
@@ -768,8 +768,6 @@ updatePreviewBox(_Panel *panel, int elements)
     int refresh = 0;
     Pixmap pix;
     GC gc;
-    WMListItem *item;
-    TextureListItem *titem;
     int colorUpdate = 0;
 
     gc = XCreateGC(dpy, WMWidgetXID(panel->win), 0, NULL);
@@ -810,6 +808,9 @@ updatePreviewBox(_Panel *panel, int elements)
 	colorUpdate |= MTITLE_COL;
     }
     if (elements & (1<<PMITEM)) {
+	WMListItem *item;
+	TextureListItem *titem;
+
 	item = WMGetListItem(panel->texLs, panel->textureIndex[5]);
 	titem = (TextureListItem*)item->clientData;
 
@@ -832,6 +833,12 @@ updatePreviewBox(_Panel *panel, int elements)
 	XDrawLine(dpy, panel->preview, gc, 29, 119, 119, 119);
     }
     if (elements & (1<<PICON)) {
+	WMListItem *item;
+	TextureListItem *titem;
+
+	item = WMGetListItem(panel->texLs, panel->textureIndex[6]);
+	titem = (TextureListItem*)item->clientData;
+
 	renderPreview(panel, gc, PICON,
 		      titem->ispixmap ? 0 : RBEV_RAISED3);
 
diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in
index 2023d2fa..dca65824 100644
--- a/WPrefs.app/Makefile.in
+++ b/WPrefs.app/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 SUBDIRS = xpm tiff po
diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in
index c5ea3d51..a77e03e7 100644
--- a/WPrefs.app/po/Makefile.in
+++ b/WPrefs.app/po/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 CATALOGS = @WPMOFILES@
diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in
index 09f73d0a..512246fa 100644
--- a/WPrefs.app/tiff/Makefile.in
+++ b/WPrefs.app/tiff/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 tiffdatadir = $(wprefsdir)/tiff
diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in
index 81689eac..fc1e5092 100644
--- a/WPrefs.app/xpm/Makefile.in
+++ b/WPrefs.app/xpm/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 xpmdatadir = $(wprefsdir)/xpm