From c8b6af4c30ca5ccfb682edaa8d5df3546422a48e Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Wed, 11 Dec 2013 15:31:51 +0530
Subject: [PATCH] Draw window buttons directly in metacity

---
 gtk-3.0/gtk.css                            |  10 +-
 metacity-1/close_focused_normal.png        | Bin 345 -> 0 bytes
 metacity-1/close_focused_prelight.png      | Bin 380 -> 0 bytes
 metacity-1/close_focused_pressed.png       | Bin 390 -> 0 bytes
 metacity-1/close_unfocused.png             | Bin 330 -> 0 bytes
 metacity-1/maximize_focused_normal.png     | Bin 182 -> 0 bytes
 metacity-1/maximize_focused_prelight.png   | Bin 205 -> 0 bytes
 metacity-1/maximize_focused_pressed.png    | Bin 206 -> 0 bytes
 metacity-1/maximize_unfocused.png          | Bin 182 -> 0 bytes
 metacity-1/metacity-theme-2.xml            | 512 +++++++++++++++++++--
 metacity-1/metacity-theme-3.xml            | 512 +++++++++++++++++++--
 metacity-1/minimize_focused_normal.png     | Bin 172 -> 0 bytes
 metacity-1/minimize_focused_prelight.png   | Bin 190 -> 0 bytes
 metacity-1/minimize_focused_pressed.png    | Bin 190 -> 0 bytes
 metacity-1/minimize_unfocused.png          | Bin 172 -> 0 bytes
 metacity-1/shade_focused_normal.png        | Bin 191 -> 0 bytes
 metacity-1/shade_focused_prelight.png      | Bin 192 -> 0 bytes
 metacity-1/shade_focused_pressed.png       | Bin 192 -> 0 bytes
 metacity-1/shade_unfocused.png             | Bin 190 -> 0 bytes
 metacity-1/unmaximize_focused_normal.png   | Bin 181 -> 0 bytes
 metacity-1/unmaximize_focused_prelight.png | Bin 204 -> 0 bytes
 metacity-1/unmaximize_focused_pressed.png  | Bin 205 -> 0 bytes
 metacity-1/unmaximize_unfocused.png        | Bin 181 -> 0 bytes
 metacity-1/unshade_focused_normal.png      | Bin 195 -> 0 bytes
 metacity-1/unshade_focused_prelight.png    | Bin 195 -> 0 bytes
 metacity-1/unshade_focused_pressed.png     | Bin 195 -> 0 bytes
 metacity-1/unshade_unfocused.png           | Bin 194 -> 0 bytes
 27 files changed, 958 insertions(+), 76 deletions(-)
 delete mode 100644 metacity-1/close_focused_normal.png
 delete mode 100644 metacity-1/close_focused_prelight.png
 delete mode 100644 metacity-1/close_focused_pressed.png
 delete mode 100644 metacity-1/close_unfocused.png
 delete mode 100644 metacity-1/maximize_focused_normal.png
 delete mode 100644 metacity-1/maximize_focused_prelight.png
 delete mode 100644 metacity-1/maximize_focused_pressed.png
 delete mode 100644 metacity-1/maximize_unfocused.png
 delete mode 100644 metacity-1/minimize_focused_normal.png
 delete mode 100644 metacity-1/minimize_focused_prelight.png
 delete mode 100644 metacity-1/minimize_focused_pressed.png
 delete mode 100644 metacity-1/minimize_unfocused.png
 delete mode 100644 metacity-1/shade_focused_normal.png
 delete mode 100644 metacity-1/shade_focused_prelight.png
 delete mode 100644 metacity-1/shade_focused_pressed.png
 delete mode 100644 metacity-1/shade_unfocused.png
 delete mode 100644 metacity-1/unmaximize_focused_normal.png
 delete mode 100644 metacity-1/unmaximize_focused_prelight.png
 delete mode 100644 metacity-1/unmaximize_focused_pressed.png
 delete mode 100644 metacity-1/unmaximize_unfocused.png
 delete mode 100644 metacity-1/unshade_focused_normal.png
 delete mode 100644 metacity-1/unshade_focused_prelight.png
 delete mode 100644 metacity-1/unshade_focused_pressed.png
 delete mode 100644 metacity-1/unshade_unfocused.png

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index d003875..e29e543 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -53,10 +53,16 @@
 
 /* window manager colors */
 @define-color wm_bg #2d2d2d;
