From 755b8a2f1b153a8c3511095ce3dbf0427001bfa4 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 5 Oct 2019 23:03:04 +0200
Subject: [PATCH] Slightly increase back button size and more consistent header
 pos/size

---
 data/gui/screens/addons_screen.stkgui           | 15 +++++++++------
 data/gui/screens/arenas.stkgui                  |  8 +++-----
 data/gui/screens/credits.stkgui                 |  2 +-
 data/gui/screens/easter_egg.stkgui              |  7 +++----
 data/gui/screens/edit_gp.stkgui                 |  8 +++-----
 data/gui/screens/edit_track.stkgui              |  5 +++--
 data/gui/screens/ghost_replay_selection.stkgui  | 14 ++++++++------
 data/gui/screens/gp_info.stkgui                 |  9 ++++-----
 data/gui/screens/grand_prix_editor.stkgui       | 17 +++++++----------
 data/gui/screens/help1.stkgui                   |  6 +++---
 data/gui/screens/help2.stkgui                   |  6 +++---
 data/gui/screens/help3.stkgui                   |  6 +++---
 data/gui/screens/help4.stkgui                   |  6 +++---
 data/gui/screens/help5.stkgui                   |  6 +++---
 data/gui/screens/help6.stkgui                   |  6 +++---
 data/gui/screens/help7.stkgui                   |  6 +++---
 data/gui/screens/karts.stkgui                   |  8 +++-----
 data/gui/screens/online/create_server.stkgui    | 14 ++++++++------
 data/gui/screens/online/lan.stkgui              |  5 +++--
 data/gui/screens/online/network_karts.stkgui    | 13 +++++--------
 data/gui/screens/online/networking_lobby.stkgui |  8 ++++----
 data/gui/screens/online/online.stkgui           |  8 ++++----
 .../screens/online/profile_achievements.stkgui  |  6 +++---
 .../online/profile_achievements_tab.stkgui      |  6 +++---
 data/gui/screens/online/profile_friends.stkgui  |  6 +++---
 data/gui/screens/online/profile_servers.stkgui  |  5 +++--
 data/gui/screens/online/profile_settings.stkgui |  5 +++--
 data/gui/screens/online/register.stkgui         |  8 ++++----
 data/gui/screens/online/server_selection.stkgui | 14 ++++++++------
 data/gui/screens/online/user_search.stkgui      |  7 ++++---
 data/gui/screens/options_audio.stkgui           |  6 +++---
 data/gui/screens/options_device.stkgui          |  6 +++---
 data/gui/screens/options_general.stkgui         |  6 +++---
 data/gui/screens/options_input.stkgui           |  6 +++---
 data/gui/screens/options_language.stkgui        |  6 +++---
 data/gui/screens/options_ui.stkgui              |  6 +++---
 data/gui/screens/options_video.stkgui           |  6 +++---
 data/gui/screens/race_setup.stkgui              |  9 ++++-----
 data/gui/screens/soccer_setup.stkgui            |  8 +++-----
 data/gui/screens/track_info.stkgui              |  9 ++++-----
 data/gui/screens/tracks.stkgui                  |  5 +++--
 data/gui/screens/tracks_and_gp.stkgui           | 11 ++++++-----
 data/gui/screens/user_screen.stkgui             |  7 +++----
 data/gui/screens/user_screen_tab.stkgui         |  6 +++---
 44 files changed, 167 insertions(+), 170 deletions(-)

diff --git a/data/gui/screens/addons_screen.stkgui b/data/gui/screens/addons_screen.stkgui
index f577facd5..e6eb3c363 100644
--- a/data/gui/screens/addons_screen.stkgui
+++ b/data/gui/screens/addons_screen.stkgui
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
-            <icon-button id="back"   height="100%" icon="gui/icons/back.png"/>
-            <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
-            <icon-button id="reload"   height="90%" icon="gui/icons/restart.png"/>
-        </div>
+    <div x="0" y="0" width="100%" layout="horizontal-row" height="9%">
+        <icon-button id="back" height="100%" icon="gui/icons/back.png"/>
+        <spacer proportion="1" height="5"/>
+        <icon-button id="reload" height="90%" icon="gui/icons/restart.png"/>
+    </div>
+
+    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" text_align="center" text="SuperTuxKart Addons"/>
+        <spacer width="100%" height="1%"/>
 
         <box id="filter_box" width="97%" height="2f" layout="vertical-row" align="center">
             <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center">
