Merge branch 'master' into wip/3.18

10 files changed, 366 insertions, 448 deletions

diff --git a/common/xfwm4/close-active.xpm b/common/xfwm4/close-active.xpm
index 975bc1f..dd3161c 100644
--- a/common/xfwm4/close-active.xpm
+++ b/common/xfwm4/close-active.xpm
@@ -1,66 +1,64 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"24 24 41 1",
+"24 24 39 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E8DDE0",
-"#	c #EDA9AE",
-"$	c #F0868C",
-"%	c #F3757B",
-"&	c #EDAAAF",
-"*	c #EBBFC3",
-"=	c #F2767B",
-"-	c #F37076",
-";	c #EAC0C4",
-">	c #F27076",
-",	c #F4787E",
-"'	c #F2767D",
-")	c #E7DDE1",
-"!	c #FFFCFC",
-"~	c #FAC7C9",
-"{	c #F37177",
-"]	c #FAC5C7",
-"^	c #FFFEFE",
-"/	c #F0868B",
-"(	c #F9B8BB",
-"_	c #FFFFFF",
-":	c #FAC9CB",
-"<	c #F9BDC0",
-"[	c #F2757B",
-"}	c #F9BBBE",
-"|	c #FABFC1",
-"1	c #F37278",
-"2	c #FBCACC",
-"3	c #FBCFD1",
-"4	c #FAC7CA",
-"5	c #FAC8CA",
-"6	c #FEF3F3",
-"7	c #F9B4B7",
-"8	c #EDABB0",
-"9	c #F2777C",
-"0	c #E7DEE1",
-"a	c #EAC1C5",
-"b	c #F0878C",
+"@	c #E8DCDF",
+"#	c #EDA2A6",
+"$	c #F1797F",
+"%	c #F3656C",
+"&	c #F17A80",
+"*	c #EDA1A7",
+"=	c #EBBABE",
+"-	c #F3666D",
+";	c #F46067",
+">	c #EABBBF",
+",	c #F36067",
+"'	c #F36E74",
+")	c #F36C73",
+"!	c #F3676E",
+"~	c #E7DCDF",
+"{	c #F7F7F8",
+"]	c #F4D3D6",
+"^	c #F36269",
+"/	c #F4D2D4",
+"(	c #EDA2A8",
+"_	c #F4C4C8",
+":	c #F7F8F9",
+"<	c #F4D5D8",
+"[	c #F4C9CD",
+"}	c #F4C8CB",
+"|	c #F3CBCE",
+"1	c #F4D9DC",
+"2	c #F3646B",
+"3	c #F3C3C7",
+"4	c #F6F2F3",
+"5	c #F3BFC3",
+"6	c #EDA3A8",
+"7	c #F3686E",
+"8	c #E7DDE0",
+"9	c #EABCC0",
+"0	c #F4656D",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%$&@++++++++",
-"+++++++*=------=;+++++++",
-"++++++*>-------->;++++++",
-"+++++@=--,----,--')+++++",
-"+++++#---!~{{]^---&+++++",
-"+++++/---(_::_<---$+++++",
-"+++++[----}__|----=+++++",
-"+++++=---12__31---'+++++",
-"+++++$---4_((_5---$+++++",
-"+++++&---67--76---8+++++",
-"+++++@=----------90+++++",
-"++++++;>-------->a++++++",
-"+++++++;'------9a+++++++",
-"++++++++)&b[[b80++++++++",
+"++++++++@#$%%&*@++++++++",
+"+++++++=-;;;;;;->+++++++",
+"++++++=,;;;;;;;;,>++++++",
+"+++++@-;;';;;;);;!~+++++",
+"+++++#;;;{]^^/{;;;(+++++",
+"+++++$;;;_:<<:[;;;&+++++",
+"+++++-;;;;}::|;;;;-+++++",
+"+++++-;;;^<::12;;;!+++++",
+"+++++$;;;]:33:<;;;&+++++",
+"+++++*;;;45;;54;;;6+++++",
+"+++++@-;;;;;;;;;;78+++++",
+"++++++>,;;;;;;;;,9++++++",
+"+++++++>!;;;;;;79+++++++",
+"++++++++~(&00&68++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/close-inactive.xpm b/common/xfwm4/close-inactive.xpm
index 2928832..706c3ca 100644
--- a/common/xfwm4/close-inactive.xpm
+++ b/common/xfwm4/close-inactive.xpm
@@ -1,58 +1,59 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"24 24 33 1",
+"24 24 34 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E1E3E6",
-"#	c #DFE0E4",
-"$	c #DDDEE3",
-"%	c #DEE0E4",
-"&	c #E3E4E8",
-"*	c #DCDEE3",
-"=	c #F0F1F2",
-"-	c #F5F5F7",
-";	c #E8E8EB",
-">	c #F0F1F3",
-",	c #F6F6F7",
-"'	c #F3F3F4",
-")	c #BBBFC9",
-"!	c #D2D5DB",
-"~	c #D3D5DC",
-"{	c #BBBEC8",
-"]	c #F1F1F3",
-"^	c #D7D9DF",
-"/	c #BABEC7",
-"(	c #D0D3D9",
-"_	c #D2D4DB",
-":	c #D5D7DD",
-"<	c #F4F4F7",
-"[	c #CDD1D8",
-"}	c #F5F5F6",
-"|	c #D7DADF",
-"1	c #D0D4DB",
-"2	c #BFC3CC",
-"3	c #D9DADF",
-"4	c #EFF0F2",
+"@	c #E2E3E6",
+"#	c #CCCFD3",
+"$	c #BFC1C8",
+"%	c #B8BBC1",
+"&	c #CDCFD4",
+"*	c #D6D8DC",
+"=	c #B8BBC2",
+"-	c #B5B8C0",
+";	c #B5B8BE",
+">	c #BBBDC3",
+",	c #BABCC3",
+"'	c #B8BAC1",
+")	c #E3E4E7",
+"!	c #DFE1E4",
+"~	c #B6B9C0",
+"{	c #BEC1C7",
+"]	c #DBDCDF",
+"^	c #E1E2E6",
+"/	c #DDDEE1",
+"(	c #DCDEE1",
+"_	c #DEDEE2",
+":	c #E4E4E7",
+"<	c #B7BAC0",
+"[	c #E1E1E6",
+"}	c #DADCDF",
+"|	c #ECECEE",
+"1	c #CED0D5",
+"2	c #B9BBC2",
+"3	c #D7D8DC",
+"4	c #BFC2C9",
+"5	c #B7BBC1",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"+++++++++@#$$%@+++++++++",
-"+++++++&*+=--=;*&+++++++",
-"++++++&%>,,,,,,>%&++++++",
-"++++++*>,',,,,',>*++++++",
-"+++++@+,,)!,,~{,,+@+++++",
-"+++++#],,^/(_/:,,>%+++++",
-"+++++$<,,,^//:,,,<$+++++",
-"+++++$<,,,(//[,,,}$+++++",
-"+++++#],,!/||/1,,>%+++++",
-"+++++@;,,23,,32,,+@+++++",
-"++++++*>,,,,,,,,>*++++++",
-"++++++&%>,,,,,,>%&++++++",
-"+++++++&*+><<4+*&+++++++",
-"+++++++++@%$$%@+++++++++",
+"++++++++@#$%%$&@++++++++",
+"+++++++*=------=*+++++++",
+"++++++*;--------;*++++++",
+"+++++@=-->----,--')+++++",
+"+++++#---.!~~!.---&+++++",
+"+++++{---].^^./---$+++++",
+"+++++=----(.._----=+++++",
+"+++++=---~^..:<---'+++++",
+"+++++$---[.}}.^---$+++++",
+"+++++&---|}--}|---1+++++",
+"+++++@=----------2)+++++",
+"++++++*;--------;3++++++",
+"+++++++*'------23+++++++",
+"++++++++)&45541)++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/close-prelight.xpm b/common/xfwm4/close-prelight.xpm
index 75c171f..da9b649 100644
--- a/common/xfwm4/close-prelight.xpm
+++ b/common/xfwm4/close-prelight.xpm
@@ -1,65 +1,68 @@
 /* XPM */
 static char * close_prelight_xpm[] = {
-"24 24 40 1",
+"24 24 43 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E8E1E4",
-"#	c #EFC0C4",
-"$	c #F4AAAE",
-"%	c #F6A0A4",
-"&	c #F4ABAF",
-"*	c #EFC1C5",
-"=	c #ECCED2",
-"-	c #F79DA1",
-";	c #EBCFD2",
-">	c #F69DA1",
-",	c #F7A3A7",
-"'	c #F7A2A6",
-")	c #F6A1A5",
-"!	c #E7E1E4",
-"~	c #FFFDFD",
-"{	c #FCD9DA",
-"]	c #F79EA2",
-"^	c #FCD7D9",
-"/	c #FFFEFE",
-"(	c #F3AAAE",
-"_	c #FBCFD1",
-":	c #FFFFFF",
-"<	c #FCDADC",
-"[	c #FCDADB",
-"}	c #FBD2D3",
-"|	c #FBD0D2",
-"1	c #FBD3D5",
-"2	c #FCDEDF",
-"3	c #F79FA2",
-"4	c #FCD9DB",
-"5	c #FBCED0",
-"6	c #FEF7F7",
-"7	c #FBCBCE",
-"8	c #F6A1A6",
-"9	c #E7E1E5",
-"0	c #EBCFD3",
-"a	c #F4ABAE",
+"@	c #E8DFE2",
+"#	c #EEB2B6",
+"$	c #F39399",
+"%	c #F5848A",
+"&	c #EEB2B7",
+"*	c #ECC5C9",
+"=	c #F5858B",
+"-	c #F68086",
+";	c #EBC5C9",
+">	c #F58086",
+",	c #F68A91",
+"'	c #F58A8F",
+")	c #F4858B",
+"!	c #E7DFE2",
+"~	c #F7F7F8",
+"{	c #F4DADD",
+"]	c #F58186",
+"^	c #F4D8DB",
+"/	c #F39398",
+"(	c #F4CFD1",
+"_	c #F7F8F9",
+":	c #F4DCDD",
+"<	c #F5DCDF",
+"[	c #F5D3D5",
+"}	c #F4D1D4",
+"|	c #F4D4D7",
+"1	c #F58288",
+"2	c #F4DCDF",
+"3	c #F4DFE1",
+"4	c #F58388",
+"5	c #F5DADD",
+"6	c #F4CDD0",
+"7	c #F5DCDD",
+"8	c #F6F3F4",
+"9	c #F4CCCE",
+"0	c #EEB3B7",
+"a	c #F6868B",
+"b	c #E7DFE3",
+"c	c #EBC6CA",
+"d	c #F39499",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%&*@++++++++",
-"+++++++=%------%;+++++++",
-"++++++=>-------->;++++++",
-"+++++@%--,----'--)!+++++",
-"+++++#---~{]]^/---*+++++",
-"+++++(---_:<[:}---&+++++",
-"+++++%----|::1----%+++++",
-"+++++%---]<::23---)+++++",
-"+++++$---4:55:4---&+++++",
-"+++++*---67--76---*+++++",
-"+++++@%----------89+++++",
-"++++++;>-------->0++++++",
-"+++++++;)------80+++++++",
-"++++++++!*a%%a*9++++++++",
+"++++++++@#$%%$&@++++++++",
+"+++++++*=------=;+++++++",
+"++++++*>-------->;++++++",
+"+++++@=--,----'--)!+++++",
+"+++++#---~{]]^~---&+++++",
+"+++++/---(_:<_[---$+++++",
+"+++++=----}__|----=+++++",
+"+++++=---12__34---)+++++",
+"+++++$---5_66_7---$+++++",
+"+++++&---89--98---0+++++",
+"+++++@=----------ab+++++",
+"++++++;>-------->c++++++",
+"+++++++;)------ac+++++++",
+"++++++++!&d%%d0b++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/close-pressed.xpm b/common/xfwm4/close-pressed.xpm
index 51b8843..5675773 100644
--- a/common/xfwm4/close-pressed.xpm
+++ b/common/xfwm4/close-pressed.xpm
@@ -1,48 +1,52 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"24 24 42 1",
+"24 24 46 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E8DADC",
-"#	c #EB9196",
-"$	c #ED5F65",
-"%	c #EE474F",
-"&	c #ED6067",
-"*	c #EB9197",
-"=	c #EAAFB4",
-"-	c #EE4850",
-";	c #EF4048",
-">	c #E9B0B5",
-",	c #EE4048",
-"'	c #F04B53",
-")	c #F04A52",
-"!	c #E7D9DD",
-"~	c #FFFBFB",
-"{	c #F9B4B7",
-"]	c #EF4149",
-"^	c #F8B1B4",
-"/	c #FFFDFE",
-"(	c #EB9298",
-"_	c #ED5E66",
-":	c #F7A1A5",
-"<	c #FFFFFF",
-"[	c #F9B7BA",
-"}	c #F9B6B9",
-"|	c #F8A7AA",
-"1	c #F7A4A8",
-"2	c #F8A9AC",
-"3	c #EF424A",
-"4	c #F9B8BB",
-"5	c #FABFC1",
-"6	c #EF434B",
-"7	c #F9B5B8",
-"8	c #F7A0A4",
-"9	c #FEEFEF",
-"0	c #F79B9F",
-"a	c #EE4951",
-"b	c #E7DADE",
-"c	c #E9B2B6",
+"@	c #E8D7DB",
+"#	c #EC888F",
+"$	c #EF525A",
+"%	c #F03740",
+"&	c #EF535B",
+"*	c #EC898F",
+"=	c #EAAAAF",
+"-	c #F03942",
+";	c #F13039",
+">	c #E9ABB0",
+",	c #F03039",
+"'	c #F23C45",
+")	c #F23B44",
+"!	c #F03A42",
+"~	c #E7D8DC",
+"{	c #FFFBFB",
+"]	c #FAAEB1",
+"^	c #F1323B",
+"/	c #F9ABAE",
+"(	c #FFFDFD",
+"_	c #EC8990",
+":	c #EF5158",
+"<	c #F8999D",
+"[	c #FFFFFF",
+"}	c #FAB1B4",
+"|	c #FAB0B4",
+"1	c #F99FA3",
+"2	c #F03841",
+"3	c #F89DA1",
+"4	c #F9A2A6",
+"5	c #FAB2B5",
+"6	c #FAB9BC",
+"7	c #F1333C",
+"8	c #FAAFB2",
+"9	c #F8989C",
+"0	c #FAAFB3",
+"a	c #FEEDEE",
+"b	c #F89297",
+"c	c #EC8A90",
+"d	c #F03A43",
+"e	c #E7D9DC",
+"f	c #E9ACB1",
+"g	c #EF545B",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
@@ -51,17 +55,17 @@ static char * close_pressed_xpm[] = {
 "++++++++@#$%%&*@++++++++",
 "+++++++=-;;;;;;->+++++++",
 "++++++=,;;;;;;;;,>++++++",
-"+++++@-;;';;;;);;-!+++++",
-"+++++#;;;~{]]^/;;;(+++++",
-"+++++_;;;:<[}<|;;;&+++++",
-"+++++%;;;;1<<2;;;;-+++++",
-"+++++-;;;34<<56;;;-+++++",
-"+++++$;;;7<88<};;;&+++++",
-"+++++*;;;90;;09;;;(+++++",
-"+++++@-;;;;;;;;;;ab+++++",
-"++++++>,;;;;;;;;,c++++++",
-"+++++++>-;;;;;;ac+++++++",
-"++++++++!(&%%&(b++++++++",
+"+++++@-;;';;;;);;!~+++++",
+"+++++#;;;{]^^/(;;;_+++++",
+"+++++:;;;<[}|[1;;;&+++++",
+"+++++2;;;;3[[4;;;;-+++++",
+"+++++-;;;^5[[67;;;!+++++",
+"+++++$;;;8[99[0;;;&+++++",
+"+++++*;;;ab;;ba;;;c+++++",
+"+++++@-;;;;;;;;;;de+++++",
+"++++++>,;;;;;;;;,f++++++",
+"+++++++>!;;;;;;df+++++++",
+"++++++++~_g22gce++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/hide-active.xpm b/common/xfwm4/hide-active.xpm
index a7aaf36..5907b58 100644
--- a/common/xfwm4/hide-active.xpm
+++ b/common/xfwm4/hide-active.xpm
@@ -1,46 +1,29 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"24 24 21 1",
+"24 24 4 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E6E7EA",
-"#	c #DFE1E5",
-"$	c #DBDCE1",
-"%	c #D9DBDF",
-"&	c #DADCE1",
-"*	c #E2E3E7",
-"=	c #D9DBE1",
-"-	c #E8E8EC",
-";	c #F5F5F6",
-">	c #FAFAFB",
-",	c #DCDDE2",
-"'	c #F5F6F6",
-")	c #FCFCFD",
-"!	c #E7E8EC",
-"~	c #F5F5F7",
-"{	c #FAFAFC",
-"]	c #A7ACB9",
-"^	c #F3F4F6",
+"@	c #90949E",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%&#@++++++++",
-"+++++++*=-;>>;-=*+++++++",
-"++++++*,'))))))',*++++++",
-"+++++@='))))))))'=@+++++",
-"+++++#-))))))))))!#+++++",
-"+++++$;))))))))))~&+++++",
-"+++++%{))]]]]]])){%+++++",
-"+++++%{))]]]]]])){%+++++",
-"+++++$;))))))))))~&+++++",
-"+++++#-))))))))))!#+++++",
-"+++++@='))))))))'=@+++++",
-"++++++*,'))))))',*++++++",
-"+++++++*=!~{{^!=*+++++++",
-"++++++++@#&%%&#@++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"+++++++++@@@@@@+++++++++",
+"+++++++++@@@@@@+++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/hide-inactive.xpm b/common/xfwm4/hide-inactive.xpm
index c815749..5c146d2 100644
--- a/common/xfwm4/hide-inactive.xpm
+++ b/common/xfwm4/hide-inactive.xpm
@@ -1,44 +1,29 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"24 24 19 1",
+"24 24 4 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E1E3E6",
-"#	c #DFE0E4",
-"$	c #DDDEE3",
-"%	c #DEE0E4",
-"&	c #E3E4E8",
-"*	c #DCDEE3",
-"=	c #F0F1F2",
-"-	c #F5F5F7",
-";	c #E8E8EB",
-">	c #F0F1F3",
-",	c #F6F6F7",
-"'	c #F1F1F3",
-")	c #F4F4F7",
-"!	c #BABEC7",
-"~	c #F5F5F6",
-"{	c #EFF0F2",
+"@	c #B5B8C0",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"+++++++++@#$$%@+++++++++",
-"+++++++&*+=--=;*&+++++++",
-"++++++&%>,,,,,,>%&++++++",
-"++++++*>,,,,,,,,>*++++++",
-"+++++@+,,,,,,,,,,+@+++++",
-"+++++#',,,,,,,,,,>%+++++",
-"+++++$),,!!!!!!,,)$+++++",
-"+++++$),,!!!!!!,,~$+++++",
-"+++++#',,,,,,,,,,>%+++++",
-"+++++@;,,,,,,,,,,+@+++++",
-"++++++*>,,,,,,,,>*++++++",
-"++++++&%>,,,,,,>%&++++++",
-"+++++++&*+>)){+*&+++++++",
-"+++++++++@%$$%@+++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"+++++++++@@@@@@+++++++++",
+"+++++++++@@@@@@+++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/hide-prelight.xpm b/common/xfwm4/hide-prelight.xpm
index 447d70a..215a039 100644
--- a/common/xfwm4/hide-prelight.xpm
+++ b/common/xfwm4/hide-prelight.xpm
@@ -1,62 +1,48 @@
 /* XPM */
 static char * hide_prelight_xpm[] = {
-"24 24 37 1",
+"24 24 23 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #DAE1E9",
-"#	c #99BDE6",
-"$	c #6EA3E2",
-"%	c #5897E2",
-"&	c #6EA4E4",
-"*	c #9ABCE6",
-"=	c #B5CBE7",
-"-	c #5D9AE2",
-";	c #96BBE9",
-">	c #D4E2F4",
-",	c #F4F6FB",
-"'	c #95BBE8",
-")	c #B5CCE7",
-"!	c #629EE2",
-"~	c #D9E6F5",
-"{	c #FCFCFD",
-"]	c #D8E6F5",
-"^	c #639DE2",
-"/	c #DAE0EA",
-"(	c #94BBE8",
-"_	c #9BBCE6",
-":	c #6DA3E3",
-"<	c #D3E1F4",
-"[	c #5997E2",
-"}	c #747C90",
-"|	c #5998E1",
-"1	c #F1F5FA",
-"2	c #5998E2",
-"3	c #9BBDE5",
-"4	c #5E9AE2",
-"5	c #DAE1EA",
-"6	c #B6CDE8",
-"7	c #D2E1F4",
-"8	c #6FA4E3",
+"@	c #E5E6E9",
+"#	c #DADCE1",
+"$	c #D4D6DC",
+"%	c #D2D4DA",
+"&	c #DFE1E5",
+"*	c #D2D5DB",
+"=	c #E3E4E8",
+"-	c #F3F4F6",
+";	c #FCFCFC",
+">	c #E2E4E8",
+",	c #D5D7DD",
+"'	c #F5F6F6",
+")	c #FDFDFE",
+"!	c #DBDDE2",
+"~	c #FBFCFC",
+"{	c #7A7F8B",
+"]	c #FBFBFC",
+"^	c #D1D4DA",
+"/	c #E0E1E5",
+"(	c #F3F3F6",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%&*@++++++++",
-"+++++++=-;>,,>'-)+++++++",
-"++++++=!~{{{{{{]^)++++++",
-"+++++@-~{{{{{{{{]-/+++++",
-"+++++#;{{{{{{{{{{(_+++++",
-"+++++:>{{{{{{{{{{<&+++++",
-"+++++[,{{}}}}}}{{,|+++++",
-"+++++|,{{}}}}}}{{12+++++",
-"+++++$>{{{{{{{{{{<&+++++",
-"+++++*'{{{{{{{{{{(3+++++",
-"+++++@-]{{{{{{{{]45+++++",
-"++++++)!]{{{{{{]^6++++++",
-"+++++++)-(<,,7(46+++++++",
-"++++++++/_8[[835++++++++",
+"++++++++@#$%%$#@++++++++",
+"+++++++&*=-;;->*&+++++++",
+"++++++&,'))))))',&++++++",
+"+++++@*'))))))))'*@+++++",
+"+++++#=))))))))))>!+++++",
+"+++++$-))))))))))-$+++++",
+"+++++%~)){{{{{{))~%+++++",
+"+++++%~)){{{{{{))]^+++++",
+"+++++$-))))))))))-$+++++",
+"+++++#>))))))))))>!+++++",
+"+++++@*'))))))))'*@+++++",
+"++++++&,'))))))',/++++++",
+"+++++++&*>-~~(>*/+++++++",
+"++++++++@!$%%$!@++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/maximize-active.xpm b/common/xfwm4/maximize-active.xpm
index 0c5e497..8f978fc 100644
--- a/common/xfwm4/maximize-active.xpm
+++ b/common/xfwm4/maximize-active.xpm
@@ -1,53 +1,38 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"24 24 28 1",
+"24 24 13 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E6E7EA",
-"#	c #DFE1E5",
-"$	c #DBDCE1",
-"%	c #D9DBDF",
-"&	c #DADCE1",
-"*	c #E2E3E7",
-"=	c #D9DBE1",
-"-	c #E8E8EC",
-";	c #F5F5F6",
-">	c #FAFAFB",
-",	c #DCDDE2",
-"'	c #F5F6F6",
-")	c #FCFCFD",
-"!	c #C2C6CE",
-"~	c #A7ACB9",
-"{	c #B7BCC7",
-"]	c #E7E8EC",
-"^	c #F5F5F7",
-"/	c #FAFAFC",
-"(	c #C0C4CD",
-"_	c #F9FAFB",
-":	c #FBFBFC",
-"<	c #C4C8D0",
-"[	c #B7BBC6",
-"}	c #F3F4F6",
+"@	c #E5E6E9",
+"#	c #ACAFB7",
+"$	c #90949E",
+"%	c #A0A5AD",
+"&	c #E6E7EA",
+"*	c #A9ADB4",
+"=	c #E3E4E8",
+"-	c #E6E7EB",
+";	c #ADB0B8",
+">	c #A0A4AB",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%&#@++++++++",
-"+++++++*=-;>>;-=*+++++++",
-"++++++*,'))))))',*++++++",
-"+++++@='))))))))'=@+++++",
-"+++++#-)))>!~~{))]#+++++",
-"+++++$;))>)>!~~))^&+++++",
-"+++++%/))(_):<~))/%+++++",
-"+++++%/))~(_):<))/%+++++",
-"+++++$;))~~!>)>))^&+++++",
-"+++++#-))[~~!>)))]#+++++",
-"+++++@='))))))))'=@+++++",
-"++++++*,'))))))',*++++++",
-"+++++++*=]^//}]=*+++++++",
-"++++++++@#&%%&#@++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++@#$$%+++++++++",
+"+++++++++@+@#$$+++++++++",
+"++++++++&*=+-;$+++++++++",
+"++++++++&$*=+-;+++++++++",
+"++++++++&$$#@+@+++++++++",
+"+++++++++>$$#@++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/maximize-inactive.xpm b/common/xfwm4/maximize-inactive.xpm
index 54bab72..b067a66 100644
--- a/common/xfwm4/maximize-inactive.xpm
+++ b/common/xfwm4/maximize-inactive.xpm
@@ -1,50 +1,37 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"24 24 25 1",
+"24 24 12 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #E1E3E6",
-"#	c #DFE0E4",
-"$	c #DDDEE3",
-"%	c #DEE0E4",
-"&	c #E3E4E8",
-"*	c #DCDEE3",
-"=	c #F0F1F2",
-"-	c #F5F5F7",
-";	c #E8E8EB",
-">	c #F0F1F3",
-",	c #F6F6F7",
-"'	c #F4F5F6",
-")	c #CCD0D7",
-"!	c #BABEC7",
-"~	c #C6CAD1",
-"{	c #F1F1F3",
-"]	c #F4F4F7",
-"^	c #CBCED5",
-"/	c #CED2D8",
-"(	c #F5F5F6",
-"_	c #C6C9D1",
-":	c #EFF0F2",
+"@	c #E6E7EA",
+"#	c #C5C8CD",
+"$	c #B5B8C0",
+"%	c #BFC2C9",
+"&	c #C4C7CC",
+"*	c #E5E6EA",
+"=	c #E6E7EB",
+"-	c #C6C8CE",
+";	c #BEC1C7",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"+++++++++@#$$%@+++++++++",
-"+++++++&*+=--=;*&+++++++",
-"++++++&%>,,,,,,>%&++++++",
-"++++++*>,,,,,,,,>*++++++",
-"+++++@+,,,')!!~,,+@+++++",
-"+++++#{,,',')!!,,>%+++++",
-"+++++$],,^',,/!,,]$+++++",
-"+++++$],,!^',,/,,($+++++",
-"+++++#{,,!!)',',,>%+++++",
-"+++++@;,,_!!)',,,+@+++++",
-"++++++*>,,,,,,,,>*++++++",
-"++++++&%>,,,,,,>%&++++++",
-"+++++++&*+>]]:+*&+++++++",
-"+++++++++@%$$%@+++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++@#$$%+++++++++",
+"+++++++++@+@#$$+++++++++",
+"++++++++@&*+=-$+++++++++",
+"++++++++@$&*+=-+++++++++",
+"++++++++@$$#@+@+++++++++",
+"+++++++++;$$#@++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
+"++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
diff --git a/common/xfwm4/maximize-prelight.xpm b/common/xfwm4/maximize-prelight.xpm
index 354c8b6..0b69086 100644
--- a/common/xfwm4/maximize-prelight.xpm
+++ b/common/xfwm4/maximize-prelight.xpm
@@ -1,70 +1,56 @@
 /* XPM */
 static char * maximize_prelight_xpm[] = {
-"24 24 45 1",
+"24 24 31 1",
 " 	c None",
 ".	c #EEEFF1",
 "+	c #E7E8EB",
-"@	c #DAE1E9",
-"#	c #99BDE6",
-"$	c #6EA3E2",
-"%	c #5897E2",
-"&	c #6EA4E4",
-"*	c #9ABCE6",
-"=	c #B5CBE7",
-"-	c #5D9AE2",
-";	c #96BBE9",
-">	c #D4E2F4",
-",	c #F4F6FB",
-"'	c #95BBE8",
-")	c #B5CCE7",
-"!	c #629EE2",
-"~	c #D9E6F5",
-"{	c #FCFCFD",
-"]	c #D8E6F5",
-"^	c #639DE2",
-"/	c #DAE0EA",
-"(	c #FAFAFB",
-"_	c #A1A5B4",
-":	c #747C90",
-"<	c #8F96A6",
-"[	c #94BBE8",
-"}	c #9BBCE6",
-"|	c #6DA3E3",
-"1	c #D3E1F4",
-"2	c #5997E2",
-"3	c #FBFBFC",
-"4	c #9CA3AF",
-"5	c #F9F9F9",
-"6	c #A3A9B5",
-"7	c #5998E1",
-"8	c #F1F5FA",
-"9	c #5998E2",
-"0	c #8E95A5",
-"a	c #9BBDE5",
-"b	c #5E9AE2",
-"c	c #DAE1EA",
-"d	c #B6CDE8",
-"e	c #D2E1F4",
-"f	c #6FA4E3",
+"@	c #E5E6E9",
+"#	c #DADCE1",
+"$	c #D4D6DC",
+"%	c #D2D4DA",
+"&	c #DFE1E5",
+"*	c #D2D5DB",
+"=	c #E3E4E8",
+"-	c #F3F4F6",
+";	c #FCFCFC",
+">	c #E2E4E8",
+",	c #D5D7DD",
+"'	c #F5F6F6",
+")	c #FDFDFE",
+"!	c #FBFBFC",
+"~	c #A5A8AF",
+"{	c #7A7F8B",
+"]	c #9397A1",
+"^	c #DBDDE2",
+"/	c #FBFCFC",
+"(	c #FCFCFD",
+"_	c #A1A5AC",
+":	c #FAFAFB",
+"<	c #FBFCFD",
+"[	c #A8AAB2",
+"}	c #D1D4DA",
+"|	c #92969F",
+"1	c #E0E1E5",
+"2	c #F3F3F6",
 "........................",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
-"++++++++@#$%%&*@++++++++",
-"+++++++=-;>,,>'-)+++++++",
-"++++++=!~{{{{{{]^)++++++",
-"+++++@-~{{{{{{{{]-/+++++",
-"+++++#;{{{(_::<{{[}+++++",
-"+++++|>{{({(_::{{1&+++++",
-"+++++2,{345{36:{{,7+++++",
-"+++++7,{3:45{36{{89+++++",
-"+++++$>{3::_({({{1&+++++",
-"+++++*'{{0::_({{{[a+++++",
-"+++++@-]{{{{{{{{]bc+++++",
-"++++++)!]{{{{{{]^d++++++",
-"+++++++)-[1,,e[bd+++++++",
-"++++++++/}f22fac++++++++",
+"++++++++@#$%%$#@++++++++",
+"+++++++&*=-;;->*&+++++++",
+"++++++&,'))))))',&++++++",
+"+++++@*'))))))))'*@+++++",
+"+++++#=)))!~{{]))>^+++++",
+"+++++$-))!)!~{{))-$+++++",
+"+++++%/)(_:)<[{))/%+++++",
+"+++++%/)({_:)<[))!}+++++",
+"+++++$-)({{~!)!))-$+++++",
+"+++++#>))|{{~!)))>^+++++",
+"+++++@*'))))))))'*@+++++",
+"++++++&,'))))))',1++++++",
+"+++++++&*>-//2>*1+++++++",
+"++++++++@^$%%$^@++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",
 "++++++++++++++++++++++++",