diff --git a/data/gui/race_setup.stkgui b/data/gui/race_setup.stkgui
index 855ffb942..61e7890e9 100644
--- a/data/gui/race_setup.stkgui
+++ b/data/gui/race_setup.stkgui
@@ -8,14 +8,14 @@
         <box width="100%" height="40%" padding="10" layout="vertical-row">
             <bright width="100%" text="Select a difficulty" align="center" text_align="left" />
 
-            <ribbon id="difficulty" height="135" width="100%" align="center">
-                <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
+            <ribbon id="difficulty" height="60%" width="100%" align="center">
+                <icon-button id="novice" width="fit" height="fit" icon="gui/difficulty_easy.png"
                         I18N="Difficulty" text="Novice"/>
-                <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
+                <icon-button id="intermediate" width="fit" height="fit" icon="gui/difficulty_medium.png"
                         I18N="Difficulty" text="Intermediate"/>
-                <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
+                <icon-button id="expert" width="fit" height="fit" icon="gui/difficulty_hard.png"
                         I18N="Difficulty"  text="Expert"/>
-                <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
+                <icon-button id="best" width="fit" height="fit" icon="gui/difficulty_best.png"
                         I18N="Difficulty"  text="SuperTux"/>
             </ribbon>
         </box>
@@ -24,8 +24,8 @@
         <box width="100%" height="40%" padding="10" layout="vertical-row">
             <bright width="100%" text="Select a game mode" align="center" text_align="left" />
 
-            <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
-                                child_width="135" child_height="135" />
+            <scrollable_toolbar id="gamemode" height="60%" width="85%" label_location="bottom" align="center"
+                                child_width="256" child_height="256" />
             <spacer proportion="1" width="25" />
         </box>
     </div>
diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index 79a5ca0f4..29561109d 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -7,12 +7,12 @@
 
         <box proportion="1" width="98%" layout="vertical-row">
 
-            <spacer height="15" width="10"/>
+            <spacer height="2%" width="10"/>
 
-            <scrollable_ribbon id="players" height="120" y="10" x="10" width="98%" align="center" label_location="each"
+            <scrollable_ribbon id="players" height="18%" y="10" x="10" width="98%" align="center" label_location="each"
                                square_items="true" child_width="128" child_height="128" />
 
-            <spacer height="15" width="10"/>
+            <spacer height="2%" width="10"/>
             <div width="90%" align="center" layout="vertical-row" proportion="1">
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
@@ -37,7 +37,7 @@
                            I18N="In the user screen" text="Username"/>
                     <textbox id="username" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
-                <spacer height="20" width="20"/>
+                <spacer height="10%" width="20"/>
 
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label id="label_password" width="40%" height="100%" text_align="left"
@@ -45,30 +45,30 @@
                     <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
                 
-                <spacer height="20" width="20"/>
+                <spacer height="5%" width="20"/>
                 
                 <label id="message" width="100%" text_align="center"/>
             </div>
             
-			<spacer width="20" proportion="1"/>
+			<spacer width="20" height="2%"/>
 			
-			<div width="90%" align="center" layout="vertical-row" height="fit">
-				<buttonbar id="options" width="100%" height="80" align="center">
-					<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
+			<div width="90%" align="center" layout="vertical-row" height="18%">
+				<buttonbar id="options" width="100%" height="100%" align="center">
+					<icon-button id="ok" width="fit" height="fit" icon="gui/green_check.png"
 								 I18N="In the user screen" text="OK" label_location="bottom"/>
-					<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
+					<icon-button id="new_user" width="fit" height="fit" icon="gui/blue_plus.png"
 								 I18N="In the user screen" text="Add user" label_location="bottom"/>
-					<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
+					<icon-button id="delete" width="fit" height="fit" icon="gui/remove.png"
 								 I18N="In the user screen" text="Delete" label_location="bottom"/>
-					<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
+					<icon-button id="rename" width="fit" height="fit" icon="gui/rename.png"
 								 I18N="In the user screen" text="Rename" label_location="bottom"/>
-					<icon-button id="default_kart_color" width="64" height="64" icon="gui/edit.png"
+					<icon-button id="default_kart_color" width="fit" height="fit" icon="gui/edit.png"
 								 I18N="In the user screen" text="Default kart color" label_location="bottom"/>
-					<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+					<icon-button id="cancel" width="fit" height="fit" icon="gui/main_quit.png"
 								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
 				</buttonbar>
 			</div>