diff --git a/data/gui/screens/arenas.stkgui b/data/gui/screens/arenas.stkgui
index 0d42f574d..24732425d 100644
--- a/data/gui/screens/arenas.stkgui
+++ b/data/gui/screens/arenas.stkgui
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
-
-        <header width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
+        <header height="8%" width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
                 align="center" text_align="center" />
-
-        <spacer width="20" height="5" />
+        <spacer width="20" height="1%" />
 
         <box proportion="1" width="100%" layout="vertical-row" padding="2">
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
diff --git a/data/gui/screens/credits.stkgui b/data/gui/screens/credits.stkgui
index 79e0fed76..5c6c85d2e 100644
--- a/data/gui/screens/credits.stkgui
+++ b/data/gui/screens/credits.stkgui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
 
diff --git a/data/gui/screens/easter_egg.stkgui b/data/gui/screens/easter_egg.stkgui
index 4473ec2b9..2c32ad810 100644
--- a/data/gui/screens/easter_egg.stkgui
+++ b/data/gui/screens/easter_egg.stkgui
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
 
-        <header width="80%" I18N="Section in easter egg tracks selection screen" text="All Tracks"
+        <header height="8%" width="80%" I18N="Section in easter egg tracks selection screen" text="All Tracks"
                 align="center" text_align="center" />
-
-        <spacer width="20" height="5" />
+        <spacer width="20" height="1%" />
 
         <box proportion="1" width="100%" layout="vertical-row" padding="2">
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
diff --git a/data/gui/screens/edit_gp.stkgui b/data/gui/screens/edit_gp.stkgui
index 7f38c7176..a67e3e313 100644
--- a/data/gui/screens/edit_gp.stkgui
+++ b/data/gui/screens/edit_gp.stkgui
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png" />
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png" />
 
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
-
-        <header id="title" width="80%" I18N="Title in edit grand prix screen"
+        <header id="title" height="8%" width="80%" I18N="Title in edit grand prix screen"
             text="Edit Grand Prix" align="center" text_align="center" />
-
-        <spacer width="100%" height="2%" />
+        <spacer width="100%" height="1%" />
 
         <box proportion="5" width="98%" align="center" layout="vertical-row" padding="6">
             <list id="tracks" x="0" y="0" width="100%" height="100%" keep_selection="true" />
diff --git a/data/gui/screens/edit_track.stkgui b/data/gui/screens/edit_track.stkgui
index f03054957..caefe535d 100644
--- a/data/gui/screens/edit_track.stkgui
+++ b/data/gui/screens/edit_track.stkgui
@@ -2,11 +2,12 @@
 <stkgui>
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" padding="10">
 
-        <header id="selected_track" width="80%"
+        <header id="selected_track" height="8%" width="80%"
             I18N="No neeed to translate this, it will be overwritten by the track name"
             text="" align="center" text_align="center" />
+        <spacer height="1%" />
 
-        <spacer height="20" />
+        <spacer height="2%" />
 
         <!-- Track selection -->
         <box proportion="3" width="100%" layout="vertical-row">
diff --git a/data/gui/screens/ghost_replay_selection.stkgui b/data/gui/screens/ghost_replay_selection.stkgui
index 9faed5717..590fdf1d0 100644
--- a/data/gui/screens/ghost_replay_selection.stkgui
+++ b/data/gui/screens/ghost_replay_selection.stkgui
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+    <div x="0" y="0" width="100%" layout="horizontal-row" height="9%">
+        <icon-button id="back" height="100%" icon="gui/icons/back.png"/>
+        <spacer proportion="1" height="5"/>
+        <icon-button id="reload" height="90%" icon="gui/icons/restart.png"/>
+    </div>
 
