diff -Naur mainline/src/gui/setup_audio.cpp mainline.patch/src/gui/setup_audio.cpp
--- mainline/src/gui/setup_audio.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_audio.cpp	2009-05-05 09:41:30.000000000 +0200
@@ -72,7 +72,7 @@
     place(0, 2, mMusicSlider);
     place(1, 2, musicLabel);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 400, 350));
 }
 
 void Setup_Audio::apply()
diff -Naur mainline/src/gui/setup_colors.cpp mainline.patch/src/gui/setup_colors.cpp
--- mainline/src/gui/setup_colors.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_colors.cpp	2009-05-05 09:42:03.000000000 +0200
@@ -180,7 +180,7 @@
 
     mGradTypeText->setCaption("");
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 400, 350));
 }
 
 Setup_Colors::~Setup_Colors()
diff -Naur mainline/src/gui/setup.cpp mainline.patch/src/gui/setup.cpp
--- mainline/src/gui/setup.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup.cpp	2009-05-05 09:00:05.000000000 +0200
@@ -64,8 +64,8 @@
     Window(_("Setup"))
 {
     setCloseButton(true);
-    int width = 340;
-    int height = 340;
+    int width = 420;
+    int height = 420;
     setContentSize(width, height);
 
     static const char *buttonNames[] = {
diff -Naur mainline/src/gui/setup_joystick.cpp mainline.patch/src/gui/setup_joystick.cpp
--- mainline/src/gui/setup_joystick.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_joystick.cpp	2009-05-05 09:42:23.000000000 +0200
@@ -55,7 +55,7 @@
     place = h.getPlacer(0, 1);
     place(0, 0, mCalibrateButton);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 75));
+    setDimension(gcn::Rectangle(0, 0, 400, 75));
 }
 
 void Setup_Joystick::action(const gcn::ActionEvent &event)
diff -Naur mainline/src/gui/setup_keyboard.cpp mainline.patch/src/gui/setup_keyboard.cpp
--- mainline/src/gui/setup_keyboard.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_keyboard.cpp	2009-05-05 09:42:43.000000000 +0200
@@ -98,7 +98,7 @@
     place(0, 6, mMakeDefaultButton);
     place(3, 6, mAssignKeyButton);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 400, 350));
 }
 
 Setup_Keyboard::~Setup_Keyboard()
diff -Naur mainline/src/gui/setup_players.cpp mainline.patch/src/gui/setup_players.cpp
--- mainline/src/gui/setup_players.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_players.cpp	2009-05-05 09:43:24.000000000 +0200
@@ -294,7 +294,7 @@
 
     player_relations.addListener(this);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 400, 350));
 }
 
 Setup_Players::~Setup_Players()
diff -Naur mainline/src/gui/setup_video.cpp mainline.patch/src/gui/setup_video.cpp
--- mainline/src/gui/setup_video.cpp	2009-05-05 09:29:56.000000000 +0200
+++ mainline.patch/src/gui/setup_video.cpp	2009-05-05 09:22:22.000000000 +0200
@@ -333,13 +333,13 @@
 
     place(0, 0, scrollArea, 1, 6).setPadding(2);
     place(1, 0, mFsCheckBox, 2);
-    place(3, 0, mOpenGLCheckBox, 1);
-    place(1, 1, mCustomCursorCheckBox, 3);
-    place(1, 2, mVisibleNamesCheckBox, 3);
-    place(3, 2, mNameCheckBox, 1);
-    place(1, 3, mParticleEffectsCheckBox, 3);
-    place(1, 4, mPickupNotifyLabel, 3);
-    place(1, 13, mPickupChatCheckBox, 1);
+    place(1, 1, mOpenGLCheckBox, 1);
+    place(1, 2, mCustomCursorCheckBox, 3);
+    place(1, 3, mVisibleNamesCheckBox, 3);
+    place(3, 3, mNameCheckBox, 1);
+    place(1, 4, mParticleEffectsCheckBox, 3);
+    place(1, 13, mPickupNotifyLabel, 3);
+    place(1, 14, mPickupChatCheckBox, 1);
 
     place(0, 6, mAlphaSlider);
     place(0, 7, mFpsSlider);
@@ -365,9 +365,9 @@
     place(2, 10, mSpeechLabel, 3).setPadding(2);
     place(2, 11, mOverlayDetailField, 3).setPadding(2);
     place(2, 12, mParticleDetailField, 3).setPadding(2);
-    place(2, 13, mPickupParticleCheckBox, 2);
+    place(2, 14, mPickupParticleCheckBox, 2);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 300));
+    setDimension(gcn::Rectangle(0, 0, 400, 350));
 }
 
 void Setup_Video::apply()