diff --git a/data/gui/dialogs/addons_loading.stkgui b/data/gui/dialogs/addons_loading.stkgui
index 2cb3d54e3..3ad1f499c 100644
--- a/data/gui/dialogs/addons_loading.stkgui
+++ b/data/gui/dialogs/addons_loading.stkgui
@@ -22,7 +22,10 @@
         </div>
 
         <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
-        <div width="80%" proportion="5" align="center">
+        
+        <spacer proportion="1" />
+        
+        <div width="80%" proportion="4" align="center">
             <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
                 <icon-button id="install" width="128" height="128"
                              icon="gui/icons/package-update.png"
diff --git a/data/gui/dialogs/online/achievement_progress_dialog.stkgui b/data/gui/dialogs/online/achievement_progress_dialog.stkgui
index 6de36adfb..d88e7832a 100644
--- a/data/gui/dialogs/online/achievement_progress_dialog.stkgui
+++ b/data/gui/dialogs/online/achievement_progress_dialog.stkgui
@@ -39,6 +39,6 @@
                          icon="gui/icons/green_check.png" text="OK"
                          label_location="bottom"/>
         </buttonbar>
-        <spacer width="20" height="1f" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/change_password.stkgui b/data/gui/dialogs/online/change_password.stkgui
index f2e038f96..87da0d9a7 100644
--- a/data/gui/dialogs/online/change_password.stkgui
+++ b/data/gui/dialogs/online/change_password.stkgui
@@ -2,8 +2,8 @@
 <stkgui>
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
 
-        <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the change password dialog" text="Password Change"/>
+        <header id="title" width="100%" height="fit" text_align="center" word_wrap="true"
+                I18N="In the change password dialog" text="Password Change"/>
 
         <spacer height="4%" width="50"/>
 
@@ -40,6 +40,6 @@
                 <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                              I18N="In the change password dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        <spacer height="1f" width="20" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/network_ingame_dialog.stkgui b/data/gui/dialogs/online/network_ingame_dialog.stkgui
index d63686908..2e7093ea4 100644
--- a/data/gui/dialogs/online/network_ingame_dialog.stkgui
+++ b/data/gui/dialogs/online/network_ingame_dialog.stkgui
@@ -41,6 +41,6 @@
 
         </buttonbar>
 
-        <spacer width="20" height="35" />
+        <spacer width="20" height="5%" />
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/notification_dialog.stkgui b/data/gui/dialogs/online/notification_dialog.stkgui
index c9687fd75..74a723234 100644
--- a/data/gui/dialogs/online/notification_dialog.stkgui
+++ b/data/gui/dialogs/online/notification_dialog.stkgui
@@ -12,6 +12,6 @@
             <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        <spacer width="20" height="1f" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/player_rankings_dialog.stkgui b/data/gui/dialogs/online/player_rankings_dialog.stkgui
index 48dac6bd4..0daddf2a3 100644
--- a/data/gui/dialogs/online/player_rankings_dialog.stkgui
+++ b/data/gui/dialogs/online/player_rankings_dialog.stkgui
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="100%" height="96%" layout="vertical-row">
-        <header id="title" width="96%" height="fit" text_align="center"
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+        <header id="title" width="100%" height="fit" text_align="center"
                 word_wrap="true" I18N="In player rankings dialog"
                 text="Top 10 players"/>
+        
+         <spacer height="1%" width="20" />
 
         <box x="2%" width="90%" height="60%" align="center" layout="vertical-row"
                 padding="6">
@@ -12,15 +14,17 @@
 
         <label id="cur-rank" proportion="1" width="90%" align="center"
                text_align="center" word_wrap="true" text=""/>
+               
+        <spacer height="1%" width="20" />
 
-        <buttonbar id="options" width="90%" height="10%" align="center">
-            <icon-button id="ok" width="16" height="16"
+        <buttonbar id="options" width="90%" height="14%" align="center">
+            <icon-button id="ok" width="128" height="128"
                          icon="gui/icons/green_check.png" text="OK"
                          label_location="bottom"/>
-            <icon-button id="refresh" width="16" height="16"
+            <icon-button id="refresh" width="128" height="128"
                          icon="gui/icons/restart.png"
                          text="Refresh" label_location="bottom"/>
         </buttonbar>
-        <spacer width="20" height="1f" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/recovery_input.stkgui b/data/gui/dialogs/online/recovery_input.stkgui
index b58123ea6..7ce99afe4 100644
--- a/data/gui/dialogs/online/recovery_input.stkgui
+++ b/data/gui/dialogs/online/recovery_input.stkgui
@@ -39,6 +39,6 @@
             <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                 I18N="In the recovery dialog"  text="Cancel" label_location="none"/>
         </buttonbar>