-        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
-            <icon-button id="back" height="100%" icon="gui/icons/back.png"/>
-            <header text_align="center" proportion="1" I18N="In the ghost replay selection screen" text="Ghost Replay Selection" align="center"/>
-            <icon-button id="reload" height="90%" icon="gui/icons/restart.png"/>
-        </div>
+    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" text_align="center" I18N="In the ghost replay selection screen" text="Ghost Replay Selection"/>
+        <spacer width="100%" height="1%"/>
 
         <!-- This is filled in programmatically -->
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
diff --git a/data/gui/screens/gp_info.stkgui b/data/gui/screens/gp_info.stkgui
index 6d5d80a3b..5aff3b52d 100644
--- a/data/gui/screens/gp_info.stkgui
+++ b/data/gui/screens/gp_info.stkgui
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <header id="name" height="7%" width="80%" align="center" text_align="center"/>
-
-        <spacer width="1" height="2%"/>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
+        <header id="name" height="8%" width="80%" align="center" text_align="center"/>
+        <spacer width="1" height="1%"/>
 
         <box width="100%" height="40%" padding="10" layout="horizontal-row">
             <!-- Left pane -->
diff --git a/data/gui/screens/grand_prix_editor.stkgui b/data/gui/screens/grand_prix_editor.stkgui
index 0846c3cc8..2ec5aa406 100644
--- a/data/gui/screens/grand_prix_editor.stkgui
+++ b/data/gui/screens/grand_prix_editor.stkgui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
-    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" I18N="Title in grand prix editor screen" text="Grand Prix editor" text_align="center"/>
+        <spacer width="100%" height="1%"/>
 
-        <header width="80%" I18N="Title in grand prix editor screen" text="Grand Prix editor"
-                align="center" text_align="center" />
-
-        <spacer height="10" />
-
-        <box proportion="8" width="100%" layout="vertical-row">
+        <box proportion="5" width="100%" layout="vertical-row">
             <ribbon_grid id="gplist" proportion="1" width="100%" square_items="true"
-                label_location="each" align="left" max_rows="2" child_width="160"
+                label_location="each" align="left" max_rows="1" child_width="160"
                 child_height="120" keep_selection="true" />
         </box>
 
@@ -20,7 +17,7 @@
 
         <spacer height="20" />
 
-        <box proportion="5" width="100%" layout="vertical-row">
+        <box proportion="6" width="100%" layout="vertical-row">
             <label id="gpname" text_align="center" width="100%" text="" />
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="1"
diff --git a/data/gui/screens/help1.stkgui b/data/gui/screens/help1.stkgui
index 6dc29bbe9..a7aba9b40 100644
--- a/data/gui/screens/help1.stkgui
+++ b/data/gui/screens/help1.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help2.stkgui b/data/gui/screens/help2.stkgui
index 7da9ae435..91ac0834c 100644
--- a/data/gui/screens/help2.stkgui
+++ b/data/gui/screens/help2.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help3.stkgui b/data/gui/screens/help3.stkgui
index 95f0364e3..e0e37e58f 100644
--- a/data/gui/screens/help3.stkgui
+++ b/data/gui/screens/help3.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help4.stkgui b/data/gui/screens/help4.stkgui
index 8aa1c285a..15d2e3ca8 100644
--- a/data/gui/screens/help4.stkgui
+++ b/data/gui/screens/help4.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help5.stkgui b/data/gui/screens/help5.stkgui
index 05d36e1a0..a421b6bb0 100644
--- a/data/gui/screens/help5.stkgui
+++ b/data/gui/screens/help5.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help6.stkgui b/data/gui/screens/help6.stkgui
index 4b54279ba..37380cf49 100644
--- a/data/gui/screens/help6.stkgui
+++ b/data/gui/screens/help6.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/help7.stkgui b/data/gui/screens/help7.stkgui
index a6c96eec2..9888b11d3 100644
--- a/data/gui/screens/help7.stkgui
+++ b/data/gui/screens/help7.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Help" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Help" text_align="center"/>
         <spacer height="1%" width="100%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
                 <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/karts.stkgui b/data/gui/screens/karts.stkgui
index f0fd50c49..57c7b9aae 100644
--- a/data/gui/screens/karts.stkgui
+++ b/data/gui/screens/karts.stkgui
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
-
-        <header width="80%" height="7%"
+        <header width="80%" height="8%"
                I18N="In the kart selection (player setup) screen"
                text="Choose a Kart"
                align="center" text_align="center" />
-
         <spacer height="1%" width="25"/>
 
         <placeholder id="playerskarts" width="100%" align="center" proportion="4">
@@ -17,7 +15,7 @@
 
         <box proportion="2" width="100%" layout="vertical-row" padding="2">
             <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