-@define-color wm_title_focused #dcdcdc;
-@define-color wm_title_unfocused #888888;
 @define-color wm_border_focused #484848;
 @define-color wm_border_unfocused #393939;
+@define-color wm_title_focused #dcdcdc;
+@define-color wm_title_unfocused #888888;
+@define-color wm_icons_focused #dcdcdc;
+@define-color wm_icons_focused_prelight #d64937;
+@define-color wm_icons_focused_pressed #b63e2e;
+@define-color wm_icons_unfocused #888888;
+@define-color wm_icons_unfocused_prelight #d64937;
+@define-color wm_icons_unfocused_pressed #b63e2e;
 
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
diff --git a/metacity-1/close_focused_normal.png b/metacity-1/close_focused_normal.png
deleted file mode 100644
index d3c84ec810f4a09d5d0f0967f3b5a1c2c038c46f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aCF)^rAa|fI`naT^vI^j=!C<(d&qVi0k>3AiX68
zyIDCkFTIJ+*_gAD<5B*O_|5;?v?C&Z$eS_ib2cR`Y)Y8<<W^5<%Z{iS+{}k_&+Ykr
z&qlp7S?l46Sq#Dt#2M1mjICP)#Ny*P5);$djivv%yfl|9<epRgKD;z`J>#D5-yPWQ
z^srexFPjwRaP9lw*e%8n_P*YA_eDq7qKYY7SnV1nSHw+LiJYGL^UHJJGUwClR;>#5
z<Uhbu(fQ5BZHvsRqzz1-)d^}Zd2cYxt~kHv`|tTP78!e9&zu$atnwev1(UOza&K!t
lzjO3O$FfjE#(#_tglD{tVL1Fzoe$_^22WQ%mvv4FO#m%GjtKw&

diff --git a/metacity-1/close_focused_prelight.png b/metacity-1/close_focused_prelight.png
deleted file mode 100644
index 980a80e9d8b2aa03a68eae8bbe577d6cfcb0f01c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQo*4x;Tb-
zbiSRk(Tmwppl$!nyFojgtPch)x*p|mO5~vc@15p5m!DWVDYS{$HN+%(DMxUXNpVEn
zdmB-4EqINl%J;)&htJgfF+Sa~YLoxYy=CtiZ6ElHtZA7(JDYW8wf@zge;->PczyT7
zmfTXVsJJy*o=hA%BD%N3+-E0QunCCEH}Is)d!x{{Y?4|}gHKFM=|i3ymHJad^WQxv
z`uIg{NAv@3i+A^yyP5x!jTBM{O_JSx_Q@-sSs!?080BMsu-vG8Uv#?l<pI;gTc-EB
z77MsD<}|)}t}gjCtm%+T;xeJn2RFs>Px~6B`i#r?!lhN_?o(F%uh*(Nz{s$V@!Iu(
V7ka<VOo4&G;OXk;vd$@?2>_V-nLPji

diff --git a/metacity-1/close_focused_pressed.png b/metacity-1/close_focused_pressed.png
deleted file mode 100644
index e2d55a2abe5c1bbc908d11ad82d889315fb0f4ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Ru@yK~zYI?Uk`g13?r;&zsq#2n(?ie?bXWF$jXNm7;b0i4d@f
zA7MJdpRkUCO#*^M#L6Q33u2`qSY#cqg<4OsrrTRS-kbC89hfmmtWs{Jr&oXq@GnYY
z4f)aTlfh&e{BZmB{uSW)U~j$d!$6R2-aNER0WiChl-2y_&g`($1E_hs6qXuHN;?qY
z+|0F+r8v9zEvKNxG9<&;eDn^st{-0rc8c*~&@^ZY-u0#4Uu2~KWo5C)Zg$++Fx(ZQ
z0rvJ&)f#9~gybaVBI>~KXNZQxJUIHn(U+KmrF9<$vH5sJ(!Rvl73#J|)4VmB=B`jz
kVl2p_3s(O@1*iag11kMs%Q=K&B>(^b07*qoM6N<$f@<)kQ~&?~

diff --git a/metacity-1/close_unfocused.png b/metacity-1/close_unfocused.png
deleted file mode 100644
index 7b0814f24779fa0612d6b22bde870338f6384913..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2a5*duE!td1BI@8x;Tb-9Dh5-(96Y9z$M<i?GV3-
z@SX$vkFuR+Q_^vkPxjw@T%wJYnfd*Oh2jEdN)iwLnC>ZEpBTaOhjnfUe{9Ls3u>L-
zhjto>HM%a44=?7=T5Ghqc}c9x9`*9{v}(`W9UJr*jjJbZVGUcmwe*tyBsOE~l6-|s
z_B9QOvz9$y!v0{+-hDhukIvqeZ_t0B_WJVO>-N+BW}YxBf0MQL`vL6&-Wru!?m3Nx
zdEEb9PyCjtEBfBMJHJ8LAZ7h|CC`2b=3_ypHclyGaa-{8{j1FxmZIGU>;-<X_0;-u
UyhyU~26~af)78&qol`;+0Av?`8vp<R

diff --git a/metacity-1/maximize_focused_normal.png b/metacity-1/maximize_focused_normal.png
deleted file mode 100644
index 9e09e7194b7b41e9ffd89b366c733280d73bc956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2a5)Gl$m5BP{`TS#WBR=c=DhB|LvJ|8HJg953XQc
zEEd2Q!J)aM`n%q}o<(ccoUzzZ+i-emOO4sAt`+j^N7^j!)*i5klJAK!$YNw>(EA{G
VbkmtxH-N@5c)I$ztaD0e0sw#fIiCOk

diff --git a/metacity-1/maximize_focused_prelight.png b/metacity-1/maximize_focused_prelight.png
deleted file mode 100644
index 3a51c725f2cf1d38abd1a87162d6e2141f848f09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQr04T^vI^
zI+OqW|8LK%%P8#YE59}23ezeEF(<Bd)sYX*YRtOrXYgpUe1-f0hF#vAKY7^N>QwmW
sStyvDxyX37_JBo{d{2}?79%smtR({NOp^EVfTl8dy85}Sb4q9e0BBx42><{9

diff --git a/metacity-1/maximize_focused_pressed.png b/metacity-1/maximize_focused_pressed.png
deleted file mode 100644
index 2b4dad50f45e4de7b8752b8ae1ffc2365ef606f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQr05T^vI^
zI+OqW|8LK%%P8#YE59}23ezeEF(<Bd)sb@!s;}SqwuRH~XXAH9o&~$7OgNvA@WTDm
ugHGn8!!oiL?y&bP{(5i)>tZnj28MgD1w!g0w|)c~%i!ti=d#Wzp$PzpOGCB*

diff --git a/metacity-1/maximize_unfocused.png b/metacity-1/maximize_unfocused.png
deleted file mode 100644
index fdb0d03f008e4dce7374431512aae0ea099f8172..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aATtbvuy~ppdhti(`n#@#H`M|JyU`G72;I9$dk?
zSS)}qf<rT6Z<Xo29w8~IQx-dF8%{56sWF??wL+f#NSo!|+5;9*@;y-oS&YmKteXV&
UA1s=731}RHr>mdKI;Vst03V$;&Hw-a

diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
index cd65830..203c5b9 100644
--- a/metacity-1/metacity-theme-2.xml
+++ b/metacity-1/metacity-theme-2.xml
@@ -4,7 +4,7 @@
 	<name>Numix</name>
 	<author>Satyajit Sahoo</author>
 	<copyright>GPL-3.0+</copyright>
-	<date>4 August 2013</date>
+	<date>11 December 2013</date>
 	<description>Numix Metacity Theme</description>
 </info>
 
@@ -14,6 +14,12 @@
 <constant name="C_border_unfocused" value="#393939" />
 <constant name="C_title_focused" value="#dcdcdc" />
 <constant name="C_title_unfocused" value="#888888" />
+<constant name="C_icons_focused" value="#dcdcdc" />
+<constant name="C_icons_focused_prelight" value="#d64937" />
+<constant name="C_icons_focused_pressed" value="#b63e2e" />
+<constant name="C_icons_unfocused" value="#888888" />
+<constant name="C_icons_unfocused_prelight" value="#d64937" />
+<constant name="C_icons_unfocused_pressed" value="#b63e2e" />
 
 <!-- ::: GEOMETRY ::: -->
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -168,22 +174,22 @@
 
 <draw_ops name="border_right_unfocused">
 	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_unfocused" />
 </draw_ops>
 
 <draw_ops name="border_left_focused">
 	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
+		x1="0" y1="0"
+		x2="0" y2="height"
 		color="C_border_focused" />
 </draw_ops>
 
 <draw_ops name="border_left_unfocused">
 	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
+		x1="0" y1="0"
+		x2="0" y2="height"
 		color="C_border_unfocused" />
 </draw_ops>
 
@@ -191,19 +197,111 @@
 <!-- note: negative values in x or y causes gnome-shell to crash -->
 <!-- close icon -->
 <draw_ops name="close_focused">
-	<image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
@@ -216,19 +314,47 @@
 
 <!-- maximize icon -->
 <draw_ops name="maximize_focused">
-	<image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
@@ -241,19 +367,47 @@
 
 <!-- unmaximize icon -->
 <draw_ops name="unmaximize_focused">
-	<image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_prelight">
-	<image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_pressed">
-	<image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused">
-	<image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused_prelight">
@@ -266,19 +420,31 @@
 
 <!-- minimize icon -->
 <draw_ops name="minimize_focused">
-	<image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
@@ -290,33 +456,197 @@
 </draw_ops>
 
 <!-- menu icon -->
-<draw_ops name="menu_focused"></draw_ops>
+<draw_ops name="menu_focused">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
 
-<draw_ops name="menu_focused_prelight"></draw_ops>
+<draw_ops name="menu_focused_prelight">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused_prelight" />
+</draw_ops>
 
-<draw_ops name="menu_focused_pressed"></draw_ops>
+<draw_ops name="menu_focused_pressed">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused_pressed" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused"></draw_ops>
+<draw_ops name="menu_unfocused">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused_prelight"></draw_ops>
+<draw_ops name="menu_unfocused_prelight">
+	<include name="menu_focused_prelight" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused_pressed"></draw_ops>
+<draw_ops name="menu_unfocused_pressed">
+	<include name="menu_focused_pressed" />
+</draw_ops>
 
 <!-- shade icon -->
 <draw_ops name="shade_focused">
-	<image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="shade_focused_prelight">
-	<image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="shade_focused_pressed">
-	<image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="shade_unfocused">
-	<image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="shade_unfocused_prelight">
@@ -329,19 +659,127 @@
 
 <!-- unshade icon -->
 <draw_ops name="unshade_focused">
-	<image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="unshade_focused_prelight">
-	<image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="unshade_focused_pressed">
-	<image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line 
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" /> 
+	<rectangle 
+		x="(width-width%3)/3+3" y="height/2-2" 
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="unshade_unfocused">
-	<image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="unshade_unfocused_prelight">
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index f9e6e6d..ca6887c 100644
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -4,7 +4,7 @@
 	<name>Numix</name>
 	<author>Satyajit Sahoo</author>
 	<copyright>GPL-3.0+</copyright>
-	<date>8 March 2013</date>
+	<date>11 December 2013</date>
 	<description>Numix Mutter Theme</description>
 </info>
 
@@ -14,6 +14,12 @@
 <constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,#393939)" />
 <constant name="C_title_focused" value="gtk:custom(wm_title_focused,#dcdcdc)" />
 <constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,#888888)" />
+<constant name="C_icons_focused" value="gtk:custom(wm_icons_focused,#dcdcdc)" />
+<constant name="C_icons_focused_prelight" value="gtk:custom(wm_icons_focused_prelight,#d64937)" />
+<constant name="C_icons_focused_pressed" value="gtk:custom(wm_icons_focused_pressed,#b63e2e)" />
+<constant name="C_icons_unfocused" value="gtk:custom(wm_icons_unfocused,#888888)" />
+<constant name="C_icons_unfocused_prelight" value="gtk:custom(wm_icons_focused_prelight,#d64937)" />
+<constant name="C_icons_unfocused_pressed" value="gtk:custom(wm_icons_focused_pressed,#b63e2e)" />
 
 <!-- ::: GEOMETRY ::: -->
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -180,22 +186,22 @@
 
 <draw_ops name="border_right_unfocused">
 	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_unfocused" />
 </draw_ops>
 
 <draw_ops name="border_left_focused">
 	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
+		x1="0" y1="0"
+		x2="0" y2="height"
 		color="C_border_focused" />
 </draw_ops>
 
 <draw_ops name="border_left_unfocused">
 	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
+		x1="0" y1="0"
+		x2="0" y2="height"
 		color="C_border_unfocused" />
 </draw_ops>
 
@@ -203,19 +209,111 @@
 <!-- note: negative values in x or y causes gnome-shell to crash -->
 <!-- close icon -->
 <draw_ops name="close_focused">
-	<image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
@@ -228,19 +326,47 @@
 
 <!-- maximize icon -->
 <draw_ops name="maximize_focused">
-	<image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
@@ -253,19 +379,47 @@
 
 <!-- unmaximize icon -->
 <draw_ops name="unmaximize_focused">
-	<image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_prelight">
-	<image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_pressed">
-	<image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused">
-	<image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused_prelight">
@@ -278,19 +432,31 @@
 
 <!-- minimize icon -->
 <draw_ops name="minimize_focused">
-	<image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<rectangle
+		x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+		width="width-2*(width-width%3)/3-2" height="2" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
@@ -302,33 +468,197 @@
 </draw_ops>
 
 <!-- menu icon -->
-<draw_ops name="menu_focused"></draw_ops>
+<draw_ops name="menu_focused">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
 
-<draw_ops name="menu_focused_prelight"></draw_ops>
+<draw_ops name="menu_focused_prelight">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused_prelight" />
+</draw_ops>
 
-<draw_ops name="menu_focused_pressed"></draw_ops>
+<draw_ops name="menu_focused_pressed">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused_pressed" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused"></draw_ops>
+<draw_ops name="menu_unfocused">
+	<rectangle
+		x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+		width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+		width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+5" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused_prelight"></draw_ops>
+<draw_ops name="menu_unfocused_prelight">
+	<include name="menu_focused_prelight" />
+</draw_ops>
 
-<draw_ops name="menu_unfocused_pressed"></draw_ops>
+<draw_ops name="menu_unfocused_pressed">
+	<include name="menu_focused_pressed" />
+</draw_ops>
 
 <!-- shade icon -->
 <draw_ops name="shade_focused">
-	<image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="shade_focused_prelight">
-	<image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="shade_focused_pressed">
-	<image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="shade_unfocused">
-	<image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-2"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="shade_unfocused_prelight">
@@ -341,19 +671,127 @@
 
 <!-- unshade icon -->
 <draw_ops name="unshade_focused">
-	<image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="unshade_focused_prelight">
-	<image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused_prelight" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_focused_prelight" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="unshade_focused_pressed">
-	<image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+	<line 
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+		x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+		x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line 
+		x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+		x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+		color="C_icons_focused_pressed" />
+	<line
+		x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+		x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+		color="C_icons_focused_pressed" /> 
+	<rectangle 
+		x="(width-width%3)/3+3" y="height/2-2" 
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_focused_pressed" />
 </draw_ops>
 
 <draw_ops name="unshade_unfocused">
-	<image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+		x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+		x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+		x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line
+		x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+		x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+		color="C_icons_unfocused" />
+	<rectangle
+		x="(width-width%3)/3+3" y="height/2-4"
+		width="width-2*(width-width%3)/3-8" height="6" filled="true"
+		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="unshade_unfocused_prelight">
diff --git a/metacity-1/minimize_focused_normal.png b/metacity-1/minimize_focused_normal.png
deleted file mode 100644
index 520575ef0ef9046ce5638503be4fba9253f7ad4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aAU6x<_j+0EH|)T^vI^jwk>5|KFZjmr<Cx_uvZF
z#bP~C4(!|!9GW|-zw6!G<PsS<v(TaTfJM}e-YA1Cpo$hohI#c|+R+Pj_W%uH@O1Ta
JS?83{1ORq?G#UT^

diff --git a/metacity-1/minimize_focused_prelight.png b/metacity-1/minimize_focused_prelight.png
deleted file mode 100644
index 2e86e181e4f858e26fb73f27352fa9284e552fe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQqa=T^vI^
zI+OqW|8LK%%P8#YE59}2N>d>Bi)2P_Mb_(kbv{f}opsyK;L+seJNYHtxpxP0yXi`7
cZ7^V9DBI7a-IKIW2xtt0r>mdKI;Vst0NzwLSO5S3

diff --git a/metacity-1/minimize_focused_pressed.png b/metacity-1/minimize_focused_pressed.png
deleted file mode 100644
index b7a3aca68da48f5be8d882914021d2e4fe45058a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQqa=T^vI^
zI+OqW|8LK%%P8#YE59}2N>d>Bi)2P_Mb_(kb<RDQeEm+@A(r_zXKN2wMBV6(GRQi(
dg0+Q_p&*`1d+9;@mq23}JYD@<);T3K0RTsGI>G<|

diff --git a/metacity-1/minimize_unfocused.png b/metacity-1/minimize_unfocused.png
deleted file mode 100644
index dbd30d94cb2ab9a571f138699fa4810f2e5d2077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aASk+XE3lppd1fi(`n#@#H`M|JyU`G72;I9$dk?
zSga??ft@>oLo;G;mFc}rDkdgV3LR<>SVZ0EjWWmrs%T+k=-$tz{r|wfIG`a6p00i_
I>zopr0Qzh*J^%m!

diff --git a/metacity-1/shade_focused_normal.png b/metacity-1/shade_focused_normal.png
deleted file mode 100644
index 2284463a5056d4ac64e17b52b340ad118b6751a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aASohxMEqppcKJi(`n#@wbx=`4|j1n6B>s@t^&p
z#O_@t6OZNHS<;-)G>cPFgF&PrDQ%A6``WZ$vkvCI?(E#(<?oxMb+5JRY}zKdqCflg
eT=>lSaXvGnp^}$J8~bLUxeT7JelF{r5}E*Rmq29z