-			<spacer width="20" height="40"/>
+			<spacer width="20" height="5%"/>
         </box>
         <spacer width="20" height="15"/>
     </div>
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/user_screen_tab.stkgui
index 9e4ae03e8..fd7ca5166 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -14,15 +14,15 @@
             <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
         </tabs>
 
-        <box proportion="1" width="100%" layout="vertical-row">
+        <box proportion="1" width="98%" layout="vertical-row">
 
-            <spacer height="15" width="10"/>
+            <spacer height="2%" width="10"/>
 
-            <scrollable_ribbon id="players" height="120" y="10" x="10" width="98%" align="center" label_location="each"
+            <scrollable_ribbon id="players" height="18%" y="10" x="10" width="98%" align="center" label_location="each"
                                square_items="true" child_width="128" child_height="128" />
 
-            <spacer height="15" width="10"/>
-            <div width="90%" align="center" layout="vertical-row" height="fit">
+            <spacer height="2%" width="10"/>
+            <div width="90%" align="center" layout="vertical-row" proportion="1">
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
@@ -31,48 +31,55 @@
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="remember-user" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
-                    <label id="label_remember" proportion="1" height="100%" text_align="left"
+                    <label proportion="1" id="label_remember" height="100%" text_align="left"
                               I18N="In the user screen" text="Remember password"/>
                 </div>
                 <!-- Disable guest accounts for now
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="label_guest" proportion="1" height="100%" text_align="left"
+                    <label width="40%" id="label_guest" height="100%" text_align="left"
                            I18N="In the user screen" text="Guest login"/>
                     <checkbox id="guest" I18N="In the user screen" text_align="left"/>
                 </div>
                 -->
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="label_username" width="40%" height="100%" text_align="left"
+                    <label width="40%" id="label_username" height="100%" text_align="left"
                            I18N="In the user screen" text="Username"/>
                     <textbox id="username" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
-                <spacer height="20" width="20"/>
+                <spacer height="10%" width="20"/>
 
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label id="label_password" width="40%" height="100%" text_align="left"
-                           I18N="In the registration dialog" text="Password"/>
-                    <textbox id="password" proportion="2" height="fit" I18N="In the registration dialog"/>
+                           I18N="In the user screen" text="Password"/>
+                    <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
+                
+                <spacer height="5%" width="20"/>
+                
+                <label id="message" width="100%" text_align="center"/>
             </div>
-            <div width="80%" align="center" layout="vertical-row" height="fit">
-                <label id="message" width="80%" align="center" text_align="left"/>
-            </div>
-            <spacer width="20" height="25"/>
-            <buttonbar id="options" width="90%" height="13%" align="center">
-                <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-                             I18N="In the user screen" text="OK" label_location="bottom"/>
-                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-                             I18N="In the user screen" text="Add user" label_location="bottom"/>
-                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-                             I18N="In the user screen" text="Delete" label_location="bottom"/>
-                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
-                             I18N="In the user screen" text="Rename" label_location="bottom"/>
-                <icon-button id="default_kart_color" width="64" height="64" icon="gui/edit.png"
-                             I18N="In the user screen" text="Default kart color" label_location="bottom"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
-            </buttonbar>
+            
+			<spacer width="20" height="2%"/>
+			
+			<div width="90%" align="center" layout="vertical-row" height="18%">
+				<buttonbar id="options" width="100%" height="100%" align="center">
+					<icon-button id="ok" width="fit" height="fit" icon="gui/green_check.png"
+								 I18N="In the user screen" text="OK" label_location="bottom"/>
+					<icon-button id="new_user" width="fit" height="fit" icon="gui/blue_plus.png"
+								 I18N="In the user screen" text="Add user" label_location="bottom"/>
+					<icon-button id="delete" width="fit" height="fit" icon="gui/remove.png"
+								 I18N="In the user screen" text="Delete" label_location="bottom"/>
+					<icon-button id="rename" width="fit" height="fit" icon="gui/rename.png"
+								 I18N="In the user screen" text="Rename" label_location="bottom"/>
+					<icon-button id="default_kart_color" width="fit" height="fit" icon="gui/edit.png"
+								 I18N="In the user screen" text="Default kart color" label_location="bottom"/>
+					<icon-button id="cancel" width="fit" height="fit" icon="gui/main_quit.png"
+								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
+				</buttonbar>
+			</div>
+			<spacer width="20" height="5%"/>
         </box>
+        <spacer width="20" height="15"/>
     </div>
 
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>