--- a/src/gfx.cpp	Sun Jul 29 15:48:43 2007 +0000
+++ b/src/gfx.cpp	Sun Jul 29 16:43:58 2007 +0000
@@ -1155,7 +1155,7 @@
 	int new_width = min(_screen.width, 640);
 	Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
 	if (w != NULL && new_width != w->width) {
-		ResizeWindow(w,  new_width - w->width, 0);
+		ResizeWindow(w, new_width - w->width, 0);
 
 		Window *w2 = FindWindowById(WC_STATUS_BAR, 0);
 		if (w2 != NULL) ResizeWindow(w2, max(new_width, 320) - w2->width, 0);

--- a/src/main_gui.cpp	Sun Jul 29 15:48:43 2007 +0000
+++ b/src/main_gui.cpp	Sun Jul 29 16:43:58 2007 +0000
@@ -1710,16 +1710,16 @@
 		uint extra_spacing_at[] = { 4, 8, 13, 17, 19, 24, 0 };
 
 		for (uint i = 0, x = 0, j = 0; i < 27; i++) {
-			w->widget[i].left = x;
-			x += (spacing != 0) ? button_width : (w->width - x) / (27 - i);
-			w->widget[i].right = x - 1;
-
 			if (extra_spacing_at[j] == i) {
 				j++;
 				uint add = spacing / (lengthof(extra_spacing_at) - j);
 				spacing -= add;
 				x += add;
 			}
+
+			w->widget[i].left = x;
+			x += (spacing != 0) ? button_width : (w->width - x) / (27 - i);
+			w->widget[i].right = x - 1;
 		}
 	} break;