diff --git a/data/gui/dialogs/enter_address_dialog.stkgui b/data/gui/dialogs/enter_address_dialog.stkgui
index 21a20ba64..2b79ea76b 100644
--- a/data/gui/dialogs/enter_address_dialog.stkgui
+++ b/data/gui/dialogs/enter_address_dialog.stkgui
@@ -15,7 +15,7 @@
                 I18N="In the enter address dialog" text="Cancel" align="center"/>
 
             <icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
-                I18N="In the enter address dialog" text="OK" align="center"/>
+                I18N="In the enter address dialog" text="Join" align="center"/>
 
         </buttonbar>
     </div>
diff --git a/data/gui/dialogs/online/server_info_dialog.stkgui b/data/gui/dialogs/online/server_info_dialog.stkgui
index fdd22efe3..9aaf42e9c 100644
--- a/data/gui/dialogs/online/server_info_dialog.stkgui
+++ b/data/gui/dialogs/online/server_info_dialog.stkgui
@@ -27,8 +27,8 @@
         </div>
         <spacer height="1%" width="5"/>
         <buttonbar id="options" width="90%" proportion="4" align="center">
-                <icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
-                             I18N="In the server info dialog" text="Cancel" label_location="bottom"/>
+                <icon-button id="cancel" width="128" height="128" icon="gui/icons/back.png"
+                             I18N="In the server info dialog" text="Back" label_location="bottom"/>
                 <icon-button id="bookmark" width="128" height="128" icon="gui/icons/story_mode_book.png"
                              I18N="In the server info dialog"  text="Bookmark this server" label_location="bottom"/>
                 <icon-button id="join" width="128" height="128" icon="gui/icons/green_check.png"
diff --git a/data/gui/dialogs/online/user_info_dialog.stkgui b/data/gui/dialogs/online/user_info_dialog.stkgui
index 8e2fd2c6b..6f390d7cc 100644
--- a/data/gui/dialogs/online/user_info_dialog.stkgui
+++ b/data/gui/dialogs/online/user_info_dialog.stkgui
@@ -21,7 +21,7 @@
         <buttonbar id="options" width="90%" height="20%" align="center">
             <icon-button id="cancel" width="64" height="64" icon="gui/icons/back.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
-            <icon-button id="remove" width="64" height="64" icon="gui/icons/package-uninstall.png"
+            <icon-button id="remove" width="64" height="64" icon="gui/icons/remove.png"
                          I18N="User info dialog"  text="Remove" label_location="bottom"/>
             <icon-button id="friend" width="64" height="64" icon="gui/icons/blue_plus.png"
                          I18N="User info dialog"  text="Add Friend" label_location="bottom"/>
diff --git a/data/gui/screens/online/create_server.stkgui b/data/gui/screens/online/create_server.stkgui
index 46dc9717e..1b6245bb6 100644
--- a/data/gui/screens/online/create_server.stkgui
+++ b/data/gui/screens/online/create_server.stkgui
@@ -70,7 +70,7 @@
             <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
 
             <buttonbar id="options" x="0" y="0" width="40%" height="15%" align="center">
-                <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
+                <icon-button id="cancel" width="64" height="64" icon="gui/icons/back.png"
                              I18N="In the server creation screen" text="Cancel" label_location="bottom"/>
                 <icon-button id="create" width="64" height="64" icon="gui/icons/green_check.png"
                              I18N="In the server creation screen" text="Create" label_location="bottom"/>
diff --git a/data/gui/screens/user_screen.stkgui b/data/gui/screens/user_screen.stkgui
index b2b3f92e4..d83a1a303 100644
--- a/data/gui/screens/user_screen.stkgui
+++ b/data/gui/screens/user_screen.stkgui
@@ -65,7 +65,7 @@
 								 I18N="In the user screen" text="Rename" label_location="bottom"/>
 					<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="128" height="128" icon="gui/icons/main_quit.png"
+					<icon-button id="cancel" width="128" height="128" icon="gui/icons/back.png"
 								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
 					<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
 								 I18N="In the user screen" text="OK" label_location="bottom"/>
diff --git a/data/gui/screens/user_screen_tab.stkgui b/data/gui/screens/user_screen_tab.stkgui
index 2cd05f181..6c45ed369 100644
--- a/data/gui/screens/user_screen_tab.stkgui
+++ b/data/gui/screens/user_screen_tab.stkgui
@@ -87,7 +87,7 @@
                                      I18N="In the user screen" text="Rename" label_location="bottom"/>
                         <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="128" height="128" icon="gui/icons/main_quit.png"
+                        <icon-button id="cancel" width="128" height="128" icon="gui/icons/back.png"
                                      I18N="In the user screen" text="Cancel" label_location="bottom"/>
                         <icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
                                      I18N="In the user screen" text="OK" label_location="bottom"/>