[gnome-themes-standard] window decorations: add another constant (D_icons_grow) to make icons in buttons grow easily w/o tou



commit e8113bbe0748e1517d96c5803e5420192c308619
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Nov 25 11:57:53 2010 +0100

    window decorations: add another constant (D_icons_grow) to make icons in buttons grow easily w/o touching the drawing mess.

 themes/Adwaita/metacity-1/metacity-theme-2.xml |  241 ++++++++++++------------
 themes/Adwaita/metacity-1/metacity-theme-3.xml |  246 ++++++++++++------------
 2 files changed, 247 insertions(+), 240 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-2.xml b/themes/Adwaita/metacity-1/metacity-theme-2.xml
index 9158c84..861b976 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-2.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-2.xml
@@ -25,6 +25,7 @@
 <constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
 <constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller -->
+<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
@@ -206,55 +207,55 @@
 
 <draw_ops name="close_glyph_focused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_focused" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="close_shadow_focused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_shadow" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -269,28 +270,28 @@
 
 <draw_ops name="close_glyph_unfocused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -300,28 +301,28 @@
 
 <draw_ops name="close_glyph_unfocused_prelight">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -331,28 +332,28 @@
 
 <draw_ops name="close_glyph_unfocused_pressed">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -362,23 +363,23 @@
 
 <draw_ops name="maximize_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="maximize_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -393,12 +394,12 @@
 
 <draw_ops name="maximize_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -408,12 +409,12 @@
 
 <draw_ops name="maximize_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -423,12 +424,12 @@
 
 <draw_ops name="maximize_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -438,15 +439,15 @@
 
 <draw_ops name="minimize_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="minimize_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -461,8 +462,8 @@
 
 <draw_ops name="minimize_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -472,8 +473,8 @@
 
 <draw_ops name="minimize_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -483,8 +484,8 @@
 
 <draw_ops name="minimize_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -494,31 +495,31 @@
 
 <draw_ops name="menu_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="menu_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -533,16 +534,16 @@
 
 <draw_ops name="menu_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -552,16 +553,16 @@
 
 <draw_ops name="menu_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -571,16 +572,16 @@
 
 <draw_ops name="menu_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 6b6a030..8cae27b 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -25,6 +25,7 @@
 <constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
 <constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller -->
+<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
@@ -239,60 +240,62 @@
 
 <draw_ops name="close_glyph_focused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_focused" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="close_shadow_focused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_shadow" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_shadow" />
 </draw_ops>
 
 <draw_ops name="close_focused">
 	<include name="close_shadow_focused" y="1" />
+	<!-- I'm not happy with the current aa I'll draw it twice to make it darker -->
+	<include name="close_shadow_focused" y="1" />
 	<include name="close_glyph_focused" />
 </draw_ops>
 
@@ -302,116 +305,119 @@
 
 <draw_ops name="close_glyph_unfocused">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused" />
 </draw_ops>
 
 <draw_ops name="close_unfocused">
 	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
+	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_prelight">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
 	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_pressed">
 	<line
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink" 
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<line
-		x1="(width-width%3)/3+1+D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="width-(width-width%3)/3-1-D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="(width-width%3)/3+D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="width-(width-width%3)/3-2-D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink" y1="(height-height%3)/3+D_icons_shrink"
-		x2="(width-width%3)/3+D_icons_shrink" y2="height-(height-height%3)/3-2-D_icons_shrink"
+		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink" y1="(height-height%3)/3+1+D_icons_shrink"
-		x2="(width-width%3)/3+1+D_icons_shrink" y2="height-(height-height%3)/3-1-D_icons_shrink"
+		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
 	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
 </draw_ops>
 
 <draw_ops name="maximize_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="maximize_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -426,12 +432,12 @@
 
 <draw_ops name="maximize_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -441,12 +447,12 @@
 
 <draw_ops name="maximize_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -456,12 +462,12 @@
 
 <draw_ops name="maximize_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -471,15 +477,15 @@
 
 <draw_ops name="minimize_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="minimize_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -494,8 +500,8 @@
 
 <draw_ops name="minimize_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -505,8 +511,8 @@
 
 <draw_ops name="minimize_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -516,8 +522,8 @@
 
 <draw_ops name="minimize_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="height-(height-height%3)/3-2-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -527,31 +533,31 @@
 
 <draw_ops name="menu_glyph_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_focused" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="menu_shadow_focused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_shadow" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -566,16 +572,16 @@
 
 <draw_ops name="menu_glyph_unfocused">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -585,16 +591,16 @@
 
 <draw_ops name="menu_glyph_unfocused_prelight">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_prelight" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -604,16 +610,16 @@
 
 <draw_ops name="menu_glyph_unfocused_pressed">
 	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink" y="(height-height%3)/3+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink" height="height-2*(height-height%3)/3-1-2*D_icons_shrink" 
+		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink" y="(height-height%3)/3+1+D_icons_shrink" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink" height="height-2*(height-height%3)/3-3-2*D_icons_shrink" 
+		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
+		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
 		color="C_icons_unfocused_pressed" />
 	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink" y="height/2-1-D_icons_shrink" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink" height="2" filled="true"
+		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
+		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]