-                         child_width="90" child_height="90" max_rows="3"/>
+                         child_width="90" child_height="90" max_rows="2"/>
         </box>
 
         <!-- Groups will be added dynamically at runtime -->
@@ -26,5 +24,5 @@
         <spacer width="100%" height="2%"/>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/online/create_server.stkgui b/data/gui/screens/online/create_server.stkgui
index 6774fb2ea..5e30e5392 100644
--- a/data/gui/screens/online/create_server.stkgui
+++ b/data/gui/screens/online/create_server.stkgui
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" I18N="In the server creation screen" text="Server Creation"/>
-        <box proportion="1" width="90%" layout="vertical-row" align="center">
+    <div x="0" y="1%" width="100%" height="99%" layout="vertical-row" >
+        <header id="title" text_align="center" height="8%" width="80%" align="center" I18N="In the server creation screen" text="Server Creation"/>
+        <spacer width="100%" height="1%"/>
+
+        <box proportion="1" width="89%" layout="vertical-row" align="center">
 
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the server creation screen" text="Name of the server"/>
                 <textbox proportion="1" id="name" I18N="In the server creation screen"/>
             </div>
 
-            <spacer height="2%" width="20"/>
+            <spacer height="1%" width="20"/>
 
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
                 <gauge id="max_players" proportion="1" min_value="2"/>
             </div>
 
-            <spacer height="2%" width="20"/>
+            <spacer height="1%" width="20"/>
 
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the server creation screen" text="Password for private server (optional)"/>
@@ -48,7 +50,7 @@
                         I18N="Multiplayer game mode" text="Soccer"/>
             </ribbon>
 
-            <spacer height="2%" width="20"/>
+            <spacer height="1%" width="20"/>
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label id="more-options"  proportion="1" text_align="left"/>
                 <spinner id="more-options-spinner" proportion="1" wrap_around="true"/>
diff --git a/data/gui/screens/online/lan.stkgui b/data/gui/screens/online/lan.stkgui
index 01bc3bfb0..70bbca947 100644
--- a/data/gui/screens/online/lan.stkgui
+++ b/data/gui/screens/online/lan.stkgui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" text="Local Networking"/>
+        <header id="title" width="80%" height="8%" align="center" text_align="center" text="Local Networking"/>
+        <spacer width="100%" height="1%"/>
 
         <spacer height="5%" width="10"/>
         <icon id="logo" align="center" proportion="1" width="100%" icon="gui/icons/logo.png"/>
diff --git a/data/gui/screens/online/network_karts.stkgui b/data/gui/screens/online/network_karts.stkgui
index b120d581f..c1ed25905 100644
--- a/data/gui/screens/online/network_karts.stkgui
+++ b/data/gui/screens/online/network_karts.stkgui
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-
-        <header width="80%"
-               I18N="In the kart selection (player setup) screen"
-               text="Choose a Kart"
-               align="center" text_align="center" />
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" text_align="center" I18N="In the kart selection (player setup) screen" text="Choose a Kart"/>
+        <spacer width="100%" height="1%"/>
 
         <placeholder id="playerskarts" width="100%" align="center" proportion="5">
             <!-- Contents is added programatically -->
@@ -15,7 +12,7 @@
 
         <box proportion="2" width="100%" layout="vertical-row" padding="2">
             <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
-                         child_width="90" child_height="90" max_rows="3"/>
+                         child_width="90" child_height="90" max_rows="2"/>
         </box>
 
         <!-- Groups will be added dynamically at runtime -->
@@ -24,6 +21,6 @@
         <spacer width="100%" height="2%"/>
         <progressbar x="1%" id="timer" height="1f" width="98%"></progressbar>
     </div>
-    <icon-button id="back" x="1%" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
 </stkgui>
