7 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index a1765f24..e73f9b74 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -64,7 +64,7 @@ Setup::Setup():
     Window(_("Setup"))
 {
     setCloseButton(true);
-    int width = 340;
+    int width = 380;
     int height = 360;
     setContentSize(width, height);
 
@@ -104,7 +104,7 @@ Setup::Setup():
     add(panel);
 
     Label *version = new Label(FULL_VERSION);
-    version->setPosition(5, height - version->getHeight() - 5);
+    version->setPosition(9, height - version->getHeight() - 9);
     add(version);
 
     center();
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 9417ad68..9da74c2e 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -72,7 +72,7 @@ Setup_Audio::Setup_Audio():
     place(0, 2, mMusicSlider);
     place(1, 2, musicLabel);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 365, 280));
 }
 
 void Setup_Audio::apply()
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index a0be62cd..efa03ba4 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -176,7 +176,7 @@ Setup_Colors::Setup_Colors() :
 
     mGradTypeText->setCaption("");
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 365, 280));
 }
 
 Setup_Colors::~Setup_Colors()
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 08a80bf7..f050e334 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -55,7 +55,7 @@ Setup_Joystick::Setup_Joystick():
     place = h.getPlacer(0, 1);
     place(0, 0, mCalibrateButton);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 75));
+    setDimension(gcn::Rectangle(0, 0, 365, 75));
 }
 
 void Setup_Joystick::action(const gcn::ActionEvent &event)
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 0c15a1ee..938c1c4e 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -98,7 +98,7 @@ Setup_Keyboard::Setup_Keyboard():
     place(0, 6, mMakeDefaultButton);
     place(3, 6, mAssignKeyButton);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 365, 280));
 }
 
 Setup_Keyboard::~Setup_Keyboard()
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index f0d88a30..6372d318 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -283,15 +283,15 @@ Setup_Players::Setup_Players():
     place(0, 0, mPlayerTitleTable, 4);
     place(0, 1, mPlayerScrollArea, 4, 4).setPadding(2);
     place(0, 5, mDeleteButton);
-    place(0, 6, mWhisperTabCheckBox);
     place(2, 5, ignore_action_label);
     place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
     place(2, 7, mDefaultTrading);
     place(2, 8, mDefaultWhisper);
+    place(0, 9, mWhisperTabCheckBox, 4).setPadding(4);
 
     player_relations.addListener(this);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 280));
+    setDimension(gcn::Rectangle(0, 0, 365, 280));
 }
 
 Setup_Players::~Setup_Players()
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 1c4043f7..a9c892b2 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -299,13 +299,13 @@ Setup_Video::Setup_Video():
 
     place(1, 3, mParticleEffectsCheckBox, 3);
 
-    place(1, 4, mPickupNotifyLabel, 3);
+    place(1, 4, mPickupNotifyLabel, 4);
 
     place(1, 5, mPickupChatCheckBox, 1);
     place(2, 5, mPickupParticleCheckBox, 2);
 
     place(0, 6, fontSizeLabel, 3);
-    place(1, 6, mFontSizeDropDown, 3);
+    place(1, 6, mFontSizeDropDown, 2);
 
     place(0, 7, mAlphaSlider);
     place(1, 7, alphaLabel, 3);
@@ -326,7 +326,7 @@ Setup_Video::Setup_Video():
     place(1, 11, particleDetailLabel);
     place(2, 11, mParticleDetailField, 3).setPadding(2);
 
-    setDimension(gcn::Rectangle(0, 0, 325, 300));
+    setDimension(gcn::Rectangle(0, 0, 365, 300));
 }
 
 void Setup_Video::apply()