diff --git a/data/gui/gp_add_track.png b/data/gui/blue_plus.png
similarity index 100%
rename from data/gui/gp_add_track.png
rename to data/gui/blue_plus.png
diff --git a/data/gui/gp_edit_track.png b/data/gui/edit.png
similarity index 100%
rename from data/gui/gp_edit_track.png
rename to data/gui/edit.png
diff --git a/data/gui/gpedit.stkgui b/data/gui/gpedit.stkgui
index d3ded67b2..12154180b 100644
--- a/data/gui/gpedit.stkgui
+++ b/data/gui/gpedit.stkgui
@@ -20,13 +20,13 @@
                 I18N="Menu item" text="Move up" />
             <icon-button id="down" width="128" height="128" icon="gui/down.png"
                 I18N="Menu item" text="Move down" />
-            <icon-button id="add" width="128" height="128" icon="gui/gp_add_track.png"
+            <icon-button id="add" width="128" height="128" icon="gui/blue_plus.png"
                 I18N="Menu item" text="Add" />
-            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit_track.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
                 I18N="Menu item" text="Edit" />
-            <icon-button id="remove" width="128" height="128" icon="gui/gp_remove_track.png"
+            <icon-button id="remove" width="128" height="128" icon="gui/remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="save" width="128" height="128" icon="gui/gp_save.png"
+            <icon-button id="save" width="128" height="128" icon="gui/save.png"
                 I18N="Menu item" text="Save" />
         </buttonbar>
     </div>
diff --git a/data/gui/gpeditor.stkgui b/data/gui/gpeditor.stkgui
index 06d78e572..5da0b9838 100644
--- a/data/gui/gpeditor.stkgui
+++ b/data/gui/gpeditor.stkgui
@@ -32,11 +32,11 @@
                 I18N="Menu item" text="New" />
             <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"
                 I18N="Menu item" text="Copy" />
-            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
                 I18N="Menu item" text="Edit" />
             <icon-button id="remove" width="128" height="128" icon="gui/gp_remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="rename" width="128" height="128" icon="gui/gp_rename.png"
+            <icon-button id="rename" width="128" height="128" icon="gui/rename.png"
                 I18N="Menu item" text="Rename" />
         </buttonbar>
 
diff --git a/data/gui/gp_remove_track.png b/data/gui/remove.png
similarity index 100%
rename from data/gui/gp_remove_track.png
rename to data/gui/remove.png
diff --git a/data/gui/gp_rename.png b/data/gui/rename.png
similarity index 100%
rename from data/gui/gp_rename.png
rename to data/gui/rename.png
diff --git a/data/gui/gp_save.png b/data/gui/save.png
similarity index 100%
rename from data/gui/gp_save.png
rename to data/gui/save.png
diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index acb65467f..7dfde5b18 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -15,24 +15,32 @@
             <spacer height="15" width="10"/>
             <div width="80%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
-                    <checkbox id="online" I18N="In the login screen" text_align="left"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Multiplayer Boost/Handicap"/>
+                    <gauge id="difficulty" min_value="1" max_value="5" width="300" align="center" />
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Apply Boost/Handicap in singleplayer too"/>
+                    <checkbox id="singleplayer-difficulty" I18N="In the user screen" text_align="left"/>
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Online"/>
+                    <checkbox id="online" I18N="In the user screen" text_align="left"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label    id="label_remember" proportion="1" height="100%" text_align="left"
-                              I18N="In the login screen" text="Remember password"/>
-                    <checkbox id="remember-user" I18N="In the login screen" text_align="left"/>
+                              I18N="In the user screen" text="Remember password"/>
+                    <checkbox id="remember-user" I18N="In the user screen" text_align="left"/>
                 </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"
-                           I18N="In the login screen" text="Guest login"/>
-                    <checkbox id="guest" I18N="In the login screen" 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" proportion="1" height="100%" text_align="left"
-                           I18N="In the login screen" text="Username"/>
+                           I18N="In the user screen" text="Username"/>
                     <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
                 </div>
                 <spacer height="20" width="20"/>
@@ -50,13 +58,13 @@
             <buttonbar id="options" width="90%" height="13%" align="bottom">
                 <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog" text="OK" label_location="bottom"/>
-                <icon-button id="new_user" width="64" height="64" icon="gui/gp_add_track.png"
+                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
                              I18N="Login dialog" text="Add user" label_location="bottom"/>
-                <icon-button id="delete" width="64" height="64" icon="gui/gp_remove_track.png"
+                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
                              I18N="Login dialog" text="Delete" label_location="bottom"/>
                 <icon-button id="recover" width="64" height="64" icon="gui/main_options.png"
                              I18N="Login dialog" text="Recovery" label_location="bottom"/>
-                <icon-button id="rename" width="64" height="64" icon="gui/gp_rename.png"
+                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
                              I18N="Login dialog" text="Rename" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="Login dialog" text="Cancel" label_location="bottom"/>
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/user_screen_tab.stkgui
index 37f0fe980..3e613b246 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -24,24 +24,32 @@
             <spacer height="15" width="10"/>
             <div width="80%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
-                    <checkbox id="online" I18N="In the login screen" text_align="left"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Multiplayer Boost/Handicap"/>
+                    <gauge id="difficulty" min_value="1" max_value="5" width="300" align="center" />
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Apply Boost/Handicap in singleplayer too"/>
+                    <checkbox id="singleplayer-difficulty" I18N="In the user screen" text_align="left"/>
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Online"/>
+                    <checkbox id="online" I18N="In the user screen" text_align="left"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label    id="label_remember" proportion="1" height="100%" text_align="left"
-                              I18N="In the login screen" text="Remember password"/>
-                    <checkbox id="remember-user" I18N="In the login screen" text_align="left"/>
+                              I18N="In the user screen" text="Remember password"/>
+                    <checkbox id="remember-user" I18N="In the user screen" text_align="left"/>
                 </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"
-                           I18N="In the login screen" text="Guest login"/>
-                    <checkbox id="guest" I18N="In the login screen" 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" proportion="1" height="100%" text_align="left"
-                           I18N="In the login screen" text="Username"/>
+                           I18N="In the user screen" text="Username"/>
                     <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
                 </div>
                 <spacer height="20" width="20"/>
@@ -59,11 +67,11 @@
             <buttonbar id="options" width="90%" height="13%" align="center">
                 <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog" text="OK" label_location="bottom"/>
-                <icon-button id="new_user" width="64" height="64" icon="gui/gp_add_track.png"
+                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
                              I18N="Login dialog" text="Add user" label_location="bottom"/>
-                <icon-button id="delete" width="64" height="64" icon="gui/gp_remove_track.png"
+                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
                              I18N="Login dialog" text="Delete" label_location="bottom"/>
-                <icon-button id="rename" width="64" height="64" icon="gui/gp_rename.png"
+                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
                              I18N="Login dialog" text="Rename" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="Login dialog" text="Cancel" label_location="bottom"/>