diff --git a/data/gui/screens/online/networking_lobby.stkgui b/data/gui/screens/online/networking_lobby.stkgui
index f04c02006..50be62786 100644
--- a/data/gui/screens/online/networking_lobby.stkgui
+++ b/data/gui/screens/online/networking_lobby.stkgui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <header id="lobby-text" text_align="center" width="80%" height="7%" align="center" I18N="In networking lobby" text="Lobby"/>
-        <spacer height="2%" width="10"/>
+    <div x="0" y="1%" width="100%" height="98%" layout="vertical-row" >
+        <header id="lobby-text" text_align="center" width="80%" height="8%" align="center" I18N="In networking lobby" text="Lobby"/>
+        <spacer height="1%" width="10"/>
         <div proportion="9" x="2%" width="96%" layout="vertical-row">
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
@@ -40,5 +40,5 @@
         </div>
         <spacer height="1%"/>
     </div>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/online/online.stkgui b/data/gui/screens/online/online.stkgui
index 618818bce..c57e2b5f0 100644
--- a/data/gui/screens/online/online.stkgui
+++ b/data/gui/screens/online/online.stkgui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <header text_align="center" width="80%" align="center" text="Online"/>
-        <spacer height="15" width="10"/>
+    <div x="0" y="1%" width="100%" height="98%" layout="vertical-row" >
+        <header text_align="center" height="8%" width="80%" align="center" text="Online"/>
+        <spacer height="1%" width="10"/>
         <button id="user-id" width="12f" height="fit" align="center"/>
         <spacer height="20"/>
 
@@ -39,5 +39,5 @@
 
     </div>
     
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/online/profile_achievements.stkgui b/data/gui/screens/online/profile_achievements.stkgui
index 5047b81ad..0eab4cf80 100644
--- a/data/gui/screens/online/profile_achievements.stkgui
+++ b/data/gui/screens/online/profile_achievements.stkgui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header id="title" text_align="center" width="80%" align="center" text="..."/>
+        <header id="title" text_align="center" height="8%" width="80%" align="center" text="..."/>
+        <spacer height="1%" width="10"/>
 
         <spacer height="25" width="10"/>
 
diff --git a/data/gui/screens/online/profile_achievements_tab.stkgui b/data/gui/screens/online/profile_achievements_tab.stkgui
index c66432454..eb7e751f1 100644
--- a/data/gui/screens/online/profile_achievements_tab.stkgui
+++ b/data/gui/screens/online/profile_achievements_tab.stkgui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header id="title" text_align="center" width="80%" align="center" text="..."/>
+        <header id="title" text_align="center" height="8%" width="80%" align="center" text="..."/>
+        <spacer height="1%" width="10"/>
 
         <spacer height="25" width="10"/>
 
diff --git a/data/gui/screens/online/profile_friends.stkgui b/data/gui/screens/online/profile_friends.stkgui
index 6426d45fb..1b60fb6ca 100644
--- a/data/gui/screens/online/profile_friends.stkgui
+++ b/data/gui/screens/online/profile_friends.stkgui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header id="title" text_align="center" width="80%" align="center" text="..."/>
+        <header id="title" text_align="center" height="8%" width="80%" align="center" text="..."/>
+        <spacer height="1%" width="10"/>
 
         <spacer height="25" width="10"/>
 
diff --git a/data/gui/screens/online/profile_servers.stkgui b/data/gui/screens/online/profile_servers.stkgui
index b49732cd8..b546b9dd8 100644
--- a/data/gui/screens/online/profile_servers.stkgui
+++ b/data/gui/screens/online/profile_servers.stkgui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" text="Global Networking"/>
+        <header id="title" text_align="center" height="8%" width="80%" align="center" text="Global Networking"/>
+        <spacer height="1%" width="10"/>
 
         <spacer height="5%" width="10"/>
         <icon id="logo" align="center" proportion="1" width="100%" icon="gui/icons/logo.png"/>
diff --git a/data/gui/screens/online/profile_settings.stkgui b/data/gui/screens/online/profile_settings.stkgui
index b899c4e3e..311536ee0 100644
--- a/data/gui/screens/online/profile_settings.stkgui
+++ b/data/gui/screens/online/profile_settings.stkgui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" text="..."/>
+        <header id="title" text_align="center" height="8%" width="80%" align="center" text="..."/>
+        <spacer height="1%" width="10"/>
 
         <spacer height="25" width="10"/>
 
diff --git a/data/gui/screens/online/register.stkgui b/data/gui/screens/online/register.stkgui
index 18e0c91db..6f9a0227d 100644
--- a/data/gui/screens/online/register.stkgui
+++ b/data/gui/screens/online/register.stkgui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header align="center" width="80%" text="Create User" text_align="center"
+        <header align="center" height="8%" width="80%" text="Create User" text_align="center"
                 I18N="In the registration dialog" />
