diff --git a/data/gui/dialogs/online/server_configuration_dialog.stkgui b/data/gui/dialogs/online/server_configuration_dialog.stkgui
index b6b1aaf7e..3f627a9fe 100644
--- a/data/gui/dialogs/online/server_configuration_dialog.stkgui
+++ b/data/gui/dialogs/online/server_configuration_dialog.stkgui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
         <header id="title" text_align="center" width="80%" align="center" I18N="In the server configuration screen" text="Server Configuration"/>
+        <spacer height="1%" width="20"/>
         <box proportion="1" width="90%" layout="vertical-row" align="center">
 
             <label width="100%" height="8%" text_align="left" I18N="In the server configuration screen" text="Difficulty"/>
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 2a4921174..035e352c9 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -740,11 +740,10 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
         return;
 
     // -2 because that's the spacing further on
-    int ICON_PLAYER_WIDTH = std::max(y_space / (num_karts) - 2,
-                                    (unsigned)GUIEngine::getFontHeight());
+    int ICON_PLAYER_WIDTH = y_space / num_karts - 2;
 
     int icon_width_max = (int)(60*(irr_driver->getActualScreenSize().Width/1024.0f));
-    int icon_width_min = (int)(35*((irr_driver->getActualScreenSize().Height - (y_base+10))/720.0f));
+    int icon_width_min = GUIEngine::getFontHeight();
     if (icon_width_min < 35) icon_width_min = 35;
     if (icon_width_min > icon_width_max)
     {
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 61d29f67e..55a614e85 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -808,7 +808,8 @@ void RaceResultGUI::displayCTFResults()
         if (m_distance_between_rows * num_karts > height)
             m_distance_between_rows = height / num_karts;
 
-        m_width_icon = table_area->m_h / 18;
+        m_width_icon = std::min((int)(table_area->m_h / num_karts),
+                                   GUIEngine::getFontHeight());
 
         m_width_column_space = 10;