diff --git a/WINGs/WINGsP.h b/WINGs/WINGsP.h
index 3ce51abc..6474ca53 100644
--- a/WINGs/WINGsP.h
+++ b/WINGs/WINGsP.h
@@ -196,7 +196,7 @@ typedef struct W_Screen {
     struct W_Pixmap *altHomeIcon;
 
     struct W_Pixmap *magnifyIcon;
-    struct W_Pixmap *altMagnifyIcon;
+/*    struct W_Pixmap *altMagnifyIcon;*/
     struct W_Pixmap *wheelIcon;
     struct W_Pixmap *grayIcon;
     struct W_Pixmap *rgbIcon;
diff --git a/WINGs/wballoon.c b/WINGs/wballoon.c
index ed8d1e24..c3be98a6 100644
--- a/WINGs/wballoon.c
+++ b/WINGs/wballoon.c
@@ -366,8 +366,8 @@ showText(Balloon *bPtr, int x, int y, int h, int w, char *text)
     {
 	int w;
 	char *ptr, *ptr2;
-	
-	ptr = text;
+
+	ptr2 = ptr = text;
 	width = 0;
 	while (ptr && ptr2) {
 	    ptr2 = strchr(ptr, '\n');
diff --git a/WINGs/wbutton.c b/WINGs/wbutton.c
index d6e3cbe7..c90e52e2 100644
--- a/WINGs/wbutton.c
+++ b/WINGs/wbutton.c
@@ -283,11 +283,13 @@ WMSetButtonImage(WMButton *bPtr, WMPixmap *image)
 	WMReleasePixmap(bPtr->dimage);
     }
 
-    bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr), 
-					      image->pixmap, None, 
-					      image->width, image->height,
-					      image->depth);
-    updateDisabledMask(bPtr);
+    if (image) {
+	bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr), 
+						  image->pixmap, None, 
+						  image->width, image->height,
+						  image->depth);
+	updateDisabledMask(bPtr);
+    }
 
     if (bPtr->view->flags.realized) {
 	paintButton(bPtr);
diff --git a/WINGs/widgets.c b/WINGs/widgets.c
index a1e88542..8d213d59 100644
--- a/WINGs/widgets.c
+++ b/WINGs/widgets.c
@@ -468,10 +468,12 @@ loadPixmaps(WMScreen *scr)
     RCombineImageWithColor(tmp, &gray);
     scr->magnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
     RDestroyImage(tmp);
+    /*
     tmp = RGetSubImage(image, 24, 0, 40, 32);
     RCombineImageWithColor(tmp, &white);
     scr->altMagnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
     RDestroyImage(tmp);
+     */
     /* ColorWheel Icon for ColorPanel */
     tmp = RGetSubImage(image, 0, 25, 24, 24);
     scr->wheelIcon = WMCreatePixmapFromRImage(scr, tmp, 128);