diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index ee050a90fb89c5452e7b2e91eb9a37baab0cac72..231ccbc45d506f2dd8c203c671f7989a1feb3abd 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,26 +1,29 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"16 18 5 1",
+"16 18 8 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
+"$	c #ED2323",
+"=	c #FFA0A0",
+"-	c #BA1B1B",
 "#	c #FFFFFF",
 "                ",
 "                ",
 " .++++++++++++. ",
-".+@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@.#@@@@#.@@@+",
-"+@@@###@@###@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@###@@###@@@+",
-"+@@@.#@@@@#.@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
+".+------------+.",
+"+--------------+",
+"+--------------+",
+"+---=#----#=---+",
+"+---###--###---+",
+"+----######----+",
+"+-----####-----+",
+"+-----####-----+",
+"+----######----+",
+"+---###--###---+",
+"+---=#----#=---+",
+"+--------------+",
+"+--------------+",
+".+------------+.",
 " .++++++++++++. "};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 4b2974004a691c3b98ac4920b8e20d3f3bfe6add..a794cee63b0302aaf359b96c68f2416272cfebc4 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,11 +1,14 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"16 18 5 1",
+"16 18 8 1",
 " 	c None",
 ".	c #567B9C s inactive_mid_1",
 "+	c #4B58A2 s inactive_shadow_1",
 "@	c #FFFFFF s inactive_hilight_1",
 "#	c #949595 s inactive_shadow_1",
+"$	c #ED2323",
+"=	c #FFA0A0",
+"-	c #BA1B1B",
 "                ",
 "                ",
 " .++++++++++++. ",
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 6f29db2433f4349668db90dcbe6e481782bb0948..d1cc5decb7e20847fcdf573224cc985d733e2981 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,26 +1,29 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"16 18 5 1",
+"16 18 8 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
+"$	c #ED2323",
+"=	c #FFA0A0",
+"-	c #BA1B1B",
 "                ",
 "                ",
 " .++++++++++++. ",
-".+@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@+#@@@@#+@@@+",
-"+@@@###@@###@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@###@@###@@@+",
-"+@@@+#@@@@#+@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
+".+$$$$$$$$$$$$+.",
+"+$$$$$$$$$$$$$$+",
+"+$$$$$$$$$$$$$$+",
+"+$$$=#$$$$#=$$$+",
+"+$$$###$$###$$$+",
+"+$$$$######$$$$+",
+"+$$$$$####$$$$$+",
+"+$$$$$####$$$$$+",
+"+$$$$######$$$$+",
+"+$$$###$$###$$$+",
+"+$$$=#$$$$#=$$$+",
+"+$$$$$$$$$$$$$$+",
+"+$$$$$$$$$$$$$$+",
+".+$$$$$$$$$$$$+.",
 " .++++++++++++. "};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 8edbf47788ce8578bf8ce542a9ef8313b7f024f6..c3e37b9b941414df8a74d39ef82aa979b02130c5 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -15,10 +15,10 @@ static char * stick_active_xpm[] = {
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
 "+@@@#$$$$$$#@@@+",
-"+@@@$$#@@#$$@@@+",
+"+@@@$$+@@+$$@@@+",
 "+@@@$$@@@@$$@@@+",
 "+@@@$$@@@@$$@@@+",
-"+@@@$$#@@#$$@@@+",
+"+@@@$$+@@+$$@@@+",
 "+@@@#$$$$$$#@@@+",
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index db8f79e0d7d2f4e438ad4b64f53fd05b949c3129..bb2d620f7f4695766d11efaf05ae7718aa2c82e3 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -15,10 +15,10 @@ static char * stick_toggled_active_xpm[] = {
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
 "+@@@#$$$$$$#@@@+",
-"+@@@$$#@@#$$@@@+",
+"+@@@$$+@@+$$@@@+",
 "+@@@$$@$$@$$@@@+",
 "+@@@$$@$$@$$@@@+",
-"+@@@$$#@@#$$@@@+",
+"+@@@$$+@@+$$@@@+",
 "+@@@#$$$$$$#@@@+",
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",