-      <spacer height="15" width="10"/>
+        <spacer height="1%" width="10"/>
+
       <tabs id="mode_tabs" height="2f" x="2%" width="98%" align="center">
         <icon-button id="tab_new_online" width="128" height="128" icon="gui/icons/main_network.png"
                      I18N="Section in the register screen" text="New Online Account"/>
@@ -69,5 +69,5 @@
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/online/server_selection.stkgui b/data/gui/screens/online/server_selection.stkgui
index 2a147c7a8..2a4e8411f 100644
--- a/data/gui/screens/online/server_selection.stkgui
+++ b/data/gui/screens/online/server_selection.stkgui
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
+    <div x="0" y="0" width="100%" layout="horizontal-row" height="9%">
+        <icon-button id="back" height="100%" icon="gui/icons/back.png"/>
+        <spacer proportion="1" height="5"/>
+        <icon-button id="reload" height="90%" icon="gui/icons/restart.png"/>
+    </div>
 
-        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
-            <icon-button id="back"   height="100%" icon="gui/icons/back.png"/>
-            <header text_align="center" proportion="1" text="Server Selection" align="center"/>
-            <icon-button id="reload"   height="90%" icon="gui/icons/restart.png"/>
-        </div>
+    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" text_align="center" text="Server Selection"/>
+        <spacer width="100%" height="1%"/>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
             <list id="server_list" x="0" y="0" width="100%" height="93%" word_wrap="true"
diff --git a/data/gui/screens/online/user_search.stkgui b/data/gui/screens/online/user_search.stkgui
index d30547ccf..fa64af859 100644
--- a/data/gui/screens/online/user_search.stkgui
+++ b/data/gui/screens/online/user_search.stkgui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
-    <div x="1%" y="0%" width="98%" height="99%" layout="vertical-row" >
-        <header text_align="center" height="fit" text="User search" align="center"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header width="80%" height="8%" align="center" text_align="center" text="User search"/>
+        <spacer width="100%" height="1%"/>
 
         <spacer width="10" height="2%"/>
 
diff --git a/data/gui/screens/options_audio.stkgui b/data/gui/screens/options_audio.stkgui
index e2033d70d..d2985e0f0 100644
--- a/data/gui/screens/options_audio.stkgui
+++ b/data/gui/screens/options_audio.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_device.stkgui b/data/gui/screens/options_device.stkgui
index 94531e0d1..b3483f6f0 100644
--- a/data/gui/screens/options_device.stkgui
+++ b/data/gui/screens/options_device.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_general.stkgui b/data/gui/screens/options_general.stkgui
index 6d5a8a68e..5edfd431c 100644
--- a/data/gui/screens/options_general.stkgui
+++ b/data/gui/screens/options_general.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_input.stkgui b/data/gui/screens/options_input.stkgui
index 3e1611321..5e82ed03e 100644
--- a/data/gui/screens/options_input.stkgui
+++ b/data/gui/screens/options_input.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_language.stkgui b/data/gui/screens/options_language.stkgui
index d1aaf9683..37c68c85b 100644
--- a/data/gui/screens/options_language.stkgui
+++ b/data/gui/screens/options_language.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_ui.stkgui b/data/gui/screens/options_ui.stkgui
index 4355bd450..4328f489f 100644
--- a/data/gui/screens/options_ui.stkgui
+++ b/data/gui/screens/options_ui.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/options_video.stkgui b/data/gui/screens/options_video.stkgui
index eb35042fc..dec1aaece 100644
--- a/data/gui/screens/options_video.stkgui
+++ b/data/gui/screens/options_video.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
diff --git a/data/gui/screens/race_setup.stkgui b/data/gui/screens/race_setup.stkgui
index 7c57f553b..da327cfd5 100644
--- a/data/gui/screens/race_setup.stkgui
+++ b/data/gui/screens/race_setup.stkgui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <header height="8%" width="80%" text="Race Setup" align="center" text_align="center" />
+        <spacer height="1%" width="25"/>
 
-        <header height="5%" width="80%" text="Race Setup" align="center" text_align="center" />
-
-        <spacer height="5%" width="25"/>
         <bright width="100%" text="Select a difficulty" align="center" text_align="left" />
         <spacer height="10" width="25"/>
         <box width="100%" proportion="3" padding="10" layout="vertical-row">
