diff --git a/xfwm4-hidpi/button-bg.svg b/xfwm4-hidpi/button-bg.svg
new file mode 100644
index 0000000..8fad188
--- /dev/null
+++ b/xfwm4-hidpi/button-bg.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="54" width="54" fill="#86909b"
+  version="1.1">
+  <circle cy="27" cx="27" r="16" />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/close-active.svg b/xfwm4-hidpi/close-active.svg
deleted file mode 120000
index b8e4ecf..0000000
--- a/xfwm4-hidpi/close-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-close.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/close-active.svg b/xfwm4-hidpi/close-active.svg
new file mode 100755
index 0000000..5045e96
--- /dev/null
+++ b/xfwm4-hidpi/close-active.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M752.446 1198.624c-212.11-.13-394.83-149.58-436.9-357.44-42.07-207.86 68-416.63 263.31-499.29 226.93-95.85 488.61 10.38 584.48 237.28s-10.37 488.55-237.3 584.45a443.33 443.33 0 01-173.59 35z"
+    fill="#d84945" />
+  <path
+    d="M752.387 341.455c-195.54.12-363.94 137.9-402.76 329.52-38.82 191.62 62.67 384.08 242.74 460.28a411.17 411.17 0 10160-789.8z"
+    fill="#f55449" />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/close-active.xpm b/xfwm4-hidpi/close-active.xpm
deleted file mode 100644
index 0068c0a..0000000
--- a/xfwm4-hidpi/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-hidpi/close-inactive.svg b/xfwm4-hidpi/close-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4-hidpi/close-inactive.svg
+++ b/xfwm4-hidpi/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-hidpi/close-prelight.svg b/xfwm4-hidpi/close-prelight.svg
deleted file mode 120000
index 0c62c97..0000000
--- a/xfwm4-hidpi/close-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-close_a.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/close-prelight.svg b/xfwm4-hidpi/close-prelight.svg
new file mode 100755
index 0000000..7523453
--- /dev/null
+++ b/xfwm4-hidpi/close-prelight.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M752.446 1198.624c-212.11-.13-394.83-149.58-436.9-357.44-42.07-207.86 68-416.63 263.31-499.29 226.93-95.85 488.61 10.38 584.48 237.28s-10.37 488.55-237.3 584.45a443.33 443.33 0 01-173.59 35z"
+    fill="#d84945" />
+  <path
+    d="M752.446 341.694c-195.54.12-363.94 137.9-402.76 329.52-38.82 191.62 62.67 384.08 242.74 460.28a411.17 411.17 0 10160-789.8z"
+    fill="#f55449" />
+  <path fill="#3c4d5e"
+    d="M948.696 599.894l-348.81 348.81q-22.11 22.11-44.22 0t0-44.22l348.81-348.8q22.11-22.12 44.22 0t0 44.21zm0 0"
+    />
+  <path fill="#3c4d5e"
+    d="M905.346 949.624l-348.81-348.86q-22.1-22.11 0-44.22t44.22 0l348.86 348.81q22 22.11 0 44.27-22 22.16-44.22 0zm0 0"
+    />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/hide-active.svg b/xfwm4-hidpi/hide-active.svg
deleted file mode 120000
index 540921b..0000000
--- a/xfwm4-hidpi/hide-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-min.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/hide-active.svg b/xfwm4-hidpi/hide-active.svg
new file mode 100755
index 0000000..1bcc9bd
--- /dev/null
+++ b/xfwm4-hidpi/hide-active.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M306.625 752.625c0 246.32 199.68 446 446 446s446-199.68 446-446-199.68-446-446-446-446 199.68-446 446z"
+    fill="#d8a932" />
+  <path
+    d="M752.515 341.515a411.16 411.16 0 00-402.72 329.53c-38.82 191.58 62.67 384.07 242.72 460.28a411.17 411.17 0 10160-789.81z"
+    fill="#fac536" />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/hide-inactive.svg b/xfwm4-hidpi/hide-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4-hidpi/hide-inactive.svg
+++ b/xfwm4-hidpi/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-hidpi/hide-prelight.svg b/xfwm4-hidpi/hide-prelight.svg
deleted file mode 120000
index 924dc49..0000000
--- a/xfwm4-hidpi/hide-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-min_a.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/hide-prelight.svg b/xfwm4-hidpi/hide-prelight.svg
new file mode 100755
index 0000000..01e0e3e
--- /dev/null
+++ b/xfwm4-hidpi/hide-prelight.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M306.625 752.625c0 246.32 199.68 446 446 446s446-199.68 446-446-199.68-446-446-446-446 199.68-446 446z"
+    fill="#d8a932" />
+  <path
+    d="M752.515 341.515a411.16 411.16 0 00-402.72 329.53c-38.82 191.58 62.67 384.07 242.72 460.28a411.17 411.17 0 10160-789.81z"
+    fill="#fac536" />
+  <path
+    d="M553.825 720.625h397.6q25.2 0 25.2 32t-25.2 32h-397.6q-25.2 0-25.2-32t25.2-32z"
+    fill="#3c4d5e" />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-active.svg b/xfwm4-hidpi/maximize-active.svg
deleted file mode 120000
index 3e58157..0000000
--- a/xfwm4-hidpi/maximize-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-max.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-active.svg b/xfwm4-hidpi/maximize-active.svg
new file mode 100755
index 0000000..5c848ae
--- /dev/null
+++ b/xfwm4-hidpi/maximize-active.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M306.625 752.625c0 246.32 199.68 446 446 446s446-199.68 446-446-199.68-446-446-446-446 199.68-446 446z"
+    fill="#34c63b" />
+  <path
+    d="M752.515 341.515a411.16 411.16 0 00-402.72 329.53c-38.82 191.58 62.67 384.07 242.72 460.28a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-inactive.svg b/xfwm4-hidpi/maximize-inactive.svg
index 02170ed..3f510dd 120000
--- a/xfwm4-hidpi/maximize-inactive.svg
+++ b/xfwm4-hidpi/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-hidpi/maximize-prelight.svg b/xfwm4-hidpi/maximize-prelight.svg
deleted file mode 120000
index 9c00ce9..0000000
--- a/xfwm4-hidpi/maximize-prelight.svg
+++ /dev/null
@@ -1 +0,0 @@
-../metacity-1/mac-max_a.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-prelight.svg b/xfwm4-hidpi/maximize-prelight.svg
new file mode 100755
index 0000000..a8cc09f
--- /dev/null
+++ b/xfwm4-hidpi/maximize-prelight.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M306.625 752.625c0 246.32 199.68 446 446 446s446-199.68 446-446-199.68-446-446-446-446 199.68-446 446z"
+    fill="#34c63b" />
+  <path
+    d="M752.515 341.515a411.16 411.16 0 00-402.72 329.53c-38.82 191.58 62.67 384.07 242.72 460.28a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+  <path fill="#3c4d5e"
+    d="M658.015 554.365a25.33 25.33 0 0118.49-7.67l258.33-2.07a25.27 25.27 0 0125.79 25.79l-2 258.29a25.85 25.85 0 01-7.68 18.49 25.1 25.1 0 01-18.49 7.67 24.82 24.82 0 01-18.38-7.4l-256.29-256.27a24.37 24.37 0 01-7.4-18.38 25.28 25.28 0 017.63-18.46zm189.22 396.55a25.31 25.31 0 01-18.47 7.64l-258.35 2.07a25.28 25.28 0 01-25.79-25.79l2-258.29a25.83 25.83 0 017.67-18.47 25.09 25.09 0 0118.49-7.67 24.78 24.78 0 0118.38 7.4l256.3 256.25a24.37 24.37 0 017.4 18.38 25.33 25.33 0 01-7.63 18.48z"
+    />
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-toggled-active.svg b/xfwm4-hidpi/maximize-toggled-active.svg
new file mode 100644
index 0000000..ce7a6af
--- /dev/null
+++ b/xfwm4-hidpi/maximize-toggled-active.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1505.25 1505.25"
+  height="54" width="54" version="1.1">
+  <path
+    d="M306.625 752.625c0 246.32 199.68 446 446 446s446-199.68 446-446-199.68-446-446-446-446 199.68-446 446z"
+    fill="#34c63b" />
+  <path
+    d="M752.515 341.515a411.16 411.16 0 00-402.72 329.53c-38.82 191.58 62.67 384.07 242.72 460.28a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+  <g fill="#3c4d5e" transform="translate(306.625 306.625)">
+    <path
+      d="M220.265 310.559v361.176H581.44V310.56zm45.147 45.147h270.882v270.882H265.412z"
+      id="path6" />
+    <path d="M310.559 220.265v45.147h316.029v316.03h45.147V220.264z"
+      opacity=".5" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-toggled-active.xpm b/xfwm4-hidpi/maximize-toggled-active.xpm
deleted file mode 100644
index a70308f..0000000
--- a/xfwm4-hidpi/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-hidpi/maximize-toggled-inactive.svg b/xfwm4-hidpi/maximize-toggled-inactive.svg
new file mode 120000
index 0000000..3f510dd
--- /dev/null
+++ b/xfwm4-hidpi/maximize-toggled-inactive.svg
@@ -0,0 +1 @@
+button-bg.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-toggled-inactive.xpm b/xfwm4-hidpi/maximize-toggled-inactive.xpm
deleted file mode 100644
index 568a5ff..0000000
--- a/xfwm4-hidpi/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-hidpi/maximize-toggled-prelight.svg b/xfwm4-hidpi/maximize-toggled-prelight.svg
new file mode 120000
index 0000000..bcc46c9
--- /dev/null
+++ b/xfwm4-hidpi/maximize-toggled-prelight.svg
@@ -0,0 +1 @@
+maximize-toggled-active.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-toggled-prelight.xpm b/xfwm4-hidpi/maximize-toggled-prelight.xpm
deleted file mode 100644
index 6ffb5e8..0000000
--- a/xfwm4-hidpi/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-hidpi/maximize-toggled-pressed.svg b/xfwm4-hidpi/maximize-toggled-pressed.svg
new file mode 120000
index 0000000..bcc46c9
--- /dev/null
+++ b/xfwm4-hidpi/maximize-toggled-pressed.svg
@@ -0,0 +1 @@
+maximize-toggled-active.svg
\ No newline at end of file
diff --git a/xfwm4-hidpi/maximize-toggled-pressed.xpm b/xfwm4-hidpi/maximize-toggled-pressed.xpm
deleted file mode 100644
index c342b6b..0000000
--- a/xfwm4-hidpi/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",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-".@.......................................@.",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.................#######.................@",
-"@.................#######.................@",
-"@.................##...##.................@",
-"@.................##...##.................@",
-"@.................##...##.................@",
-"@.................#######.................@",
-"@.................#######.................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-"@.........................................@",
-".@.......................................@.",
-"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"...........................................",
-"..........................................."};