diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index ad2e6e1e4..a9296ad7d 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -207,10 +207,10 @@ void XSDL_showConfigMenu(int * resolutionW, int * displayW, int * resolutionH, i
 	};
 	const int resVal[][2] = {
 		{*resolutionW, *resolutionH},
-		{*resolutionW * 5 / 6, *resolutionH * 5 / 6},
-		{*resolutionW * 4 / 6, *resolutionH * 4 / 6},
-		{*resolutionW * 3 / 6, *resolutionH * 3 / 6},
-		{*resolutionW * 2 / 6, *resolutionH * 2 / 6},
+		{(*resolutionW * 5 / 6) & ~0x3, (*resolutionH * 5 / 6) & ~0x3},
+		{(*resolutionW * 4 / 6) & ~0x3, (*resolutionH * 4 / 6) & ~0x3},
+		{(*resolutionW * 3 / 6) & ~0x3, (*resolutionH * 3 / 6) & ~0x3},
+		{(*resolutionW * 2 / 6) & ~0x3, (*resolutionH * 2 / 6) & ~0x3},
 		{1280,1024}, {1280,960}, {1280,720},
 		{1024,768}, {800,600}, {800,480}, {640,480}
 	};
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index e8559f1c9..0d6c8e37a 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit e8559f1c939049eed3b967b28f3d9c28a8f6d73e
+Subproject commit 0d6c8e37a0027ecbe865bc477e3fff237ed58aa2