-        <spacer width="20" height="1f" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/online/server_info_dialog.stkgui b/data/gui/dialogs/online/server_info_dialog.stkgui
index efc8eea8e..676bb71a0 100644
--- a/data/gui/dialogs/online/server_info_dialog.stkgui
+++ b/data/gui/dialogs/online/server_info_dialog.stkgui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="0%" width="96%" height="100%" layout="vertical-row" >
-        <header id="title" width="96%" proportion="2" text_align="center" word_wrap="true"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+        <header id="title" width="100%" proportion="3" text_align="center" word_wrap="true"/>
+        <spacer height="1%" width="5"/>
         <div width="100%" proportion="3" layout="horizontal-row" >
             <div width="48%" height="100%" layout="vertical-row" >
                 <label id="server-info-1" text_align="left" width="100%" text=""/>
diff --git a/data/gui/dialogs/online/user_info_dialog.stkgui b/data/gui/dialogs/online/user_info_dialog.stkgui
index 8d5f83776..624911026 100644
--- a/data/gui/dialogs/online/user_info_dialog.stkgui
+++ b/data/gui/dialogs/online/user_info_dialog.stkgui
@@ -32,7 +32,7 @@
             <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        <spacer width="20" height="1f" />
+        <spacer height="1f" width="20"/>
     </div>
 </stkgui>
 
diff --git a/data/gui/dialogs/online/vote_dialog.stkgui b/data/gui/dialogs/online/vote_dialog.stkgui
index 7b14df2e6..6399b46bd 100644
--- a/data/gui/dialogs/online/vote_dialog.stkgui
+++ b/data/gui/dialogs/online/vote_dialog.stkgui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-        <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
+        <header id="title" width="100%" height="fit" text_align="center" word_wrap="true"
             I18N="In the vote dialog" text="Vote"/>
 
         <spacer height="2%" width="50"/>
diff --git a/data/gui/dialogs/race_paused_dialog.stkgui b/data/gui/dialogs/race_paused_dialog.stkgui
index fb6f36af1..6a9d46578 100644
--- a/data/gui/dialogs/race_paused_dialog.stkgui
+++ b/data/gui/dialogs/race_paused_dialog.stkgui
@@ -34,6 +34,6 @@
 
         </buttonbar>
 
-        <spacer width="20" height="35" />
+        <spacer width="20" height="5%" />
     </div>
 </stkgui>
diff --git a/data/gui/dialogs/tutorial_message_dialog.stkgui b/data/gui/dialogs/tutorial_message_dialog.stkgui
index 532fec307..cec8d8dc6 100644
--- a/data/gui/dialogs/tutorial_message_dialog.stkgui
+++ b/data/gui/dialogs/tutorial_message_dialog.stkgui
@@ -3,7 +3,7 @@
     <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
         <label id="title" width="100%" text_align="left" word_wrap="true" proportion="1" />
 
-        <spacer height="10" width="10" />
+        <spacer height="2%" width="10" />
 
         <button id="continue" I18N="Button in tutorial" text="Continue" align="right"/>
     </div>
diff --git a/data/gui/screens/online/user_search.stkgui b/data/gui/screens/online/user_search.stkgui
index 45c723d3c..d30547ccf 100644
--- a/data/gui/screens/online/user_search.stkgui
+++ b/data/gui/screens/online/user_search.stkgui
@@ -5,15 +5,15 @@
     <div x="1%" y="0%" width="98%" height="99%" layout="vertical-row" >
         <header text_align="center" height="fit" text="User search" align="center"/>
 
-        <spacer width="10" height="10"/>
+        <spacer width="10" height="2%"/>
 
         <div height="fit" width="100%" layout="horizontal-row" align="center">
             <textbox id="search_box" height="fit" proportion="1"/>
-            <spacer width="10" height="10"/>
+            <spacer width="2%" height="10"/>
             <button id="search_button" height="100%" width="fit" text="Search" />
         </div>
 
-        <spacer width="10" height="10"/>
+        <spacer width="10" height="2%"/>
 
         <box proportion="1" width="100%" align="center" layout="vertical-row" padding="6">
             <list id="user_list" x="0" y="0" width="100%" height="100%"/>
diff --git a/data/gui/screens/race_setup.stkgui b/data/gui/screens/race_setup.stkgui
index 0762a3bdb..7c57f553b 100644
--- a/data/gui/screens/race_setup.stkgui
+++ b/data/gui/screens/race_setup.stkgui
@@ -8,15 +8,15 @@
         <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">
-            
-            <ribbon id="difficulty" height="85%" width="100%" align="center">
-                <icon-button id="novice" width="fit" height="fit" icon="gui/icons/difficulty_easy.png"
+            <spacer height="15%" width="25"/>
+            <ribbon id="difficulty" height="70%" width="100%" align="center">
+                <icon-button id="novice" width="128" height="128" icon="gui/icons/difficulty_easy.png"
                         I18N="Difficulty" text="Novice"/>