diff --git a/metacity-1/shade_focused_prelight.png b/metacity-1/shade_focused_prelight.png
deleted file mode 100644
index a75800af6b514c20362d7bb4f41133127263a6ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aAGmV>9=CppdVpi(`n#@#F*v*2M`T6Ij+&&icRq
zS?0g_BDOtCB>K)=zg0JBVwTv0B2&X@29vTaHcm4T%(mF%cp@k0am%ZTXIx%SIc_rR
gr`th|1-1+f8Ea(Y-mZT$6=*Pnr>mdKI;Vst0LBSH^#A|>

diff --git a/metacity-1/shade_focused_pressed.png b/metacity-1/shade_focused_pressed.png
deleted file mode 100644
index d0c1cddbff3af7e3c6d7fa170ae01ec301624d5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aBBkd(9kGppdVpi(`n#@#F*v*2M`T6Ij+&&YHjT
zS!P|Eh;7djiM}(}Z`ECD$r5`|WNJ9gU{bcl#%TtE*%q4|PvitWZh1BFjLYjO$4zGa
fbUUcAz?Oj_FHdGtM()EDpur5Du6{1-oD!M<W~)E;

diff --git a/metacity-1/shade_unfocused.png b/metacity-1/shade_unfocused.png
deleted file mode 100644
index b5c60652138db59d63ab78c0559eb4533e25dcc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aAU3>~Iz>ppdtxi(`n#@wbx=`4|j1n6A42^03Pc
zpRRW4M(^wr0iOV4MHbcurhqd&#*g-%_lY;&k!x%CG5q67PoJZ^1J>X4x#rw=f4X>;
do#MY@hStUM|5EcF%my0E;OXk;vd$@?2>>B`Jx>4t

diff --git a/metacity-1/unmaximize_focused_normal.png b/metacity-1/unmaximize_focused_normal.png
deleted file mode 100644
index 8710cfa16f06bd197881f802c6d9e9fe0090ddba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2a6`-;vWa^0fn4AT^vI^jwk>5|KFZjmr<Cx_uvZF
z#bP{++z}j_JF36y-J7#w&6+b7J8BzFFKwwYYf_qdMPcD?ehK&2&4Ju*x(N&ns`i3M
UAJ1Ot4K$6x)78&qol`;+0JR`F5dZ)H

diff --git a/metacity-1/unmaximize_focused_prelight.png b/metacity-1/unmaximize_focused_prelight.png
deleted file mode 100644
index f27f67d398e0fef30e32931a2c6bab66d7fbe0ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQmdlT^vI^
zI+OqW|8LK%%P8#YE59}2O4GtbMs7vc>w9%RJaajlt1j{JB>x`%1ctjyTWZ*tl@%r>
rHr!BfWH<TF_&B51AnV`?Rvv~4p9R`q#w=6-8p`15>gTe~DWM4fa`8Ua

diff --git a/metacity-1/unmaximize_focused_pressed.png b/metacity-1/unmaximize_focused_pressed.png
deleted file mode 100644
index a132c2f1d441ae24f96f4eb0f28f87728f892b37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQr04T^vI^
zI+OqW|8LK%%P8#YE59}2O4GtbMs7vc>w9(1J(zs`PT3)r`F{@lW?;Jz>vbaCz<^0f
slC6VRsKlXI-k|Rq`(m-4r~?cPSFHp>_=L9{2b#*@>FVdQ&MBb@0L?x=asU7T

diff --git a/metacity-1/unmaximize_unfocused.png b/metacity-1/unmaximize_unfocused.png
deleted file mode 100644
index 26d13b9457de713ef8ef5fbd3cecb643dbffb086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2a6`>T4m2SKp`hj7sn8f<H>*i|F>t>WfW%aJ-C8(
zu^0~{cLaxK#NH~?dvheDq)u7vsBJjCw57(ZNonR4g@wEMCEQ;(2XedVCNMDk{v@dH
THTe?@&@={5S3j3^P6<r_+H*DT

diff --git a/metacity-1/unshade_focused_normal.png b/metacity-1/unshade_focused_normal.png
deleted file mode 100644
index ef9e236d41ef233b81c2146b674ac4dc296e24a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aBe_Nsos*K%oFn7sn8f<H-pUtcw#wCa~n)-}m?b
zx3{<ddtN;3lI?!+4wIOZBUAF~RjZ7IwA*<kIyuX0KK<ZPKgCotO~7bQ2KR<Yr=Eu;
gp38u`dzjeR7?eDed@dWD138Yt)78&qol`;+02lf_nE(I)

diff --git a/metacity-1/unshade_focused_prelight.png b/metacity-1/unshade_focused_prelight.png
deleted file mode 100644
index 25baf49f8e2c2bfdad959a936d93fbe745f4d120..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aCK`Tg1xOK%oFn7sn8f<H-pUtcw#wCa|olob`YI
zv&?_<MQnYxl!=_xO;8k3G1zwP+vJ`jrxcmpk`Bqvx3N3ixrt%EY73A0EvB4l0?8J!
hlU`~74QOa&WbiyHo4}HKp&V#7gQu&X%Q~loCIH<tJ#PR2

diff --git a/metacity-1/unshade_focused_pressed.png b/metacity-1/unshade_focused_pressed.png
deleted file mode 100644
index d30485f93cc53328d924cf22ccada8cc5927efcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aBBb*Uvj5fI<PDE{-7{$CDEzSQjUVOki18IcxsT
zXPI?vBDOwT%0$lUCMb%i7;L-tZL->tQ;N)PNrz<T+t?lM+{7?nwS`Ch7E{hNfn<x=
hNiQ{k1~fD>GR)wXnIilqV?NMq22WQ%mvv4FO#rvfJiY(`

diff --git a/metacity-1/unshade_unfocused.png b/metacity-1/unshade_unfocused.png
deleted file mode 100644
index 999c6c57f3fea9d4a8c125374a0dac4f6ced8388..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRU2aBe}@yVHTKp}rm7sn8f<8LP!@-ZlIFdzKkCU?{S
zRm!7;4SW_~)r6e-1<tex_ycV`cG_ok+^U!h`Rb9SE*7_M7e0FzY0tf!W#$txKW;xE
gwLhn4b19xtD?h8i(8_c86VPY|Pgg&ebxsLQ05Ih}H~;_u