diff --git a/xfwm4/button-bg.svg b/xfwm4/button-bg.svg
new file mode 100644
index 0000000..00f4bc1
--- /dev/null
+++ b/xfwm4/button-bg.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/xfwm4/close-active.svg b/xfwm4/close-active.svg
deleted file mode 120000
index b8e4ecf..0000000
--- a/xfwm4/close-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-close.svg
\ No newline at end of file
diff --git a/xfwm4/close-active.svg b/xfwm4/close-active.svg
new file mode 100755
index 0000000..5045e96
--- /dev/null
+++ b/xfwm4/close-active.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
deleted file mode 100644
index 0068c0a..0000000
--- a/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"32 16 1 1",
-". c None",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};
diff --git a/xfwm4/close-inactive.svg b/xfwm4/close-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4/close-inactive.svg
+++ b/xfwm4/close-inactive.svg
@@ -1 +1 @@
-../metacity-1/button-bg.svg
\ No newline at end of file
+button-bg.svg
\ No newline at end of file
diff --git a/xfwm4/close-prelight.svg b/xfwm4/close-prelight.svg
deleted file mode 120000
index 0c62c97..0000000
--- a/xfwm4/close-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-close_a.svg
\ No newline at end of file
diff --git a/xfwm4/close-prelight.svg b/xfwm4/close-prelight.svg
new file mode 100755
index 0000000..7523453
--- /dev/null
+++ b/xfwm4/close-prelight.svg
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/xfwm4/hide-active.svg b/xfwm4/hide-active.svg
deleted file mode 120000
index 540921b..0000000
--- a/xfwm4/hide-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-min.svg
\ No newline at end of file
diff --git a/xfwm4/hide-active.svg b/xfwm4/hide-active.svg
new file mode 100755
index 0000000..1bcc9bd
--- /dev/null
+++ b/xfwm4/hide-active.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/xfwm4/hide-inactive.svg b/xfwm4/hide-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4/hide-inactive.svg
+++ b/xfwm4/hide-inactive.svg
@@ -1 +1 @@
-../metacity-1/button-bg.svg
\ No newline at end of file
+button-bg.svg
\ No newline at end of file
diff --git a/xfwm4/hide-prelight.svg b/xfwm4/hide-prelight.svg
deleted file mode 120000
index 924dc49..0000000
--- a/xfwm4/hide-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-min_a.svg
\ No newline at end of file
diff --git a/xfwm4/hide-prelight.svg b/xfwm4/hide-prelight.svg
new file mode 100755
index 0000000..01e0e3e
--- /dev/null
+++ b/xfwm4/hide-prelight.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/xfwm4/maximize-active.svg b/xfwm4/maximize-active.svg
deleted file mode 120000
index 3e58157..0000000
--- a/xfwm4/maximize-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-max.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-active.svg b/xfwm4/maximize-active.svg
new file mode 100755
index 0000000..5c848ae
--- /dev/null
+++ b/xfwm4/maximize-active.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/xfwm4/maximize-inactive.svg b/xfwm4/maximize-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4/maximize-inactive.svg
+++ b/xfwm4/maximize-inactive.svg
@@ -1 +1 @@
-../metacity-1/button-bg.svg
\ No newline at end of file
+button-bg.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-prelight.svg b/xfwm4/maximize-prelight.svg
deleted file mode 120000
index 9c00ce9..0000000
--- a/xfwm4/maximize-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-max_a.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-prelight.svg b/xfwm4/maximize-prelight.svg
new file mode 100755
index 0000000..a8cc09f
--- /dev/null
+++ b/xfwm4/maximize-prelight.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/xfwm4/maximize-toggled-active.svg b/xfwm4/maximize-toggled-active.svg
new file mode 100644
index 0000000..ce7a6af
--- /dev/null
+++ b/xfwm4/maximize-toggled-active.svg
@@ -0,0 +1,16 @@
+
\ No newline at end of file
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
deleted file mode 100644
index a70308f..0000000
--- a/xfwm4/maximize-toggled-active.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"43 58 5 1",
-" c None",
-"$ c #C0C0FF s inactive_color_1",
-"@ c #949594 s active_shadow_2",
-"# c #000000 s active_text_color",
-". c #B4BAB4 s inactive_color_1",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..................#######..................",
-"..................#######..................",
-"..................##...##..................",
-"..................##...##..................",
-"..................##...##..................",
-"..................#######..................",
-"..................#######..................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};
diff --git a/xfwm4/maximize-toggled-inactive.svg b/xfwm4/maximize-toggled-inactive.svg
new file mode 120000
index 0000000..3f510dd
--- /dev/null
+++ b/xfwm4/maximize-toggled-inactive.svg
@@ -0,0 +1 @@
+button-bg.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
deleted file mode 100644
index 568a5ff..0000000
--- a/xfwm4/maximize-toggled-inactive.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"43 58 5 1",
-" c None",
-". c #C0C0FF s inactive_color_1",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000 s inactive_text_color",
-"$ c #B4BAB4 s inactive_mid_2",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..................#######..................",
-"..................#######..................",
-"..................##...##..................",
-"..................##...##..................",
-"..................##...##..................",
-"..................#######..................",
-"..................#######..................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};
diff --git a/xfwm4/maximize-toggled-prelight.svg b/xfwm4/maximize-toggled-prelight.svg
new file mode 120000
index 0000000..bcc46c9
--- /dev/null
+++ b/xfwm4/maximize-toggled-prelight.svg
@@ -0,0 +1 @@
+maximize-toggled-active.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm
deleted file mode 100644
index 6ffb5e8..0000000
--- a/xfwm4/maximize-toggled-prelight.xpm
+++ /dev/null
@@ -1,68 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"43 58 6 1",
-" c None",
-"$ c #C0C0FF s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000 s active_text_color",
-". c #B4BAB4 s active_mid_2",
-"+ c #B4BAB4 s active_hilight_2",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-".@+++++++++++++++++++++++++++++++++++++++@.",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++#######+++++++++++++++++@",
-"@+++++++++++++++++#######+++++++++++++++++@",
-"@+++++++++++++++++##+++##+++++++++++++++++@",
-"@+++++++++++++++++##+++##+++++++++++++++++@",
-"@+++++++++++++++++##+++##+++++++++++++++++@",
-"@+++++++++++++++++#######+++++++++++++++++@",
-"@+++++++++++++++++#######+++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-"@+++++++++++++++++++++++++++++++++++++++++@",
-".@+++++++++++++++++++++++++++++++++++++++@.",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};
diff --git a/xfwm4/maximize-toggled-pressed.svg b/xfwm4/maximize-toggled-pressed.svg
new file mode 120000
index 0000000..bcc46c9
--- /dev/null
+++ b/xfwm4/maximize-toggled-pressed.svg
@@ -0,0 +1 @@
+maximize-toggled-active.svg
\ No newline at end of file
diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm
deleted file mode 100644
index c342b6b..0000000
--- a/xfwm4/maximize-toggled-pressed.xpm
+++ /dev/null
@@ -1,68 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"43 58 6 1",
-" c None",
-"$ c #C0C0FF s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000 s active_text_color",
-". c #B4BAB4 s active_mid_2",
-"+ c #B4BAB4 s active_hilight_2",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-".@.......................................@.",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.................#######.................@",
-"@.................#######.................@",
-"@.................##...##.................@",
-"@.................##...##.................@",
-"@.................##...##.................@",
-"@.................#######.................@",
-"@.................#######.................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-".@.......................................@.",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index a12e087..caf8d1f 100644
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"8 32 2 1",
+"8 54 2 1",
" c None",
". c #000000 s active_color_1",
"........",
@@ -34,4 +34,26 @@ static char * title_active_xpm[] = {
"........",
"........",
"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
"........"};
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 3a8178a..5bfb85b 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"16 32 2 1",
+"16 54 2 1",
" c None",
". c #C0C0FF s active_color_1",
" ........",
@@ -34,4 +34,26 @@ static char * top_left_active_xpm[] = {
"................",
"................",
"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
"................"}
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index fe9a193..a8e8cb1 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"16 32 2 1",
+"16 54 2 1",
" c None",
". c #C0C0FF s active_color_1",
"........ ",
@@ -34,4 +34,26 @@ static char * top_right_active_xpm[] = {
"................",
"................",
"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
"................"}