diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index f1413ea..b767fb2 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,5 +1,5 @@
 AUX wmaker-ignore-max-for-terminals.patch 1383 BLAKE2B 201512604d37dc92158b05f0dc1aa881538e1793c0d21f992053791068ae9600d281c2db392ad51a40815edee2a6dea9f8baec0031ca6a01e52941d40cefb9fe SHA512 d95c9f224ec2cb3c449f017823355293cc3dfe602189678b2b0307c8b4232ea4e7ae7572d51ecd9e6eb6801615da6fce11fe92622cea5c4d084a104d41d12988
-AUX wmaker-scale-icons.patch 4936 BLAKE2B cbb71e2820871a51f3d1521934538b02b0067963d784c5bff07e8ee2236e878b5351609d684f599464a180dc1b6f22ae324bb31121bcadd04006ebfd24908d85 SHA512 1bae42785cd177b28ca1d58cafb5cb4cc13216b8116eb0bf2a716ddb1f795d5c8de9a1aea378699505e211e6dfa57602d5e82de9557d9a0822e27d91712746f2
+AUX wmaker-scale-icons.patch 5321 BLAKE2B b47cef53f26d5ba878ccaa38c4f27b74d11fcf5de0404624355d3b12a883de64c2316ffdfa208fade570824ae3eb29f759a08a7fb8e13ea5c6885433d200e07b SHA512 31d4e9fd367b9649fb74c0d49c404703bdf3bb1a133e6247a305eac335be14238ef749babf45a47259261214f0a0bbca0595eb216e2482b008216753fa174b43
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-8888.ebuild 3642 BLAKE2B e81eafd6ae6751de32c5c859675e1060dd047235a31ef2424c271d6b4e51c32276b67b5080c2fa835291c241fe818b7c4935079970a1058bad0124063a9c7c33 SHA512 9980c143cf6cc9bd065288cee54623a2bf910756780bfd997ac8ffa8c3ea82828924470f560678bc1594575e4fce64593b48637d3f14b0e52a19de4ee17dbbfe
diff --git a/x11-wm/windowmaker/files/wmaker-scale-icons.patch b/x11-wm/windowmaker/files/wmaker-scale-icons.patch
index 6f64374..b9d58d9 100644
--- a/x11-wm/windowmaker/files/wmaker-scale-icons.patch
+++ b/x11-wm/windowmaker/files/wmaker-scale-icons.patch
@@ -1,8 +1,8 @@
 diff --git a/src/defaults.c b/src/defaults.c
-index f5cbf46f..77401c6d 100644
+index 43860599..db519401 100644
 --- a/src/defaults.c
 +++ b/src/defaults.c
-@@ -366,7 +366,7 @@ WDefaultEntry optionList[] = {
+@@ -367,7 +367,7 @@ WDefaultEntry optionList[] = {
  	    &wPreferences.icon_yard, getEnum, setIconPosition, NULL, NULL},
  	{"IconificationStyle", "Zoom", seIconificationStyles,
  	    &wPreferences.iconification_style, getEnum, NULL, NULL, NULL},
@@ -12,10 +12,10 @@ index f5cbf46f..77401c6d 100644
  	{"DisableWSMouseActions", "NO", NULL,
  	    &wPreferences.disable_root_mouse, getBool, NULL, NULL, NULL},
 diff --git a/src/icon.c b/src/icon.c
-index 943e2d84..079fdee7 100644
+index 14278d2c..bc47e443 100644
 --- a/src/icon.c
 +++ b/src/icon.c
-@@ -336,22 +336,39 @@ void wIconChangeTitle(WIcon *icon, WWindow *wwin)
+@@ -344,22 +344,39 @@ void wIconChangeTitle(WIcon *icon, WWindow *wwin)
  			icon->icon_name = wNETWMGetWindowName(wwin->client_win);
  }
  
@@ -63,7 +63,7 @@ index 943e2d84..079fdee7 100644
  		RReleaseImage(icon);
  		icon = nimage;
  	}
-@@ -791,7 +808,7 @@ RImage *get_rimage_icon_from_wm_hints(WIcon *icon)
+@@ -799,7 +816,7 @@ RImage *get_rimage_icon_from_wm_hints(WIcon *icon)
  		return NULL;
  
  	/* Resize the icon to the wPreferences.icon_size size */
@@ -85,11 +85,24 @@ index cccd7a86..49054a5d 100644
  RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
  
  char *wIconStore(WIcon *icon);
+diff --git a/src/switchmenu.c b/src/switchmenu.c
+index a8c3937f..c9694f20 100644
+--- a/src/switchmenu.c
++++ b/src/switchmenu.c
+@@ -77,7 +77,7 @@ static WPixmap *switchMenuIconForWindow(WScreen *scr, WWindow *wwin)
+ 	if (!image)
+ 		return NULL;
+ 
+-	image = wIconValidateIconSize(image, max_size);
++	image = wIconValidateIconSize(image, max_size, False);
+ 	if (!image)
+ 		return NULL;
+ 
 diff --git a/src/switchpanel.c b/src/switchpanel.c
-index cb6cda10..16f91be0 100644
+index d11d4e45..6d592b39 100644
 --- a/src/switchpanel.c
 +++ b/src/switchpanel.c
-@@ -199,7 +199,7 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
+@@ -205,7 +205,7 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
  		image = get_icon_image(panel->scr, wwin->wm_instance, wwin->wm_class, icon_tile_size);
  
  	/* We must resize the icon size (~64) to the switch panel icon size (~48) */
@@ -99,10 +112,10 @@ index cb6cda10..16f91be0 100644
  	WMAddToArray(panel->images, image);
  	WMAddToArray(panel->icons, icon);
 diff --git a/src/wdefaults.c b/src/wdefaults.c
-index 7aad3db5..0bb476b9 100644
+index 9a3e92c0..aa8c6768 100644
 --- a/src/wdefaults.c
 +++ b/src/wdefaults.c
-@@ -435,7 +435,7 @@ RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int max_size)
+@@ -434,7 +434,7 @@ RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int max_size)
  		wwarning(_("error loading image file \"%s\": %s"), file_name,
  			 RMessageForError(RErrorCode));
  
@@ -111,7 +124,7 @@ index 7aad3db5..0bb476b9 100644
  
  	return image;
  }
-@@ -472,7 +472,7 @@ RImage *get_default_image(WScreen *scr)
+@@ -471,7 +471,7 @@ RImage *get_default_image(WScreen *scr)
  
  	/* Resize the icon to the wPreferences.icon_size size
  	 * usually this function will return early, because size is right */
@@ -121,10 +134,10 @@ index 7aad3db5..0bb476b9 100644
  	return image;
  }
 diff --git a/src/wmspec.c b/src/wmspec.c
-index e61e6ae7..dff085ac 100644
+index 4af9ab13..34a6703a 100644
 --- a/src/wmspec.c
 +++ b/src/wmspec.c
-@@ -545,7 +545,7 @@ RImage *get_window_image_from_x11(Window window)
+@@ -538,7 +538,7 @@ RImage *get_window_image_from_x11(Window window)
  		return NULL;
  
  	/* Resize the image to the correct value */