-                <icon-button id="intermediate" width="fit" height="fit" icon="gui/icons/difficulty_medium.png"
+                <icon-button id="intermediate" width="128" height="128" icon="gui/icons/difficulty_medium.png"
                         I18N="Difficulty" text="Intermediate"/>
-                <icon-button id="expert" width="fit" height="fit" icon="gui/icons/difficulty_hard.png"
+                <icon-button id="expert" width="128" height="128" icon="gui/icons/difficulty_hard.png"
                         I18N="Difficulty"  text="Expert"/>
-                <icon-button id="best" width="fit" height="fit" icon="gui/icons/difficulty_best.png"
+                <icon-button id="best" width="128" height="128" icon="gui/icons/difficulty_best.png"
                         I18N="Difficulty"  text="SuperTux"/>
             </ribbon>
         </box>
diff --git a/data/gui/screens/user_screen.stkgui b/data/gui/screens/user_screen.stkgui
index 0451a5395..724e698ab 100644
--- a/data/gui/screens/user_screen.stkgui
+++ b/data/gui/screens/user_screen.stkgui
@@ -56,19 +56,19 @@
             
 			<spacer width="20" height="2%"/>
 			
-			<div width="90%" align="center" layout="vertical-row" height="18%">
+			<div width="90%" align="center" layout="vertical-row" height="13%">
 				<buttonbar id="options" width="100%" height="100%" align="center">
-					<icon-button id="ok" width="fit" height="fit" icon="gui/icons/green_check.png"
+					<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
 								 I18N="In the user screen" text="OK" label_location="bottom"/>
-					<icon-button id="new_user" width="fit" height="fit" icon="gui/icons/blue_plus.png"
+					<icon-button id="new_user" width="128" height="128" icon="gui/icons/blue_plus.png"
 								 I18N="In the user screen" text="Add" label_location="bottom"/>
-					<icon-button id="delete" width="fit" height="fit" icon="gui/icons/remove.png"
+					<icon-button id="delete" width="128" height="128" icon="gui/icons/remove.png"
 								 I18N="In the user screen" text="Delete" label_location="bottom"/>
-					<icon-button id="rename" width="fit" height="fit" icon="gui/icons/rename.png"
+					<icon-button id="rename" width="128" height="128" icon="gui/icons/rename.png"
 								 I18N="In the user screen" text="Rename" label_location="bottom"/>
-					<icon-button id="default_kart_color" width="fit" height="fit" icon="gui/icons/edit.png"
+					<icon-button id="default_kart_color" width="128" height="128" icon="gui/icons/edit.png"
 								 I18N="In the user screen" text="Kart color" label_location="bottom"/>
-					<icon-button id="cancel" width="fit" height="fit" icon="gui/icons/main_quit.png"
+					<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
 								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
 				</buttonbar>
 			</div>
diff --git a/data/gui/screens/user_screen_tab.stkgui b/data/gui/screens/user_screen_tab.stkgui
index b07a55f18..0373f9fdc 100644
--- a/data/gui/screens/user_screen_tab.stkgui
+++ b/data/gui/screens/user_screen_tab.stkgui
@@ -77,19 +77,19 @@
                 
                 <spacer width="20" height="2%"/>
 
-                <div width="100%" align="center" layout="vertical-row" height="18%">
+                <div width="100%" align="center" layout="vertical-row" height="13%">
                     <buttonbar id="options" width="100%" height="100%" align="center">
-                        <icon-button id="ok" width="fit" height="fit" icon="gui/icons/green_check.png"
+                        <icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
                                      I18N="In the user screen" text="OK" label_location="bottom"/>
-                        <icon-button id="new_user" width="fit" height="fit" icon="gui/icons/blue_plus.png"
+                        <icon-button id="new_user" width="128" height="128" icon="gui/icons/blue_plus.png"
                                      I18N="In the user screen" text="Add" label_location="bottom"/>
-                        <icon-button id="delete" width="fit" height="fit" icon="gui/icons/remove.png"
+                        <icon-button id="delete" width="128" height="128" icon="gui/icons/remove.png"
                                      I18N="In the user screen" text="Delete" label_location="bottom"/>
-                        <icon-button id="rename" width="fit" height="fit" icon="gui/icons/rename.png"
+                        <icon-button id="rename" width="128" height="128" icon="gui/icons/rename.png"
                                      I18N="In the user screen" text="Rename" label_location="bottom"/>
-                        <icon-button id="default_kart_color" width="fit" height="fit" icon="gui/icons/edit.png"
+                        <icon-button id="default_kart_color" width="128" height="128" icon="gui/icons/edit.png"
                                      I18N="In the user screen" text="Kart color" label_location="bottom"/>
-                        <icon-button id="cancel" width="fit" height="fit" icon="gui/icons/main_quit.png"
+                        <icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
                                      I18N="In the user screen" text="Cancel" label_location="bottom"/>
                     </buttonbar>
                 </div>