[gnome-themes-standard] window decorations: icons parametric for format version 2 as well.

[Lapo Calamandrei <lapo src gnome org>]

commit 932054f5c6ea35ce94bc712c772b9f2492e51a43
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Nov 25 01:55:37 2010 +0100

    window decorations: icons parametric for format version 2 as well.

 themes/Adwaita/metacity-1/metacity-theme-2.xml |  244 ++++++++++++++++++------
 1 files changed, 182 insertions(+), 62 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-2.xml b/themes/Adwaita/metacity-1/metacity-theme-2.xml
index b359d47..9158c84 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-2.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-2.xml
@@ -23,8 +23,8 @@
 <constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
 <constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
 <constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
-<constant name="D_icons_unfocused_offset" value="2" />
-
+<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 -->
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
@@ -205,32 +205,56 @@
 <constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
 
 <draw_ops name="close_glyph_focused">
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_focused" />
-	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_focused" />
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_focused" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_focused" />
-	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_focused" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="close_shadow_focused">
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_shadow" />
-	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_shadow" />
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_shadow" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_shadow" />
-	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_shadow" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -244,17 +268,29 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused">
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused" />
-	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused" />
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused" />
-	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -263,17 +299,29 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_prelight">
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_prelight" />
-	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused_prelight" />
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_prelight" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_prelight" />
-	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused_prelight" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -282,17 +330,29 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_pressed">
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_pressed" />
-	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused_pressed" />
-	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_pressed" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_pressed" />
-	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+	<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"
 		color="C_icons_unfocused_pressed" />
-	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+	<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"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -301,16 +361,24 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_focused">
-	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_focused" />
-	<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" 
+	<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" 
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="maximize_shadow_focused">
-	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_shadow" />
-	<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" 
+	<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" 
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -324,9 +392,13 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused">
-	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused" />
-	<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" 
+	<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" 
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -335,9 +407,13 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_prelight">
-	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_prelight" />
-	<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" 
+	<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" 
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -346,9 +422,13 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_pressed">
-	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_pressed" />
-	<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" 
+	<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" 
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -357,12 +437,16 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_focused">
-	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+	<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"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="minimize_shadow_focused">
-	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+	<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"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -376,7 +460,9 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused">
-	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -385,7 +471,9 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_prelight">
-	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -394,7 +482,9 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_pressed">
-	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>
 
@@ -403,20 +493,32 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_focused">
-	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_focused" />
-	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+	<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" 
 		color="C_icons_focused" />
-	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+	<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"
 		color="C_icons_focused" />
 </draw_ops>
 
 <draw_ops name="menu_shadow_focused">
-	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_shadow" />
-	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+	<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" 
 		color="C_icons_shadow" />
-	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+	<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"
 		color="C_icons_shadow" />
 </draw_ops>
 
@@ -430,11 +532,17 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused">
-	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused" />
-	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+	<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" 
 		color="C_icons_unfocused" />
-	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused" />
 </draw_ops>
 
@@ -443,11 +551,17 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused_prelight">
-	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_prelight" />
-	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+	<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" 
 		color="C_icons_unfocused_prelight" />
-	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused_prelight" />
 </draw_ops>
 
@@ -456,11 +570,17 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused_pressed">
-	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+	<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" 
 		color="C_icons_unfocused_pressed" />
-	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+	<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" 
 		color="C_icons_unfocused_pressed" />
-	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+	<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"
 		color="C_icons_unfocused_pressed" />
 </draw_ops>