@@ -33,5 +32,5 @@
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/soccer_setup.stkgui b/data/gui/screens/soccer_setup.stkgui
index 2035a0a73..ecbd9e4e8 100644
--- a/data/gui/screens/soccer_setup.stkgui
+++ b/data/gui/screens/soccer_setup.stkgui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
-
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
-
-        <header width="80%" text="Race Setup" align="center" text_align="center" />
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <header height="8%" width="80%" text="Race Setup" align="center" text_align="center" />
         <spacer height="1%" width="25"/>
 
         <bubble height="fit" width="100%" id="lblLeftRight" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" word_wrap="true" text_align="center"/>
diff --git a/data/gui/screens/track_info.stkgui b/data/gui/screens/track_info.stkgui
index 52bfd6496..d93eac312 100644
--- a/data/gui/screens/track_info.stkgui
+++ b/data/gui/screens/track_info.stkgui
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <header id="name" height="7%" width="80%" align="center" text_align="center"/>
-
-        <spacer width="1" height="2%"/>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
+        <header id="name" height="8%" width="80%" align="center" text_align="center"/>
+        <spacer width="1" height="1%"/>
 
         <div width="100%" height="91%" layout="horizontal-row">
             
diff --git a/data/gui/screens/tracks.stkgui b/data/gui/screens/tracks.stkgui
index 3a10596f0..340535c54 100644
--- a/data/gui/screens/tracks.stkgui
+++ b/data/gui/screens/tracks.stkgui
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
     <div id="all-track" x="1%" y="1%" width="60%" height="88%" layout="vertical-row" >
-        <header width="80%" I18N="In the track selection screen" text="All Tracks"
+        <header height="8%"width="80%" I18N="In the track selection screen" text="All Tracks"
                 align="center" text_align="center" />
+        <spacer width="100%" height="1%" />
 
         <box proportion="1" width="100%" layout="vertical-row" padding="1">
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
diff --git a/data/gui/screens/tracks_and_gp.stkgui b/data/gui/screens/tracks_and_gp.stkgui
index 574568503..5d848ba73 100644
--- a/data/gui/screens/tracks_and_gp.stkgui
+++ b/data/gui/screens/tracks_and_gp.stkgui
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 
-    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-
-        <header width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header width="8%" width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
                 align="center" text_align="center" />
+        <spacer width="100%" height="1%" />
 
         <box width="100%" proportion="1" layout="vertical-row" padding="0">
             <scrollable_toolbar id="gps" x="1%" y="1%" width="98%" height="98%" align="center" label_location="each"
                                 square_items="true" child_width="175" child_height="120" />
         </box>
 
-        <header width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
+        <header width="8%" width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
                 align="center" text_align="center" />
+        <spacer width="100%" height="1%" />
 
         <box proportion="3" width="100%" layout="vertical-row" padding="1">
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
diff --git a/data/gui/screens/user_screen.stkgui b/data/gui/screens/user_screen.stkgui
index 724e698ab..a65a96c18 100644
--- a/data/gui/screens/user_screen.stkgui
+++ b/data/gui/screens/user_screen.stkgui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header align="center" width="80%" text="Login" text_align="center"/>
-        <spacer height="15" width="10"/>
+        <header align="center" height="8%"width="80%" text="Login" text_align="center"/>
+        <spacer height="1%" width="10"/>
 
         <box proportion="1" width="98%" layout="vertical-row">
 
@@ -77,5 +76,5 @@
         <spacer width="20" height="15"/>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/screens/user_screen_tab.stkgui b/data/gui/screens/user_screen_tab.stkgui
index 0373f9fdc..7d92f3f3b 100644
--- a/data/gui/screens/user_screen_tab.stkgui
+++ b/data/gui/screens/user_screen_tab.stkgui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <icon-button id="back" x="0" y="0" height="9%" icon="gui/icons/back.png"/>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <header width="80%" height="8%" align="center" text="SuperTuxKart Options" text_align="center"/>
         <spacer width="100%" height="1%"/>
 
-        <div width="100%" height="92%" layout="horizontal-row" >
+        <div width="100%" height="91%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
                 <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"