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 d3c84ec..0000000
Binary files a/metacity-1/close_focused_normal.png and /dev/null differ
diff --git a/metacity-1/close_focused_prelight.png b/metacity-1/close_focused_prelight.png
deleted file mode 100644
index 980a80e..0000000
Binary files a/metacity-1/close_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/close_focused_pressed.png b/metacity-1/close_focused_pressed.png
deleted file mode 100644
index e2d55a2..0000000
Binary files a/metacity-1/close_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/close_unfocused.png b/metacity-1/close_unfocused.png
deleted file mode 100644
index 7b0814f..0000000
Binary files a/metacity-1/close_unfocused.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_normal.png b/metacity-1/maximize_focused_normal.png
deleted file mode 100644
index 9e09e71..0000000
Binary files a/metacity-1/maximize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_prelight.png b/metacity-1/maximize_focused_prelight.png
deleted file mode 100644
index 3a51c72..0000000
Binary files a/metacity-1/maximize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_pressed.png b/metacity-1/maximize_focused_pressed.png
deleted file mode 100644
index 2b4dad5..0000000
Binary files a/metacity-1/maximize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/maximize_unfocused.png b/metacity-1/maximize_unfocused.png
deleted file mode 100644
index fdb0d03..0000000
Binary files a/metacity-1/maximize_unfocused.png and /dev/null differ
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 520575e..0000000
Binary files a/metacity-1/minimize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/minimize_focused_prelight.png b/metacity-1/minimize_focused_prelight.png
deleted file mode 100644
index 2e86e18..0000000
Binary files a/metacity-1/minimize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/minimize_focused_pressed.png b/metacity-1/minimize_focused_pressed.png
deleted file mode 100644
index b7a3aca..0000000
Binary files a/metacity-1/minimize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/minimize_unfocused.png b/metacity-1/minimize_unfocused.png
deleted file mode 100644
index dbd30d9..0000000
Binary files a/metacity-1/minimize_unfocused.png and /dev/null differ
diff --git a/metacity-1/shade_focused_normal.png b/metacity-1/shade_focused_normal.png
deleted file mode 100644
index 2284463..0000000
Binary files a/metacity-1/shade_focused_normal.png and /dev/null differ
diff --git a/metacity-1/shade_focused_prelight.png b/metacity-1/shade_focused_prelight.png
deleted file mode 100644
index a75800a..0000000
Binary files a/metacity-1/shade_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/shade_focused_pressed.png b/metacity-1/shade_focused_pressed.png
deleted file mode 100644
index d0c1cdd..0000000
Binary files a/metacity-1/shade_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/shade_unfocused.png b/metacity-1/shade_unfocused.png
deleted file mode 100644
index b5c6065..0000000
Binary files a/metacity-1/shade_unfocused.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_normal.png b/metacity-1/unmaximize_focused_normal.png
deleted file mode 100644
index 8710cfa..0000000
Binary files a/metacity-1/unmaximize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_prelight.png b/metacity-1/unmaximize_focused_prelight.png
deleted file mode 100644
index f27f67d..0000000
Binary files a/metacity-1/unmaximize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_pressed.png b/metacity-1/unmaximize_focused_pressed.png
deleted file mode 100644
index a132c2f..0000000
Binary files a/metacity-1/unmaximize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/unmaximize_unfocused.png b/metacity-1/unmaximize_unfocused.png
deleted file mode 100644
index 26d13b9..0000000
Binary files a/metacity-1/unmaximize_unfocused.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_normal.png b/metacity-1/unshade_focused_normal.png
deleted file mode 100644
index ef9e236..0000000
Binary files a/metacity-1/unshade_focused_normal.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_prelight.png b/metacity-1/unshade_focused_prelight.png
deleted file mode 100644
index 25baf49..0000000
Binary files a/metacity-1/unshade_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_pressed.png b/metacity-1/unshade_focused_pressed.png
deleted file mode 100644
index d30485f..0000000
Binary files a/metacity-1/unshade_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/unshade_unfocused.png b/metacity-1/unshade_unfocused.png
deleted file mode 100644
index 999c6c5..0000000
Binary files a/metacity-1/unshade_unfocused.png and /dev/null differ