[gnome-themes-standard] window decorations: size of icons in buttons is not parametric (D_icons_shrink), just for 3 version

[Lapo Calamandrei <lapo src gnome org>]

commit 29a0fe0ca01aacb6ed576a0e23e556d604607f27
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Nov 25 01:51:20 2010 +0100

    window decorations: size of icons in buttons is not parametric (D_icons_shrink), just for 3 version format for now.

 themes/Adwaita/metacity-1/metacity-theme-3.xml |  244 ++++++++++++++++++------
 1 files changed, 182 insertions(+), 62 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 8ceb72b..6b6a030 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.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">
@@ -238,32 +238,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>
 
@@ -277,17 +301,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>
 
@@ -296,17 +332,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>
 
@@ -315,17 +363,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>
 
@@ -334,16 +394,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>
 
@@ -357,9 +425,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>
 
@@ -368,9 +440,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>
 
@@ -379,9 +455,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>
 
@@ -390,12 +470,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>
 
@@ -409,7 +493,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>
 
@@ -418,7 +504,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>
 
@@ -427,7 +515,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>
 
@@ -436,20 +526,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>
 
@@ -463,11 +565,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>
 
@@ -476,11 +584,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>
 
@@ -489,11 +603,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>