diff --git a/uppdev/AccessKey/h.iml b/uppdev/AccessKey/h.iml
index 1cd0e76b3..e8d647b6d 100644
--- a/uppdev/AccessKey/h.iml
+++ b/uppdev/AccessKey/h.iml
@@ -2399,14 +2399,17 @@ IMAGE_DATA(48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
 IMAGE_END_DATA(4320, 1)
 
 IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,237,148,193,13,131,48,20,67,51,66,217,160,98,20,118,96,22,174,61,49,16,19,176,8,67,48,65,90,163,26)
-IMAGE_DATA(253,70,63,16,160,135,74,181,43,171,16,254,75,66,18,28,110,225,22,140,226,5,47,252,227,132,193,117,93,23,201,183)
-IMAGE_DATA(109,27,135,97,136,211,52,45,198,53,158,163,189,105,154,88,215,245,106,143,39,7,143,227,248,193,195,37,60,56,180,85)
-IMAGE_DATA(85,245,81,143,154,61,190,239,251,117,158,184,70,31,214,168,99,191,30,15,150,117,57,179,47,143,39,203,119,197,28,44)
-IMAGE_DATA(107,223,99,107,253,231,121,118,199,182,107,152,91,63,240,180,157,51,107,241,142,176,199,99,92,172,63,230,13,163,15,238)
-IMAGE_DATA(29,13,22,207,114,60,247,144,125,216,253,135,209,134,154,28,79,243,252,176,31,206,7,44,158,123,252,149,243,127,214,111)
-IMAGE_DATA(62,224,255,172,195,47,134,1,189,21,6,37,60,236,133,193,222,248,60,36,116,250,241,219,118,143,103,24,216,90,126,184)
-IMAGE_DATA(246,190,36,12,114,235,117,36,12,82,246,72,24,120,227,151,134,65,58,174,189,223,11,3,91,107,195,192,182,231,194,32)
-IMAGE_DATA(173,73,195,160,244,252,109,133,65,233,249,59,122,254,207,250,43,97,112,127,253,36,73,146,36,73,146,36,73,146,36,73)
-IMAGE_DATA(250,31,61,1,189,78,100,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-IMAGE_END_DATA(320, 3)
+IMAGE_DATA(120,156,237,86,219,141,132,48,16,75,9,75,7,39,74,161,7,106,225,247,190,40,136,10,104,132,34,168,32,119,94,157)
+IMAGE_DATA(87,179,81,2,147,39,171,19,89,89,64,24,143,77,8,214,154,135,121,24,49,108,6,158,252,239,4,128,55,77,147,37)
+IMAGE_DATA(127,28,71,187,44,139,221,182,237,9,156,227,62,230,135,97,176,125,223,191,224,227,147,7,172,235,250,198,7,52,124,240)
+IMAGE_DATA(48,215,117,221,91,61,106,206,248,243,60,191,124,226,28,61,36,80,199,190,62,62,184,172,11,129,189,124,124,114,249,172)
+IMAGE_DATA(240,32,185,242,57,142,214,127,223,119,175,182,92,195,208,250,129,79,72,207,172,197,51,2,62,62,116,177,254,240,13,160)
+IMAGE_DATA(7,223,29,1,46,238,133,248,124,135,236,33,223,63,128,57,212,132,248,4,247,15,251,208,15,184,184,239,227,231,236,255)
+IMAGE_DATA(84,252,241,13,142,169,48,159,24,6,196,81,24,104,248,128,47,12,206,244,185,73,8,247,227,151,243,62,62,195,64,214)
+IMAGE_DATA(242,195,149,215,154,48,8,173,87,76,24,184,220,152,48,240,233,107,195,192,213,149,215,103,97,32,107,101,24,200,249,80)
+IMAGE_DATA(24,184,53,110,24,104,247,223,81,24,104,247,95,236,254,79,69,145,48,248,250,253,221,67,61,206,194,240,10,221,154,62)
+IMAGE_DATA(180,253,107,248,136,233,87,122,45,114,117,115,60,148,212,78,241,160,225,165,254,89,40,225,33,39,52,83,61,216,192,92)
+IMAGE_DATA(107,15,173,245,83,124,104,56,53,60,196,112,74,106,215,224,105,251,212,230,222,250,183,254,39,232,167,246,105,145,63,173)
+IMAGE_DATA(244,143,250,185,61,75,229,78,140,190,22,185,227,74,237,28,15,165,199,149,218,49,30,90,140,171,116,255,213,248,1,123)
+IMAGE_DATA(100,209,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+IMAGE_END_DATA(416, 3)
diff --git a/uppdev/Glyph/Glyph.cpp b/uppdev/Glyph/Glyph.cpp
index bd0259d8a..5b1aacced 100644
--- a/uppdev/Glyph/Glyph.cpp
+++ b/uppdev/Glyph/Glyph.cpp
@@ -16,7 +16,7 @@ Image AutoCrop(const Image& m, RGBA c)
 	Rect r = isz;
 	for(r.top = 0; r.top < isz.cy && IsUniform(m[r.top], c, 1, isz.cx); r.top++)
 		;
-	for(r.bottom = isz.cy - 1; r.bottom >= r.top && IsUniform(m[r.bottom], c, 1, isz.cx); r.bottom--)
+	for(r.bottom = isz.cy; r.bottom > r.top && IsUniform(m[r.bottom - 1], c, 1, isz.cx); r.bottom--)
 		;
 	if(r.bottom <= r.top)
 		return Null;
@@ -24,10 +24,8 @@ Image AutoCrop(const Image& m, RGBA c)
 	const RGBA *p = m[r.top];
 	for(r.left = 0; r.left < isz.cy && IsUniform(p + r.left, c, isz.cx, h); r.left++)
 		;
-	for(r.right = isz.cx; r.right >= r.left && IsUniform(p + r.right, c, isz.cx, h); r.right--)
+	for(r.right = isz.cx; r.right > r.left && IsUniform(p + r.right - 1, c, isz.cx, h); r.right--)
 		;
-	r.right++;
-	r.bottom++;
 	Point p1 = m.GetHotSpot() - r.TopLeft();
 	Point p2 = m.Get2ndSpot() - r.TopLeft();
 	return WithHotSpots(Crop(m, r), p1.x, p1.y, p2.x, p2.y);