diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
index 592444c..3424b7c 100644
--- a/xfwm4/close-active.xpm
+++ b/xfwm4/close-active.xpm
@@ -1,21 +1,9 @@
 /* XPM */
-static char * close_active_xpm[] = {
-"24 24 15 1",
+static char * close_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
 "+	c #DCDCDC",
-"@	c #A4A4A4",
-"#	c #3F3F3F",
-"$	c #A6A6A6",
-"%	c #D1D1D1",
-"&	c #525252",
-"*	c #414141",
-"=	c #D3D3D3",
-"-	c #CECECE",
-";	c #575757",
-">	c #505050",
-",	c #A2A2A2",
-"'	c #3D3D3D",
 "........................",
 "........................",
 "........................",
@@ -24,14 +12,14 @@ static char * close_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........+@#..#@+........",
-"........$+%&&%+@........",
-"........*=+--+%#........",
-".........;=++-&.........",
-".........;=++-&.........",
-"........*=+--+%#........",
-"........$+->>-+@........",
-"........+,'..',+........",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm
index 1bb0e79..9201e50 100644
--- a/xfwm4/close-inactive.xpm
+++ b/xfwm4/close-inactive.xpm
@@ -1,22 +1,9 @@
 /* XPM */
-static char * close_inactive_xpm[] = {
-"24 24 16 1",
+static char * close_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #AAAAAA",
-"@	c #828282",
-"#	c #3A3A3A",
-"$	c #848484",
-"%	c #A2A2A2",
-"&	c #474747",
-"*	c #3B3B3B",
-"=	c #A4A4A4",
-"-	c #A0A0A0",
-";	c #4B4B4B",
-">	c #A1A1A1",
-",	c #464646",
-"'	c #818181",
-")	c #383838",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
@@ -25,14 +12,14 @@ static char * close_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........+@#..#@+........",
-"........$+%&&%+@........",
-"........*=+--+%#........",
-".........;=++-&.........",
-".........;=++-&.........",
-"........*=+--+%#........",
-"........$+>,,>+@........",
-"........+')..)'+........",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm
index eff45b3..4a01c16 100644
--- a/xfwm4/hide-active.xpm
+++ b/xfwm4/hide-active.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hide_active_xpm[] = {
+static char * hide_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm
index 1c758c9..3da4487 100644
--- a/xfwm4/hide-inactive.xpm
+++ b/xfwm4/hide-inactive.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * hide_inactive_xpm[] = {
+static char * hide_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm
index 2c8caf3..ce44a5f 100644
--- a/xfwm4/maximize-active.xpm
+++ b/xfwm4/maximize-active.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * maximize_active_xpm[] = {
+static char * maximize_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm
index 9bd173e..153b4d2 100644
--- a/xfwm4/maximize-inactive.xpm
+++ b/xfwm4/maximize-inactive.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * maximize_inactive_xpm[] = {
+static char * maximize_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
index 02893b5..a34f44a 100644
--- a/xfwm4/maximize-toggled-active.xpm
+++ b/xfwm4/maximize-toggled-active.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * maximize_toggled_active_xpm[] = {
+static char * maximize_toggled_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
index d5bc502..914eed8 100644
--- a/xfwm4/maximize-toggled-inactive.xpm
+++ b/xfwm4/maximize-toggled-inactive.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
+static char * maximize_toggled_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm
index 3b896d4..4dac8e8 100644
--- a/xfwm4/shade-active.xpm
+++ b/xfwm4/shade-active.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * shade_active_xpm[] = {
+static char * shade_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #DBDBDB",
+"+	c #DCDCDC",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm
index aa1ca03..9751094 100644
--- a/xfwm4/shade-inactive.xpm
+++ b/xfwm4/shade-inactive.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * shade_inactive_xpm[] = {
+static char * shade_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm
index 2667c9b..1421f70 100644
--- a/xfwm4/shade-toggled-active.xpm
+++ b/xfwm4/shade-toggled-active.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * shade_toggled_active_xpm[] = {
+static char * shade_toggled_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #DBDBDB",
+"+	c #DCDCDC",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm
index 4dd55fa..1e3e4bf 100644
--- a/xfwm4/shade-toggled-inactive.xpm
+++ b/xfwm4/shade-toggled-inactive.xpm
@@ -1,9 +1,9 @@
 /* XPM */
-static char * shade_toggled_inactive_xpm[] = {
+static char * shade_toggled_prelight_xpm[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm
index 964e77d..347c8e1 100644
--- a/xfwm4/stick-active.xpm
+++ b/xfwm4/stick-active.xpm
@@ -1,13 +1,9 @@
 /* XPM */
-static char * stick_active_xpm[] = {
-"24 24 7 1",
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #333333",
-"@	c #7E7E7E",
-"#	c #C8C8C8",
-"$	c #C5C5C5",
-"%	c #DBDBDB",
+"+	c #DCDCDC",
 "........................",
 "........................",
 "........................",
@@ -16,14 +12,14 @@ static char * stick_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-".........+@##@+.........",
-"........+$%%%%$+........",
-"........@%%%%%%@........",
-"........#%%..%%#........",
-"........#%%..%%#........",
-"........@%%%%%%@........",
-"........+$%%%%$+........",
-".........+@##@+.........",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........+++..+++........",
+"........+++..+++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm
index 814e928..ccac949 100644
--- a/xfwm4/stick-inactive.xpm
+++ b/xfwm4/stick-inactive.xpm
@@ -1,13 +1,9 @@
 /* XPM */
-static char * stick_inactive_xpm[] = {
-"24 24 7 1",
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #313131",
-"@	c #676767",
-"#	c #9C9C9C",
-"$	c #9A9A9A",
-"%	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
@@ -16,14 +12,14 @@ static char * stick_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-".........+@##@+.........",
-"........+$%%%%$+........",
-"........@%%%%%%@........",
-"........#%%..%%#........",
-"........#%%..%%#........",
-"........@%%%%%%@........",
-"........+$%%%%$+........",
-".........+@##@+.........",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........+++..+++........",
+"........+++..+++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm
index 964e77d..347c8e1 100644
--- a/xfwm4/stick-toggled-active.xpm
+++ b/xfwm4/stick-toggled-active.xpm
@@ -1,13 +1,9 @@
 /* XPM */
-static char * stick_active_xpm[] = {
-"24 24 7 1",
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #333333",
-"@	c #7E7E7E",
-"#	c #C8C8C8",
-"$	c #C5C5C5",
-"%	c #DBDBDB",
+"+	c #DCDCDC",
 "........................",
 "........................",
 "........................",
@@ -16,14 +12,14 @@ static char * stick_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-".........+@##@+.........",
-"........+$%%%%$+........",
-"........@%%%%%%@........",
-"........#%%..%%#........",
-"........#%%..%%#........",
-"........@%%%%%%@........",
-"........+$%%%%$+........",
-".........+@##@+.........",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........+++..+++........",
+"........+++..+++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm
index 814e928..ccac949 100644
--- a/xfwm4/stick-toggled-inactive.xpm
+++ b/xfwm4/stick-toggled-inactive.xpm
@@ -1,13 +1,9 @@
 /* XPM */
-static char * stick_inactive_xpm[] = {
-"24 24 7 1",
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
 " 	c None",
 ".	c #2D2D2D",
-"+	c #313131",
-"@	c #676767",
-"#	c #9C9C9C",
-"$	c #9A9A9A",
-"%	c #AAAAAA",
+"+	c #888888",
 "........................",
 "........................",
 "........................",
@@ -16,14 +12,14 @@ static char * stick_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-".........+@##@+.........",
-"........+$%%%%$+........",
-"........@%%%%%%@........",
-"........#%%..%%#........",
-"........#%%..%%#........",
-"........@%%%%%%@........",
-"........+$%%%%$+........",
-".........+@##@+.........",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........+++..+++........",
+"........+++..+++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
 "........................",
 "........................",
 "........................",
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 3e76d21..4dc55d6 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -1,34 +1,33 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"2 26 5 1",
+"2 26 4 1",
 " 	c None",
 ".	c #484848",
-"+	c #383838",
-"@	c #2E2E2E",
-"#	c #2D2D2D",
+"+	c #343434",
+"@	c #2D2D2D",
 " .",
 ".+",
 ".@",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#",
-".#"};
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@"};
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index 11192c2..834acf1 100644
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -3,7 +3,7 @@ static char * top_left_inactive_xpm[] = {
 "2 26 4 1",
 " 	c None",
 ".	c #393939",
-"+	c #323232",
+"+	c #303030",
 "@	c #2D2D2D",
 " .",
 ".+",
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index d1941be..9558840 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -1,34 +1,33 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"2 26 5 1",
+"2 26 4 1",
 " 	c None",
 ".	c #484848",
-"+	c #383838",
-"@	c #2E2E2E",
-"#	c #2D2D2D",
+"+	c #343434",
+"@	c #2D2D2D",
 ". ",
 "+.",
 "@.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#.",
-"#."};
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@."};
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index 41ed666..5776746 100644
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -3,7 +3,7 @@ static char * top_right_inactive_xpm[] = {
 "2 26 4 1",
 " 	c None",
 ".	c #393939",
-"+	c #323232",
+"+	c #303030",
 "@	c #2D2D2D",
 ". ",
 "+.",